From 89eb131d90052f071f6a3a17c5c855394e3a714d Mon Sep 17 00:00:00 2001
From: "Joshua D. Boyd" <jdboyd@jdboyd.net>
Date: Fri, 12 Jan 2024 18:30:50 -0500
Subject: [PATCH] Bump version for development to 1.16, add 3.12 support

---
 .github/workflows/build-macos.yml   | 3 +--
 .github/workflows/build-windows.yml | 2 +-
 .github/workflows/tests.yaml        | 9 ++++-----
 .github/workflows/wheels.yml        | 8 +++-----
 NEWS                                | 5 ++++-
 lzomodule.c                         | 2 +-
 pyproject.toml                      | 4 ++--
 setup.py                            | 2 +-
 8 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index a442fca..3a5ae1a 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -8,8 +8,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        python-version: ["3.7", "3.8"]
-#        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
     name: ${{ matrix.python-version }}
     steps:
       - name: Checkout repo
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index bcea88e..ec9d919 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -11,7 +11,7 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
     name: ${{ matrix.python-version }}
     steps:
       - name: Checkout repo
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 04d1df7..3588157 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -14,11 +14,10 @@ jobs:
           - 3.9
           - "3.10"
           - 3.11
+          - 3.12
           - pypy-3.7
         os:
           - ubuntu-latest
-#          - macos-10.15
-#          - macos-11
           - macos-12
           - macos-latest
           - windows-latest
@@ -107,12 +106,12 @@ jobs:
         if: runner.os == 'Windows'
         working-directory: .\lzo-2.10\build
         run: msbuild lzo_static_lib.vcxproj -p:Configuration=Release -p:Platform=x64 -p:OutDir=..\
-      - run: python setup.py install
-      - run: pip install pytest wheel
+      - run: pip install -e ./
+      - run: pip install pytest build
       - run: pytest --doctest-modules tests/
       - run: ls -l
         if: runner.os != 'Windows'
-      - run: python setup.py sdist bdist_wheel
+      - run: python -m build
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9ad69a7..8bb3160 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -31,8 +31,6 @@ jobs:
                 exclude:
                   - os: windows-2019
                     arch: "x86_64"
-                  - os: ubuntu-20.04
-                    arch: "arm64"
         steps:
           - name: Checkout repo
             uses: actions/checkout@v3
@@ -51,7 +49,7 @@ jobs:
                 name: ${{ runner.os }}-${{ matrix.arch }}
                 path: wheelhouse/*.whl
                 if-no-files-found: error
-    
+
     wheels-old:
         name: Build old wheels on ${{ matrix.os }} for ${{ matrix.arch }}
         runs-on: ${{ matrix.os }}
@@ -99,7 +97,7 @@ jobs:
                 name: ${{ runner.os }}-${{ matrix.arch }}
                 path: wheelhouse/*.whl
                 if-no-files-found: error
-    
+
     wheels-win27:
         name: Build Python 2.7 wheels on Windows ${{ matrix.arch }}
         runs-on: windows-2019
@@ -189,4 +187,4 @@ jobs:
             uses: pypa/gh-action-pypi-publish@release/v1
             with:
                 print-hash: true
-                repository-url: https://test.pypi.org/legacy/
\ No newline at end of file
+                repository-url: https://test.pypi.org/legacy/
diff --git a/NEWS b/NEWS
index 18a6162..2c5a7b1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,10 @@
 User visible changes for Python-LZO
 =======================================================================
 
-Changes in 1.15 (XX Jan 2022)
+Changes in 1.16 (XX Jan 2024)
+  *
+
+Changes in 1.15 (22 May 2022)
   * Remove python 2.x support.
   * Update to PEP517 compliance.
   * Migrate CI to github actions.
diff --git a/lzomodule.c b/lzomodule.c
index 9a12143..ae5fa19 100644
--- a/lzomodule.c
+++ b/lzomodule.c
@@ -29,7 +29,7 @@
  */
 
 
-#define MODULE_VERSION  "1.15"
+#define MODULE_VERSION  "1.16"
 
 #define PY_SSIZE_T_CLEAN
 
diff --git a/pyproject.toml b/pyproject.toml
index 437e56c..7752826 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-lzo"
-version = "1.15"
+version = "1.16"
 description = "Python bindings for the LZO data compression library"
 readme = "README.md"
 requires-python = ">=2.6"
@@ -38,4 +38,4 @@ archs = ["all"]
 build-verbosity = 3
 test-requires = "pytest"
 test-command = "pytest {package}/tests"
-test-skip = "*-win_arm64 *-macosx_arm64 *-macosx_universal2:arm64"
\ No newline at end of file
+test-skip = "*-win_arm64 *-macosx_arm64 *-macosx_universal2:arm64"
diff --git a/setup.py b/setup.py
index de012e8..30fbf26 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ def run(self):
 
 setup(
     name="python-lzo",
-    version="1.15",
+    version="1.16",
     description="Python bindings for the LZO data compression library",
     author="Markus F.X.J. Oberhumer",
     author_email="markus@oberhumer.com",