Merge pull request #219 from sergey-dryabzhinsky/Issue-203-fix-module-version-string

sergey-dryabzhinsky · web-flow · commit 79d062a2edb4 · 2025-03-04T12:57:17.000+03:00
Issue 203 fix module version string
diff --git a/.github/workflows/Build_wheels_for_cpython27_x86.yml b/.github/workflows/Build_wheels_for_cpython27_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "2.7"
             getpipurl: https://bootstrap.pypa.io/pip/2.7/get-pip.py
             pypkg: python2.7
@@ -106,7 +106,7 @@ jobs:
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo Clang
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-7 -v
-          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 CC=clang-7 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_SMALL=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel "
+          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 CC=clang-7 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_SMALL=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel "
 
       - name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
         if: matrix.os.matrix == 'linux'
diff --git a/.github/workflows/Build_wheels_for_cpython27_x86_64.yml b/.github/workflows/Build_wheels_for_cpython27_x86_64.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "2.7"
             getpipurl: https://bootstrap.pypa.io/pip/2.7/get-pip.py
             pypkg: python2.7
@@ -102,7 +102,7 @@ jobs:
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo CLANG-7
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-7 -v
-          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 CC=clang-7 _ZSTD_SMALL=1 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel"
+          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 CC=clang-7 _ZSTD_SMALL=1 ZSTD_WARNINGS=1 _ZSTD_WERRORS=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel"
 
       - name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
         if: matrix.os.matrix == 'linux'
diff --git a/.github/workflows/Build_wheels_for_cpython310_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython310_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.10
diff --git a/.github/workflows/Build_wheels_for_cpython310_x86_u16.yml b/.github/workflows/Build_wheels_for_cpython310_x86_u16.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.10"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.10
diff --git a/.github/workflows/Build_wheels_for_cpython311_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython311_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.11
diff --git a/.github/workflows/Build_wheels_for_cpython311_x86_u16.yml b/.github/workflows/Build_wheels_for_cpython311_x86_u16.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.11"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.11
diff --git a/.github/workflows/Build_wheels_for_cpython312_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython312_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.12
diff --git a/.github/workflows/Build_wheels_for_cpython312_x86_u16.yml b/.github/workflows/Build_wheels_for_cpython312_x86_u16.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.12"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.12
diff --git a/.github/workflows/Build_wheels_for_cpython313_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython313_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.13
diff --git a/.github/workflows/Build_wheels_for_cpython314_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython314_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: noble
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.14
diff --git a/.github/workflows/Build_wheels_for_cpython34_x86.yml b/.github/workflows/Build_wheels_for_cpython34_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.4"
             getpipurl: https://bootstrap.pypa.io/pip/3.4/get-pip.py
             pypkg: python3.4
diff --git a/.github/workflows/Build_wheels_for_cpython34_x86_64.yml b/.github/workflows/Build_wheels_for_cpython34_x86_64.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.4"
             getpipurl: https://bootstrap.pypa.io/pip/3.4/get-pip.py
             pypkg: python3.4
diff --git a/.github/workflows/Build_wheels_for_cpython35_x86.yml b/.github/workflows/Build_wheels_for_cpython35_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.5"
             getpipurl: https://bootstrap.pypa.io/pip/3.5/get-pip.py
             pypkg: python3.5
diff --git a/.github/workflows/Build_wheels_for_cpython35_x86_64_u20.yml b/.github/workflows/Build_wheels_for_cpython35_x86_64_u20.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.5"
             getpipurl: https://bootstrap.pypa.io/pip/3.5/get-pip.py
             pypkg: python3.5
diff --git a/.github/workflows/Build_wheels_for_cpython36_x86.yml b/.github/workflows/Build_wheels_for_cpython36_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.6"
             getpipurl: https://bootstrap.pypa.io/pip/3.6/get-pip.py
             pypkg: python3.6
diff --git a/.github/workflows/Build_wheels_for_cpython36_x86_64_u20.yml b/.github/workflows/Build_wheels_for_cpython36_x86_64_u20.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.6"
             getpipurl: https://bootstrap.pypa.io/pip/3.6/get-pip.py
             pypkg: python3.6
@@ -100,7 +100,7 @@ jobs:
           sudo tar -xvf dist/zstd-${{matrix.os.version}}.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
           false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env 
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion 
-          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 ZSTD_WARNINGS=1 ZSTD_WERRORS=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel"
+          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 ZSTD_WARNINGS=1 ZSTD_WERRORS=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel"
 
       - name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
         if: matrix.os.matrix == 'linux'
diff --git a/.github/workflows/Build_wheels_for_cpython37_x86.yml b/.github/workflows/Build_wheels_for_cpython37_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.11"
             getpipurl: https://bootstrap.pypa.io/pip/3.7/get-pip.py
             pypkg: python3.7
diff --git a/.github/workflows/Build_wheels_for_cpython37_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython37_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/3.7/get-pip.py
             pypkg: python3.7
diff --git a/.github/workflows/Build_wheels_for_cpython38_x86.yml b/.github/workflows/Build_wheels_for_cpython38_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.8"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.8
diff --git a/.github/workflows/Build_wheels_for_cpython38_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython38_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: noble
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.8
diff --git a/.github/workflows/Build_wheels_for_cpython39_x86.yml b/.github/workflows/Build_wheels_for_cpython39_x86.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: i686
             release: xenial
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             #pyver: "3.9"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.9
diff --git a/.github/workflows/Build_wheels_for_cpython39_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython39_x86_64_u24.yml
@@ -21,7 +21,7 @@ jobs:
             tag_arch: x86_64
             release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
-            version: 1.5.6.5
+            version: 1.5.6.6
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.9
@@ -100,7 +100,7 @@ jobs:
           sudo tar -xvf dist/zstd-${{matrix.os.version}}.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
           false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env 
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion 
-          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel"
+          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-${{matrix.os.version}} && ZSTD_ASM=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 ZSTD_EXTERNAL=1 ${{matrix.os.pypkg}} setup.py bdist_wheel"
 
       - name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
         if: matrix.os.matrix == 'linux'
diff --git a/PKG-INFO b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: zstd
-Version: 1.5.6.5
+Version: 1.5.6.6
 Summary: Simple python bindings to Yann Collet ZSTD compression library
 Home-page: https://github.com/sergey-dryabzhinsky/python-zstd
 Author: Sergey Dryabzhinsky
 Author-email: sergey.dryabzhinsky@gmail.com
 License: BSD
-Download-URL: https://github.com/sergey-dryabzhinsky/python-zstd/archive/v1.5.6.5.tar.gz
+Download-URL: https://github.com/sergey-dryabzhinsky/python-zstd/archive/v1.5.6.6.tar.gz
 Description: Simple ZSTandarD bindings for Python
 Keywords: zstd,zstandard,compression
 Platform: POSIX
diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 python-zstd
 =============
 
-.. |releaseW| image:: https://github.com/sergey-dryabzhinsky/python-zstd/actions/workflows/build-wheels.yml/badge.svg?tag=v1.5.6.5
+.. |releaseW| image:: https://github.com/sergey-dryabzhinsky/python-zstd/actions/workflows/build-wheels.yml/badge.svg?tag=v1.5.6.6
     :target: https://github.com/sergey-dryabzhinsky/python-zstd/actions/workflows/build-wheels.yml
 
 .. |masterW| image:: https://github.com/sergey-dryabzhinsky/python-zstd/actions/workflows/build-wheels.yml/badge.svg
@@ -127,7 +127,7 @@ python-zstd
 | cpython 3.14 x64 u24 | |cpython314x64u20|  |
 +----------------------+---------------------+
 | Release              | |releaseW|          |
-| 1.5.6.5              |                     |
+| 1.5.6.6              |                     |
 +----------------------+---------------------+
 | Master               | |masterW|           |
 +----------------------+---------------------+
diff --git a/setup.py b/setup.py
@@ -18,6 +18,13 @@
 VERSION_STR = ".".join([str(x) for x in VERSION])
 
 
+# Package version, even external 
+PKG_VERSION = VERSION
+# Minor revision 
+PKG_VERSION += ("6",)
+PKG_VERSION_STR = ".".join([str(x) for x in PKG_VERSION])
+
+
 def which(bin_exe):
     """
     Simulate shutil.which for python 2.7,
@@ -143,6 +150,7 @@ def which(bin_exe):
         if sys.hexversion >= 0x03000000:
             # It's bytes in PY3
             VERSION_STR = VERSION_STR.decode()
+        #debug
         print("\nFound libzstd version %r" % VERSION_STR)
         if VERSION_STR and SUP_EXTERNAL:
             if VERSION_STR>="1.4.0":
@@ -152,7 +160,7 @@ def which(bin_exe):
                     ext_libraries=["zstd"]
             else:
                 raise RuntimeError("Need zstd library verion >= 1.4.0")
-            VERSION = tuple(int(v) for v in VERSION_STR.split("."))
+            #VERSION = tuple(int(v) for v in VERSION_STR.split("."))
     else:
         if SUP_EXTERNAL:
             # Require pkg config
@@ -161,13 +169,6 @@ def which(bin_exe):
 
 
 
-# Package version, even external 
-PKG_VERSION = VERSION
-# Minor revision 
-PKG_VERSION += ("5",)
-PKG_VERSION_STR = ".".join([str(x) for x in PKG_VERSION])
-
-
 if BUILD_SMALL:
    COPT = {
        'msvc': ['/O1', ],
diff --git a/tests/base.py b/tests/base.py
@@ -54,11 +54,11 @@ class BaseTestZSTD(unittest.TestCase):
     VERSION = "1.5.6"
     VERSION_INT = 10506
     VERSION_INT_MIN = 1 * 100*100 + 0 * 1*100 + 0
-    PKG_VERSION = "1.5.6.5"
+    PKG_VERSION = "1.5.6.6"
 
     def helper_version(self):
-        if zstd.ZSTD_external():
-            return raise_skip("PyZstd was build with external version of ZSTD library, so module is like (%s). It can be any version. Almost." % zstd.version())
+        #if zstd.ZSTD_external():
+        #    return raise_skip("PyZstd was build with external version of ZSTD library, so module is like (%s). It can be any version. Almost." % zstd.version())
         self.assertEqual(self.PKG_VERSION, zstd.version())
 
     def helper_zstd_version(self):
