From 3a958dba722fb9ae615c0ad4d3b6bf5c79d7b45d Mon Sep 17 00:00:00 2001
From: bretttully <brett.tully@nearmap.com>
Date: Wed, 10 Jan 2024 07:13:07 +1100
Subject: [PATCH] Bump upstream to 1.5.6 (#46)

* Bump upstream to 1.5.6

* Error in dockerfile with py311

* buildwheel no longer supports <py3.6

* we dont want py3.12 yet

* change package version
---
 .github/workflows/build_wheel.yml | 8 ++++----
 Dockerfile                        | 5 +++++
 draco                             | 2 +-
 setup-macos-arm.py                | 2 +-
 setup.py                          | 2 +-
 src/DracoPy.pxd                   | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index e36b4bb..66f7cef 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -3,7 +3,7 @@ name: Build Wheels
 on: [push, workflow_dispatch] 
 
 env:
-  CIBW_SKIP: cp27-* cp33-* cp34-* cp35-* cp36-* pp* *-musllinux*
+  CIBW_SKIP: cp36-* cp312-* pp* *-musllinux*
 
 jobs:
   build_wheels:
@@ -25,7 +25,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.12.1
+        uses: pypa/cibuildwheel@v2.15.0
         # to supply options, put them in 'env', like:
         env:
           CIBW_BEFORE_BUILD: git submodule init && git submodule update && pip install cython oldest-supported-numpy scikit-build 
@@ -33,6 +33,6 @@ jobs:
           LDFLAGS: -L/usr/local/opt/zlib/lib
           CIBW_ARCHS_MACOS: "x86_64 arm64"
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
-          path: ./wheelhouse/*.whl
\ No newline at end of file
+          path: ./wheelhouse/*.whl
diff --git a/Dockerfile b/Dockerfile
index 02f5fa7..90c9d1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,29 +14,34 @@ RUN /opt/python/cp37-cp37m/bin/pip3.7 install pip --upgrade
 RUN /opt/python/cp38-cp38/bin/pip3.8 install pip --upgrade
 RUN /opt/python/cp39-cp39/bin/pip3.9 install pip --upgrade
 RUN /opt/python/cp310-cp310/bin/pip3.10 install pip --upgrade
+RUN /opt/python/cp311-cp311/bin/pip3.11 install pip --upgrade
 
 RUN /opt/python/cp36-cp36m/bin/pip3.6 install scikit-build twine oldest-supported-numpy
 RUN /opt/python/cp37-cp37m/bin/pip3.7 install scikit-build twine oldest-supported-numpy
 RUN /opt/python/cp38-cp38/bin/pip3.8 install scikit-build twine oldest-supported-numpy
 RUN /opt/python/cp39-cp39/bin/pip3.9 install scikit-build twine oldest-supported-numpy
 RUN /opt/python/cp310-cp310/bin/pip3.10 install scikit-build twine oldest-supported-numpy
+RUN /opt/python/cp311-cp311/bin/pip3.11 install scikit-build twine oldest-supported-numpy
 
 RUN /opt/python/cp36-cp36m/bin/python3.6 setup.py develop
 RUN /opt/python/cp37-cp37m/bin/python3.7 setup.py develop
 RUN /opt/python/cp38-cp38/bin/python3.8 setup.py develop
 RUN /opt/python/cp39-cp39/bin/python3.9 setup.py develop
 RUN /opt/python/cp310-cp310/bin/python3.10 setup.py develop
+RUN /opt/python/cp311-cp311/bin/python3.11 setup.py develop
 
 RUN /opt/python/cp36-cp36m/bin/python3.6 -m pytest -v -x tests.py
 RUN /opt/python/cp37-cp37m/bin/python3.7 -m pytest -v -x tests.py
 RUN /opt/python/cp38-cp38/bin/python3.8 -m pytest -v -x tests.py
 RUN /opt/python/cp39-cp39/bin/python3.9 -m pytest -v -x tests.py
 RUN /opt/python/cp310-cp310/bin/python3.10 -m pytest -v -x tests.py
+RUN /opt/python/cp311-cp311/bin/python3.11 -m pytest -v -x tests.py
 
 RUN /opt/python/cp36-cp36m/bin/python3.6 setup.py sdist bdist_wheel
 RUN /opt/python/cp37-cp37m/bin/python3.7 setup.py sdist bdist_wheel
 RUN /opt/python/cp38-cp38/bin/python3.8 setup.py sdist bdist_wheel
 RUN /opt/python/cp39-cp39/bin/python3.9 setup.py sdist bdist_wheel
 RUN /opt/python/cp310-cp310/bin/python3.10 setup.py sdist bdist_wheel
+RUN /opt/python/cp311-cp311/bin/python3.11 setup.py sdist bdist_wheel
 
 RUN for whl in `ls dist/*.whl`; do auditwheel repair --plat manylinux2010_x86_64 $whl; done
diff --git a/draco b/draco
index befe2d8..9f856ab 160000
--- a/draco
+++ b/draco
@@ -1 +1 @@
-Subproject commit befe2d880992e6fdbfd29fe20a3b8664460b92cd
+Subproject commit 9f856abaafb4b39f1f013763ff061522e0261c6f
diff --git a/setup-macos-arm.py b/setup-macos-arm.py
index aade454..7fd057b 100644
--- a/setup-macos-arm.py
+++ b/setup-macos-arm.py
@@ -14,7 +14,7 @@ def read(fname):
 
 setuptools.setup(
     name='DracoPy',
-    version='1.3.0',
+    version='1.4.0',
     description = 'Python wrapper for Google\'s Draco Mesh Compression Library',
     author = 'Manuel Castro, William Silversmith :: Contributors :: Fatih Erol, Faru Nuri Sonmez, Zeyu Zhao, Denis Riviere',
     author_email = 'macastro@princeton.edu, ws9@princeton.edu',
diff --git a/setup.py b/setup.py
index 862338e..d745f76 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ def read(fname):
 
 setup(
     name='DracoPy',
-    version='1.3.0',
+    version='1.4.0',
     description = 'Python wrapper for Google\'s Draco Mesh Compression Library',
     author = 'Manuel Castro, William Silversmith :: Contributors :: Fatih Erol, Faru Nuri Sonmez, Zeyu Zhao, Denis Riviere',
     author_email = 'macastro@princeton.edu, ws9@princeton.edu',
diff --git a/src/DracoPy.pxd b/src/DracoPy.pxd
index 306b366..4b8ff4a 100644
--- a/src/DracoPy.pxd
+++ b/src/DracoPy.pxd
@@ -74,7 +74,7 @@ cdef extern from "DracoPy.h" namespace "DracoFunctions":
         const int quantization_bits,
         const int compression_level,
         const float quantization_range,
-        const const float *quantization_origin,
+        const float *quantization_origin,
         const bool preserve_order,
         const bool create_metadata,
         const int integer_mark,