Why testing with other versions, try 3.11 for building wheels in wheels script.

Move fields from setup.py to pyproject. Other stuff.

Free threading should be off by default!

Remove test_version test since it seems to introduce otherwise uneeded dependency.

Replace 20.04 with 24.04 because 20.04 runner is deprecated.

Author: jd-boyd

.github/workflows/tests.yaml

@@ -20,14 +20,15 @@ jobs:
           - macos-latest
           - windows-latest
         exclude:
+          # Save time
           - os: macos-latest
-            python-version: '3.10'
-          - os: macos-latest
-            python-version: 3.9
+            python-version: '3.12'
+
+          # Both of these have trouble setting up that python on macos.
           - os: macos-latest
-            python-version: '3.11'
+            python-version: '3.9'
           - os: macos-latest
-            python-version: 'pypy-3.8'
+            python-version: 'pypy-3.9'
     runs-on:  ${{ matrix.os }}
     name: ${{ matrix.os }} @ ${{ matrix.python-version }}
     steps:

.github/workflows/wheels.yml

@@ -92,20 +92,20 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-20.04, windows-2019, macos-12]
+                os: [ubuntu-24.04, windows-2019, macos-12]
                 arch: ["x86_64", "arm64"]
                 include:
                   - os: windows-2019
                     arch: win_amd64
                   - os: windows-2019
                     arch: win32
-                  - os: ubuntu-20.04
+                  - os: ubuntu-24.04
                     arch: i686
-                  - os: ubuntu-20.04
+                  - os: ubuntu-24.04
                     arch: aarch64
-                  - os: ubuntu-20.04
+                  - os: ubuntu-24.04
                     arch: ppc64le
-                  - os: ubuntu-20.04
+                  - os: ubuntu-24.04
                     arch: s390x
                 exclude:
                   - os: windows-2019
@@ -120,12 +120,19 @@ jobs:
             uses: docker/setup-qemu-action@v2
             with:
                 platforms: all
+          - name: Set up Python
+            uses: actions/setup-python@v4
+            with:
+              python-version: "3.11"
           # - name: Build and test wheels
           #   uses: pypa/cibuildwheel@v2.16.2
           #   env:
           #       CIBW_BUILD: "*${{ matrix.arch }}"
           - name: Install cibuildwheel
             run: python -m pip install cibuildwheel==3.0.0
+          - name: Linux install LZO
+            if: runner.os == 'Linux'
+            run: sudo apt install liblzo2-dev
           - name: Build wheels
             run: python -m cibuildwheel --output-dir wheelhouse
             # to supply options, put them in 'env', like:
@@ -151,6 +158,7 @@ jobs:
                 python-version: '3.11'
           - name: Build sdist
             run: |
+                sudo apt install liblzo2-dev
                 python -m pip install -U pip
                 python -m pip install -U build
                 python -m build -s

pyproject.toml

@@ -10,7 +10,7 @@ name = "python-lzo"
 version = "1.16"
 description = "Python bindings for the LZO data compression library"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 authors = [
     {name = "Markus F.X.J. Oberhumer", email = "markus@oberhumer.com"},
 ]
@@ -40,4 +40,3 @@ build-verbosity = 3
 test-requires = "pytest"
 test-command = "pytest {package}/tests"
 test-skip = "*-win_arm64"
-skip = "*t-win*"  # Skip free-threaded Python builds on Windows

setup.py

@@ -34,13 +34,6 @@ def run(self):
 
 setup(
     name="python-lzo",
-    version="1.16",
-    description="Python bindings for the LZO data compression library",
-    author="Markus F.X.J. Oberhumer",
-    author_email="markus@oberhumer.com",
-    maintainer="Joshua D. Boyd",
-    maintainer_email="jdboyd@jdboyd.net",
-    url="https://github.com/jd-boyd/python-lzo",
     license="GNU General Public License (GPL)",
     tests_require=['pytest'],
     cmdclass={
@@ -53,7 +46,6 @@ def run(self):
             include_dirs=[os.path.join(lzo_dir, "include")],
             libraries=['lzo2'] if not sys.platform == "win32" else [],
             library_dirs=[os.path.join(lzo_dir, "lib")],
-            #extra_link_args=["-flat_namespace"] if sys.platform == "darwin" else [],
         )
     ],
     long_description="""

tests/test_lzo.py

@@ -105,16 +105,16 @@ def gen_raw(src, level=1):
         raise lzo.error("internal error 2")
     print("compressed %6d -> %6d" % (len(src), len(c)))
 
-def test_version():
-    if sys.version_info >= (3, 10):
-        from importlib.metadata import version
-        pkg_version = version("python-lzo")
-    else:
-        import pkg_resources
-        pkg_version = pkg_resources.require("python-lzo")[0].version
-    mod_version = lzo.__version__.decode('utf-8')
-    assert pkg_version == mod_version, \
-        "%r != %r" %(pkg_version, mod_version)
+# def test_version():
+#     if sys.version_info >= (3, 10):
+#         from importlib.metadata import version
+#         pkg_version = version("python-lzo")
+#     else:
+#         import pkg_resources
+#         pkg_version = pkg_resources.require("python-lzo")[0].version
+#     mod_version = lzo.__version__.decode('utf-8')
+#     assert pkg_version == mod_version, \
+#         "%r != %r" %(pkg_version, mod_version)
 
 @pytest.mark.parametrize("src, level", [(b"aaaaaaaaaaaaaaaaaaaaaaaa", 1), (b"abcabcabcabcabcabcabcabc", 1), (b"abcabcabcabcabcabcabcabc", 9)])
 def test_lzo(src, level):