Skip to content

Commit

Permalink
Merge branch '3-manifolds:master' into towards-cylint-in-core
Browse files Browse the repository at this point in the history
  • Loading branch information
fchapoton authored Sep 10, 2023
2 parents 520ed04 + 59d46e9 commit 2dcb215
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 123 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cirrus_wheels_macos_arm64_task:
image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
env:
CIBW_ARCHS_MACOS: arm64
CIBW_SKIP: pp* cp38*
CIBW_SKIP: pp* cp38* cp312*
CIBW_BEFORE_BUILD: >
pip install cython FXrays low_index sphinx sphinx_rtd_theme &&
pip install --pre --extra-index-url https://test.pypi.org/simple cypari &&
Expand All @@ -22,7 +22,7 @@ cirrus_wheels_macos_arm64_task:
- brew install python3
- python3 --version
install_cibuildwheel_script:
- python3 -m pip install cibuildwheel
- python3 -m pip install cibuildwheel==2.15.0
run_cibuildwheel_script:
- python3 -m cibuildwheel --output-dir wheelhouse
wheels_artifacts:
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v3
name: Install Python
with:
python-version: '3.9'

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
uses: pypa/[email protected]
env:
# Skip Python 2.7, 3.5, 3.11, 32 bit Linux, and PyPy
CIBW_SKIP: cp27-* cp35-* *-manylinux_i686 *musllinux* pp*
# Skip Python 3.12, 32 bit Linux, and PyPy
CIBW_SKIP: cp312-* *-manylinux_i686 *musllinux* pp*
CIBW_BEFORE_ALL_LINUX: yum install -y tk mesa-libGLU-devel
CIBW_BEFORE_BUILD: >
pip install cython FXrays low_index sphinx sphinx_rtd_theme &&
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v3
name: Install Python
with:
python-version: '3.9'

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
uses: pypa/[email protected]
env:
# Skip Python 2.7, 3.5, 3.11, 32 bit Linux, and PyPy
CIBW_SKIP: cp27-* cp35-* cp36-* cp37-* pp*
# Skip Python 3.12 for now
CIBW_BUILD: cp310-* cp311-*
CIBW_ARCHS_MACOS: x86_64 universal2
CIBW_BEFORE_BUILD: >
pip install cython FXrays low_index sphinx sphinx_rtd_theme &&
Expand Down
21 changes: 5 additions & 16 deletions .github/workflows/macos_older_pythons.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS Older Python Wheels
name: macOS Wheels

on: [push, pull_request]

Expand All @@ -13,22 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v3
name: Install Python
with:
python-version: '3.9'

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
uses: pypa/[email protected]
env:
# Skip Python 2.7, 3.5, 3.11, 32 bit Linux, and PyPy
CIBW_SKIP: cp27-* cp35-* cp38-* cp39-* cp310-* cp311-* pp*
CIBW_ARCHS_MACOS: x86_64
CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
CIBW_ARCHS_MACOS: x86_64 universal2
CIBW_BEFORE_BUILD: >
pip install cython FXrays low_index sphinx sphinx_rtd_theme &&
pip install --pre --extra-index-url https://test.pypi.org/simple cypari &&
Expand All @@ -45,5 +34,5 @@ jobs:

- uses: actions/upload-artifact@v3
with:
name: snappy_macos_older_wheels
name: snappy_macos_wheels
path: ./wheelhouse/*.whl
18 changes: 4 additions & 14 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]
os: [windows-2019]

steps:
- uses: actions/checkout@v3

- uses: actions/setup-python@v3
name: Install Python
with:
python-version: '3.9'

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
uses: pypa/[email protected]
env:
# Skip Python 2.7, 3.5, 3.11, and PyPy
CIBW_SKIP: cp27-* cp35-* pp*
# Skip Python 3.12, and PyPy
CIBW_SKIP: cp312-* pp*
CIBW_BEFORE_BUILD: >
pip install cython FXrays low_index sphinx sphinx_rtd_theme &&
pip install --pre --extra-index-url https://test.pypi.org/simple cypari &&
Expand Down
2 changes: 1 addition & 1 deletion cython/core/triangulation.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ cdef class Triangulation():
if self._PDcode is not None:
return spherogram.Link(self._PDcode)
elif self.DT_code() is not None:
return spherogram.DTcodec(self.DT_code()).link()
return spherogram.DTcodec(*self.DT_code(flips=True)).link()
else:
raise ValueError('No associated link known.')

Expand Down
Loading

0 comments on commit 2dcb215

Please sign in to comment.