codext 1.15.5__tar.gz → 1.15.8__tar.gz

{codext-1.15.5 → codext-1.15.8}/.github/workflows/python-package.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -29,15 +29,9 @@ jobs:
     - name: Install ${{ env.package }}
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest pytest-cov pytest-pythonpath coverage
+        python -m pip install pytest pytest-cov pytest-pythonpath coverage
         pip install -r requirements.txt
         pip install .
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test ${{ env.package }} with pytest
       run: |
         pytest --cov=$package
@@ -48,6 +42,10 @@ jobs:
       cov_badge_path: docs/coverage.svg
     steps:
     - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.12"
     - name: Install ${{ env.package }}
       run: |
         python -m pip install --upgrade pip
@@ -77,3 +75,33 @@ jobs:
       with:
         github_token: ${{ secrets.github_token }}
         branch: ${{ github.ref }}
+  deploy:
+    runs-on: ubuntu-latest
+    needs: coverage
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Check for version change
+      uses: dorny/paths-filter@v2
+      id: filter
+      with:
+        filters: |
+          version:
+            - '**/VERSION.txt'
+    - if: steps.filter.outputs.version == 'true'
+      name: Cleanup README
+      run: |
+        sed -ri 's/^(##*)\s*:.*:\s*/\1 /g' README.md
+        awk '{if (match($0,"## Supporters")) exit; print}' README.md > README
+        mv -f README README.md
+    - if: steps.filter.outputs.version == 'true'
+      name: Build ${{ env.package }} package
+      run: python3 -m pip install --upgrade build && python3 -m build
+    - if: steps.filter.outputs.version == 'true'
+      name: Upload ${{ env.package }} to PyPi
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}
+        verbose: true
+        verify_metadata: false

{codext-1.15.5 → codext-1.15.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: codext
-Version: 1.15.5
+Version: 1.15.8
 Summary: Native codecs extension
 Author-email: Alexandre D'Hondt <alexandre.dhondt@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -692,8 +692,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <4,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: crypt-r; python_version >= "3.13"
+Requires-Dist: legacycrypt; python_version >= "3.13"
 Requires-Dist: markdown2>=2.4.0
+Dynamic: license-file
 
 <p align="center"><img src="https://github.com/dhondta/python-codext/raw/main/docs/pages/img/logo.png"></p>
 <h1 align="center">CodExt <a href="https://twitter.com/intent/tweet?text=CodExt%20-%20Encoding%2Fdecoding%20anything.%0D%0APython%20library%20extending%20the%20native%20codecs%20library%20with%20many%20new%20encodings%20and%20providing%20CLI%20tools%20with%20a%20guess%20feature%20based%20on%20AI.%0D%0Ahttps%3a%2f%2fgithub%2ecom%2fdhondta%2fpython-codext%0D%0A&hashtags=python,programming,encodings,codecs,cryptography,morse,base,ctftools"><img src="https://img.shields.io/badge/Tweet--lightgrey?logo=twitter&style=social" alt="Tweet" height="20"/></a></h1>

codext-1.15.8/docs/coverage.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="114" height="20" role="img" aria-label="coverage: 98.90%"><title>coverage: 98.90%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="114" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="53" height="20" fill="#4c1"/><rect width="114" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="865" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">98.90%</text><text x="865" y="140" transform="scale(.1)" fill="#fff" textLength="430">98.90%</text></g></svg>

{codext-1.15.5 → codext-1.15.8}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-  "crypt-r; python_version >= '3.13'",
+  "legacycrypt; python_version >= '3.13'",
   "markdown2>=2.4.0",
 ]
 dynamic = ["version"]

codext-1.15.8/src/codext/VERSION.txt

@@ -0,0 +1 @@
+1.15.8

{codext-1.15.5 → codext-1.15.8}/src/codext/__common__.py

@@ -261,7 +261,7 @@ def add(ename, encode=None, decode=None, pattern=None, text=True, add_to_codecs=
                 while True:
                     try:
                         g = m.group(i) or ""
-                        if g.isdigit() and not g.startswith("0") and "".join(set(g)) != "01":
+                        if g.isdigit() and not g.startswith("0") and (re.match(r"10+", g) or "".join(set(g)) != "01"):
                             g = int(g)
                         args += [g]
                         i += 1
@@ -370,7 +370,7 @@ def add_macro(mname, *encodings):
     :param mname:     macro name
     :param encodings: encoding names of the encodings to be chained with the macro
     """
-    global PERS_MACROS
+    global PERS_MACROS  # noqa: F824
     # check for name clash with alreday existing macros and codecs
     if mname in MACROS or mname in PERS_MACROS:
         raise ValueError("Macro name already exists")
@@ -630,7 +630,7 @@ codecs.add_map = add_map
 
 def clear():
     """ Clear codext's local registry of search functions. """
-    global __codecs_registry, MACROS, PERS_MACROS
+    global __codecs_registry, MACROS, PERS_MACROS  # noqa: F824
     __codecs_registry, MACROS, PERS_MACROS = [], {}, {}
 codecs.clear = clear
 
@@ -733,7 +733,7 @@ def list_macros():
 def remove(name):
     """ Remove all search functions matching the input encoding name from codext's local registry or any macro with the
          given name. """
-    global __codecs_registry, MACROS, PERS_MACROS
+    global __codecs_registry, MACROS, PERS_MACROS  # noqa: F824
     tbr = []
     for search_function in __codecs_registry:
         if search_function(name) is not None:
@@ -764,7 +764,7 @@ codecs.remove = remove
 
 def reset():
     """ Reset codext's local registry of search functions and macros. """
-    global __codecs_registry, CODECS_REGISTRY, MACROS, PERS_MACROS
+    global __codecs_registry, CODECS_REGISTRY, MACROS, PERS_MACROS  # noqa: F824
     clear()
     d = os.path.dirname(__file__)
     for pkg in sorted(os.listdir(d)):

{codext-1.15.5 → codext-1.15.8}/src/codext/hashing/crypt.py

@@ -15,7 +15,7 @@ if UNIX:
     try:
         import crypt
     except ImportError:
-        import crypt_r as crypt
+        import legacycrypt as crypt
     
     METHODS = [x[7:].lower() for x in crypt.__dict__ if x.startswith("METHOD_")]
     

{codext-1.15.5 → codext-1.15.8}/src/codext.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: codext
-Version: 1.15.5
+Version: 1.15.8
 Summary: Native codecs extension
 Author-email: Alexandre D'Hondt <alexandre.dhondt@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -692,8 +692,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <4,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: crypt-r; python_version >= "3.13"
+Requires-Dist: legacycrypt; python_version >= "3.13"
 Requires-Dist: markdown2>=2.4.0
+Dynamic: license-file
 
 <p align="center"><img src="https://github.com/dhondta/python-codext/raw/main/docs/pages/img/logo.png"></p>
 <h1 align="center">CodExt <a href="https://twitter.com/intent/tweet?text=CodExt%20-%20Encoding%2Fdecoding%20anything.%0D%0APython%20library%20extending%20the%20native%20codecs%20library%20with%20many%20new%20encodings%20and%20providing%20CLI%20tools%20with%20a%20guess%20feature%20based%20on%20AI.%0D%0Ahttps%3a%2f%2fgithub%2ecom%2fdhondta%2fpython-codext%0D%0A&hashtags=python,programming,encodings,codecs,cryptography,morse,base,ctftools"><img src="https://img.shields.io/badge/Tweet--lightgrey?logo=twitter&style=social" alt="Tweet" height="20"/></a></h1>

{codext-1.15.5 → codext-1.15.8}/src/codext.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ README.md
 pyproject.toml
 pytest.ini
 requirements.txt
-.github/workflows/pypi-publish.yml
 .github/workflows/python-package.yml
 docs/coverage.svg
 docs/mkdocs.yml

{codext-1.15.5 → codext-1.15.8}/src/codext.egg-info/requires.txt

@@ -1,4 +1,4 @@
 markdown2>=2.4.0
 
 [:python_version >= "3.13"]
-crypt-r
+legacycrypt

{codext-1.15.5 → codext-1.15.8}/tests/test_manual.py

@@ -125,7 +125,10 @@ class ManualTestCase(TestCase):
             self.assertIsNotNone(codecs.encode(STR, h))
             self.assertRaises(NotImplementedError, codecs.decode, STR, h)
         if UNIX:
-            import crypt
+            try:
+                import crypt
+            except ImportError:
+                import legacycrypt as crypt
             METHODS = [x[7:].lower() for x in crypt.__dict__ if x.startswith("METHOD_")]
             for m in METHODS:
                 h = "crypt-" + m

codext-1.15.5/.github/workflows/pypi-publish.yml

@@ -1,37 +0,0 @@
-# This workflow will deploy the Python package to PyPi.org
-
-name: deploy
-
-env:
-  package: codext
-
-on:
-  push:
-    branches:
-    - main
-    paths:
-    - '**/VERSION.txt'
-  workflow_run:
-    workflows: ["build"]
-    types: [completed]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Cleanup README
-      run: |
-        sed -ri 's/^(##*)\s*:.*:\s*/\1 /g' README.md
-        awk '{if (match($0,"## Supporters")) exit; print}' README.md > README
-        mv -f README README.md
-    - run: python3 -m pip install --upgrade build && python3 -m build
-    - name: Upload ${{ env.package }} to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        verbose: true
-        verify_metadata: false

codext-1.15.5/docs/coverage.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="114" height="20" role="img" aria-label="coverage: 99.11%"><title>coverage: 99.11%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="114" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="53" height="20" fill="#4c1"/><rect width="114" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="865" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">99.11%</text><text x="865" y="140" transform="scale(.1)" fill="#fff" textLength="430">99.11%</text></g></svg>

codext-1.15.5/src/codext/VERSION.txt

@@ -1 +0,0 @@
-1.15.5