Skip to content

Commit 841e189

Browse files
kotazzzkotazzz
committed
5.1.6 Release
1 parent 1b6456e commit 841e189

14 files changed

+37
-22
lines changed

‎.idea/workspace.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.txt

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
NewLifeUtils 5.1.6:
2+
- Fix: LM - rea() print up (-------)
3+
- Fix: batch install global option (-------)
4+
- Fix: cstm fix (-------)
5+
- Removal: batch uninstall global option (-------)
6+
- Change: parse_args regex change (-------
7+
)
18
NewLifeUtils 5.1.5:
29
- Fix: LM - rea() not working (-------)
310

‎NewLifeUtils.egg-info/PKG-INFO

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: NewLifeUtils
3-
Version: 5.1.5
3+
Version: 5.1.6
44
Summary: View changelog.txt at https://raw.githubusercontent.com/NewLife1324/NewLifeUtils-Dev/main/CHANGELOG.txt
55
Home-page: https://github.com/NewLife1324/NewLifeUtils-Dev
66
Author: New Life

‎NewLifeUtils/LoggerModule.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,6 @@ def to_format(pattern, args):
10621062

10631063

10641064
def out(text):
1065-
10661065
now = datetime.datetime.now()
10671066
if enable_file_fog:
10681067
if not file_exist("log"):
@@ -1099,7 +1098,7 @@ def out(text):
10991098
{"message": message, "tag": tag_check(tag, tip_default_tag)},
11001099
)
11011100
)
1102-
cstm = lambda pattern, text, args: out(to_format(pattern, **args))
1101+
cstm = lambda pattern, args: out(to_format(pattern, args))
11031102

11041103
rea = lambda message, tag="", completion=None: read(message, tag, completion)
11051104

@@ -1210,7 +1209,7 @@ def smart_input(text="", completes=None, end="\n"):
12101209
readed = input()
12111210

12121211
out(
1213-
MCC.up(2)
1212+
MCC.up()
12141213
+ ACC.RESET
12151214
+ MCC.ERASE_ALL_LINE
12161215
+ to_format(

‎NewLifeUtils/StringUtilModule.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ def parse_args(readed):
3333
# [\"\'][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,-]*[\"\']|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,-]+
3434
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-]+
3535
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
36-
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+ (NOW)
36+
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
37+
# [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№]+
38+
# [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+ (NOW)
3739

3840
res = re.findall(
39-
r"[\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?*\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'-/]+",
41+
r"[\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+",
4042
readed,
4143
re.MULTILINE,
4244
)

‎NewLifeUtils/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "5.1.5"
1+
__version__ = "5.1.6"

‎NewLifeUtils/__pycache__/__init__.cpython-39.pyc

0 Bytes
Binary file not shown.

‎build/lib/NewLifeUtils/LoggerModule.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,6 @@ def to_format(pattern, args):
10621062

10631063

10641064
def out(text):
1065-
10661065
now = datetime.datetime.now()
10671066
if enable_file_fog:
10681067
if not file_exist("log"):
@@ -1099,7 +1098,7 @@ def out(text):
10991098
{"message": message, "tag": tag_check(tag, tip_default_tag)},
11001099
)
11011100
)
1102-
cstm = lambda pattern, text, args: out(to_format(pattern, **args))
1101+
cstm = lambda pattern, args: out(to_format(pattern, args))
11031102

11041103
rea = lambda message, tag="", completion=None: read(message, tag, completion)
11051104

@@ -1210,7 +1209,7 @@ def smart_input(text="", completes=None, end="\n"):
12101209
readed = input()
12111210

12121211
out(
1213-
MCC.up(2)
1212+
MCC.up()
12141213
+ ACC.RESET
12151214
+ MCC.ERASE_ALL_LINE
12161215
+ to_format(

‎build/lib/NewLifeUtils/StringUtilModule.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ def parse_args(readed):
3333
# [\"\'][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,-]*[\"\']|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,-]+
3434
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-]+
3535
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
36-
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+ (NOW)
36+
# [\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?\*\\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d\.[\]{}()@\\\.:;,\'-/]+
37+
# [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№]+
38+
# [\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+ (NOW)
3739

3840
res = re.findall(
39-
r"[\"][a-zA-ZА-Яа-яЁё\d\s[\]{}()@#_=%?*\\.:;,\'-/]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'-/]+",
41+
r"[\"][a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()<>@\\:;,\'\-\/!?#$%^&*_+№\d]*[\"]|[a-zA-ZA-ZА-Яа-яЁё\d.[\]{}()@\\:;,\'\-\/!?#$%^&*_+№<>]+",
4042
readed,
4143
re.MULTILINE,
4244
)

‎build/lib/NewLifeUtils/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "5.1.5"
1+
__version__ = "5.1.6"

‎dist/NewLifeUtils-5.1.6-py3-none-any.whl

21.7 KB
Binary file not shown.

‎dist/NewLifeUtils-5.1.6-py3.9.egg

45.5 KB
Binary file not shown.

‎dist/NewLifeUtils-5.1.6.tar.gz

19.2 KB
Binary file not shown.

‎menu.bat

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ECHO + 2 - Start compile for Tests + CTEST +
1313
ECHO + 3 - Publish to real + PREAL +
1414
ECHO + 4 - Publish to test + PTEST +
1515
ECHO + 5 - Install to global + INGLB +
16-
ECHO + 6 - Uninstall from global + UNGLB +
16+
ECHO + - Uninstall from global + UNGLB +
1717
ECHO + 7 - Install to env + INENV +
1818
ECHO + 8 - Uninstall from env + UNENV +
1919
ECHO + 9 - Run test from env + RTEST +
@@ -29,7 +29,6 @@ IF %M%==2 GOTO CTEST
2929
IF %M%==3 GOTO PREAL
3030
IF %M%==4 GOTO PTEST
3131
IF %M%==5 GOTO INGLB
32-
IF %M%==6 GOTO UNGLB
3332
IF %M%==7 GOTO INENV
3433
IF %M%==8 GOTO UNENV
3534
IF %M%==9 GOTO RTEST
@@ -38,6 +37,11 @@ IF %M%==- GOTO INEWE
3837
IF %M%=='' GOTO EOF
3938
GOTO MENU
4039
:CPIPY
40+
ECHO STARTING CLEAR ----------------------
41+
RD dist /s /q
42+
RD build /s /q
43+
RD "NewLifeUtils.egg-info" /s /q
44+
ECHO FINISHING CLEAR ---------------------
4145
python setup.py sdist bdist_wheel
4246
GOTO MENU
4347
:CTEST
@@ -50,16 +54,12 @@ GOTO MENU
5054
twine upload --repository testpypi dist/*
5155
GOTO MENU
5256
:INGLB
57+
pip uninstall newlifeutils --yes
58+
ECHO FINISHING UNINSTALL -----------------
5359
python setup.py install
5460
GOTO MENU
55-
:UNGLB
56-
python setup.py uninstall
57-
GOTO MENU
5861
:INENV
59-
env\Scripts\python setup.py install
60-
GOTO MENU
61-
:UNENV
62-
env\Scripts\python setup.py uninstall
62+
env\Scripts\python setup.py install --upgrade
6363
GOTO MENU
6464
:RTEST
6565
env\Scripts\python test.py

0 commit comments

Comments
 (0)