Skip to content

Commit c3577d4

Browse files
author
Matthias Koeppe
committed
Merge remote-tracking branch 'upstream/master' into pyproject_metadata
2 parents f4db39c + 3fe5f62 commit c3577d4

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

.github/workflows/doc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
sleep 1
4040
# We ignore _modules since sphinx puts all modules in the module
4141
# overview but does not generate pages for .pyx modules.
42-
linkchecker --check-extern --ignore-url=_modules/ http://localhost:8880
42+
# We also ignore a url that is generated by sphinx itself (version 7.2.6).
43+
linkchecker --check-extern --ignore-url='_modules/|https://www.sphinx-doc.org/' http://localhost:8880
4344
- uses: JamesIves/github-pages-deploy-action@3.7.1
4445
with:
4546
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
python-version: ["3.8", "3.9", "3.10", "3.11"]
15+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1616
cython: ["cython", "cython<3.0.0"]
17+
exclude:
18+
- python-version: 3.12
19+
cython: cython<3.0.0
1720
steps:
1821
- uses: actions/checkout@v2
1922
with: { submodules: recursive }
@@ -22,8 +25,19 @@ jobs:
2225
- name: Install pplpy dependencies
2326
shell: bash -l {0}
2427
run: |
25-
mamba install --quiet setuptools gmpy2 cysignals ppl "${{matrix.cython}}"
26-
conda list
28+
mamba install --quiet setuptools cysignals ppl gmp mpfr mpc "${{matrix.cython}}"
29+
- name: Install gmpy2 via mamba
30+
shell: bash -l {0}
31+
if: ${{ matrix.python-version != '3.12' }}
32+
run: |
33+
mamba install --quiet gmpy2
34+
python -c 'import gmpy2; print(gmpy2.version())'
35+
- name: Install gmpy2 via pip
36+
shell: bash -l {0}
37+
if: ${{ matrix.python-version == '3.12' }}
38+
run: |
39+
pip install --pre gmpy2==2.2.0a1
40+
python -c 'import gmpy2; print(gmpy2.version())'
2741
- name: Install pplpy
2842
shell: bash -l {0}
2943
run: |

README.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ The available objects and functions from the `ppl` Python module are:
4444
Installation
4545
------------
4646

47+
<<<<<<< HEAD
48+
=======
49+
50+
>>>>>>> upstream/master
4751
The project is available at `Python Package Index <https://pypi.org/project/pplpy/>`_ and
4852
can be installed with pip::
4953

@@ -96,9 +100,9 @@ Requirements
96100

97101
- `Cython <http://cython.org>`_ (tested with both 0.29 and 3.0)
98102

99-
- `cysignals <https://pypi.org/project/cysignals>`_
103+
- `cysignals <https://pypi.org/project/cysignals/>`_
100104

101-
- `gmpy2 <https://pypi.org/project/gmpy2>`_
105+
- `gmpy2 <https://pypi.org/project/gmpy2/>`_
102106

103107
On Debian/Ubuntu systems the dependencies can be installed with::
104108

environment.test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ channels:
44
- defaults
55
dependencies:
66
- sphinx
7+
- pip
78
- pip:
89
- linkchecker
910
- cython-lint

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.9",
2525
"Programming Language :: Python :: 3.10",
2626
"Programming Language :: Python :: 3.11",
27+
"Programming Language :: Python :: 3.12",
2728
]
2829
keywords = [
2930
"polyhedron",

0 commit comments

Comments
 (0)