Merge pull request #218 from sergey-dryabzhinsky/sergey-dryabzhinsky-patch-1

sergey-dryabzhinsky · web-flow · commit a6ffb5917ebd · 2025-03-03T17:15:22.000+03:00
Update Build_wheels_for_cpython310_x86_64_u24.yml
diff --git a/.github/workflows/Build_wheels_for_cpython27_x86.yml b/.github/workflows/Build_wheels_for_cpython27_x86.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython2.7 x86 with Clang-6 with All warnings
+name: Build wheels for CPython2.7 x86 with Clang-7 with All warnings
 
 on: [push, pull_request]
 
@@ -26,7 +26,7 @@ jobs:
             getpipurl: https://bootstrap.pypa.io/pip/2.7/get-pip.py
             pypkg: python2.7
             pyengine_tag: cp27-cp27mu
-            libc_tag: manylinux_2_14
+            libc_tag: manylinux_2_3
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list
           echo " deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list
-          echo " deb [trusted=yes] http://apt.llvm.org/${{matrix.os.release}}/ llvm-toolchain-${{matrix.os.release}}-6.0 main " > clang.list
+          echo " deb [trusted=yes] http://apt.llvm.org/${{matrix.os.release}}/ llvm-toolchain-${{matrix.os.release}}-7 main " > clang.list
           
           false && sudo find ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} -iname apt
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update
@@ -90,7 +90,7 @@ jobs:
       - name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
         if: matrix.os.matrix == 'linux'
         run: |
-           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc clang-6.0 pkg-config ${{matrix.os.pypkgadd}}
+           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc clang-7 pkg-config ${{matrix.os.pypkgadd}}
            sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "wget ${{matrix.os.getpipurl}} -O get-pip.py && ${{matrix.os.pypkg}} get-pip.py"
            sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools<72.0'" 
                     
@@ -105,8 +105,8 @@ jobs:
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} echo GCC
           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-6.0 -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-6.0 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}} 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 "
 
       - 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
@@ -1,4 +1,4 @@
-name: Build wheels for CPython2.7 x64 with Clang-6 with All warnings
+name: Build wheels for CPython2.7 x64 with Clang-7 with All warnings
 
 on: [push, pull_request]
 
@@ -66,7 +66,7 @@ jobs:
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/python ubuntu-${{matrix.os.release}} main" > rusoft-python.list
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list
-          echo " deb [trusted=yes] http://apt.llvm.org/xenial/ llvm-toolchain-${{matrix.os.release}}-6.0 main " > clang.list
+          echo " deb [trusted=yes] http://apt.llvm.org/xenial/ llvm-toolchain-${{matrix.os.release}}-7 main " > clang.list
           echo "# deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list
           false && sudo find ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} -iname apt
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update
@@ -89,7 +89,7 @@ jobs:
       - name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
         if: matrix.os.matrix == 'linux'
         run: |
-           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc clang-6.0 pkg-config ${{matrix.os.pypkgadd}}
+           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc clang-7 pkg-config ${{matrix.os.pypkgadd}}
            sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "wget ${{matrix.os.getpipurl}} -O get-pip.py && ${{matrix.os.pypkg}} get-pip.py || true"
            sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools<72.0'" 
                     
@@ -100,9 +100,9 @@ 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}} echo CLANG-6
-          sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} clang-6.0 -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-6.0 _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}} 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"
 
       - 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
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.10 x86_64 on Ubuntu24
+name: Build wheels for CPython3.10 x86_64 on Ubuntu20
 
 on: [push, pull_request]
 
@@ -14,20 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - name: Ubuntu 24 amd64 CPython 3.10
+          - name: Ubuntu 20 amd64 CPython 3.10
             runs-on: ubuntu-latest
             matrix: linux
             arch: amd64
             tag_arch: x86_64
-            release: noble
+            release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
             version: 1.5.6.5
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.10
             pypkgadd: python3.10-distutils
             pyengine_tag: cp310-cp310
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/Build_wheels_for_cpython311_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython311_x86_64_u24.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.11 x86_64 on Ubuntu24
+name: Build wheels for CPython3.11 x86_64 on Ubuntu20
 
 on: [push, pull_request]
 
@@ -14,20 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - name: Ubuntu 24 amd64 CPython 3.11
+          - name: Ubuntu 20 amd64 CPython 3.11
             runs-on: ubuntu-latest
             matrix: linux
             arch: amd64
             tag_arch: x86_64
-            release: noble
+            release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
             version: 1.5.6.5
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.11
             pypkgadd: python3.11-distutils
             pyengine_tag: cp311-cp311
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/Build_wheels_for_cpython312_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython312_x86_64_u24.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.12 x86_64 on Ubuntu24 with GCC All warnings
+name: Build wheels for CPython3.12 x86_64 on Ubuntu20 with GCC All warnings
 
 on: [push, pull_request]
 
@@ -25,9 +25,9 @@ jobs:
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.12
-            pypkgadd: python3.12-full
+           # pypkgadd: python3.12-full
             pyengine_tag: cp312-cp312
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/Build_wheels_for_cpython313_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython313_x86_64_u24.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.13 x86_64 on Ubuntu24 with GCC All warnings
+name: Build wheels for CPython3.13 x86_64 on Ubuntu20 with GCC All warnings
 
 on: [push, pull_request]
 
@@ -14,20 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - name: Ubuntu 24 amd64 CPython 3.13
+          - name: Ubuntu 20 amd64 CPython 3.13
             runs-on: ubuntu-latest
             matrix: linux
             arch: amd64
             tag_arch: x86_64
-            release: noble
+            release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
             version: 1.5.6.5
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.13
             #pypkgadd: python3.13-distutils
             pyengine_tag: cp313-cp313
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/Build_wheels_for_cpython37_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython37_x86_64_u24.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.7 x86_64 on Ubuntu24
+name: Build wheels for CPython3.7 x86_64 on Ubuntu20
 
 on: [push, pull_request]
 
@@ -14,20 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - name: Ubuntu 24 amd64 CPython 3.7
+          - name: Ubuntu 20 amd64 CPython 3.7
             runs-on: ubuntu-latest
             matrix: linux
             arch: amd64
             tag_arch: x86_64
-            release: noble
+            release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
             version: 1.5.6.5
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/3.7/get-pip.py
             pypkg: python3.7
             pypkgadd: python3.7-distutils
             pyengine_tag: cp37-cp37m
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/Build_wheels_for_cpython38_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython38_x86_64_u24.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.8 x86_64 on Ubuntu24
+name: Build wheels for CPython3.8 x86_64 on Ubuntu20
 
 on: [push, pull_request]
 
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - name: Ubuntu 24 amd64 CPython 3.8
+          - name: Ubuntu 20 amd64 CPython 3.8
             runs-on: ubuntu-latest
             matrix: linux
             arch: amd64
@@ -27,7 +27,7 @@ jobs:
             pypkg: python3.8
             pypkgadd: python3.8-distutils
             pyengine_tag: cp38-cp38
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/Build_wheels_for_cpython39_x86.yml b/.github/workflows/Build_wheels_for_cpython39_x86.yml
@@ -68,7 +68,7 @@ jobs:
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/backports ubuntu-${{matrix.os.release}} main" > rusoft-backports.list
           echo " deb [trusted=yes] http://packages.rusoft.ru/ppa/rusoft/packages ubuntu-${{matrix.os.release}} main" > rusoft-packages.list
           echo " deb [trusted=yes] http://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu ${{matrix.os.release}} main" > deadsnakes.list
-          sudo find ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} -iname apt
+          false && sudo find ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} -iname apt
           sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt update
           sudo cp -v ./*.list ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/etc/apt/sources.list.d
           false && sudo rm -fv ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/etc/apt/trusted.gpg.d/* && sudo rm -fv ./ubuntu-xenial-x86/etc/apt/trusted.gpg
diff --git a/.github/workflows/Build_wheels_for_cpython39_x86_64_u24.yml b/.github/workflows/Build_wheels_for_cpython39_x86_64_u24.yml
@@ -1,4 +1,4 @@
-name: Build wheels for CPython3.9 x86_64 on Ubuntu24
+name: Build wheels for CPython3.9 x86_64 on Ubuntu20
 
 on: [push, pull_request]
 
@@ -14,20 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - name: Ubuntu 24 amd64 CPython 3.9
+          - name: Ubuntu 20 amd64 CPython 3.9
             runs-on: ubuntu-latest
             matrix: linux
             arch: amd64
             tag_arch: x86_64
-            release: noble
+            release: focal
             mirror: http://azure.archive.ubuntu.com/ubuntu
             version: 1.5.6.5
             # pyver: "3.7"
             getpipurl: https://bootstrap.pypa.io/pip/get-pip.py
             pypkg: python3.9
             pypkgadd: python3.9-distutils
             pyengine_tag: cp39-cp39
-            libc_tag: manylinux_2_34
+            libc_tag: manylinux_2_14
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/README.rst b/README.rst
@@ -100,29 +100,29 @@ python-zstd
 +----------------------+---------------------+
 | cpython 3.7 x86      | |cpython37x86|      |
 +----------------------+---------------------+
-| cpython 3.7 x64 u24  | |cpython37x64|      |
+| cpython 3.7 x64 u20  | |cpython37x64|      |
 +----------------------+---------------------+
 | cpython 3.8 x86      | |cpython38x86|      |
 +----------------------+---------------------+
-| cpython 3.8 x64 u24  | |cpython38x64|      |
+| cpython 3.8 x64 u20  | |cpython38x64|      |
 +----------------------+---------------------+
 | cpython 3.9 x86      | |cpython39x86|      |
 +----------------------+---------------------+
-| cpython 3.9 x64 u24  | |cpython39x64|      |
+| cpython 3.9 x64 u20  | |cpython39x64|      |
 +----------------------+---------------------+
 | cpython 3.10 x86 u16 | |cpython310x86u16|  |
 +----------------------+---------------------+
-| cpython 3.10 x64 u24 | |cpython310x64u20|  |
+| cpython 3.10 x64 u20 | |cpython310x64u20|  |
 +----------------------+---------------------+
 | cpython 3.11 x86 u16 | |cpython311x86u16|  |
 +----------------------+---------------------+
-| cpython 3.11 x64 u24 | |cpython311x64u20|  |
+| cpython 3.11 x64 u20 | |cpython311x64u20|  |
 +----------------------+---------------------+
 | cpython 3.12 x86 u16 | |cpython312x86u16|  |
 +----------------------+---------------------+
-| cpython 3.12 x64 u24 | |cpython312x64u20|  |
+| cpython 3.12 x64 u20 | |cpython312x64u20|  |
 +----------------------+---------------------+
-| cpython 3.13 x64 u24 | |cpython313x64u20|  |
+| cpython 3.13 x64 u20 | |cpython313x64u20|  |
 +----------------------+---------------------+
 | cpython 3.14 x64 u24 | |cpython314x64u20|  |
 +----------------------+---------------------+
diff --git a/src/python-zstd.c b/src/python-zstd.c
@@ -206,11 +206,13 @@ static PyObject *py_zstd_uncompress(PyObject* self, PyObject *args)
             	error = 1;
 //			}
         } else if (cSize != dest_size) {
-		if (sizeof(uint64_t)==sizeof(unsigned long)) {
-			PyErr_Format(ZstdError, "Decompression error: length mismatch -> decomp %lu != %lu [header]", (uint64_t)cSize,  (uint64_t)dest_size);
-		} else {
-                        PyErr_Format(ZstdError, "Decompression error: length mismatch -> decomp %llu != %llu [header]", (uint64_t)cSize,  (uint64_t)dest_size);
-		}
+		//if (sizeof(uint64_t)==sizeof(unsigned long)) {
+			PyErr_Format(ZstdError, "Decompression error: length mismatch -> decomp %lu != %lu [header]", (unsigned long)cSize,  (unsigned long)dest_size);
+		//} 
+		//else if (sizeof(uint64_t)==sizeof(unsigned long long))
+		//{ //unsigned long long?! x86?!
+                //        PyErr_Format(ZstdError, "Decompression error: length mismatch -> decomp %llu != %llu [header]", (uint64_t)cSize,  (uint64_t)dest_size);
+		//}
             error = 1;
         }
     } else {
