Skip to content

Commit

Permalink
Bump upstream to 1.5.6 (#46)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
bretttully authored Jan 9, 2024
1 parent 8059fe6 commit 3a958db
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -25,14 +25,14 @@ 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
CPPFLAGS: -I/usr/local/opt/zlib/include
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
path: ./wheelhouse/*.whl
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion draco
Submodule draco updated 267 files
2 changes: 1 addition & 1 deletion setup-macos-arm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '[email protected], [email protected]',
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '[email protected], [email protected]',
Expand Down
2 changes: 1 addition & 1 deletion src/DracoPy.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 3a958db

Please sign in to comment.