Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into pyproject_metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Feb 17, 2024
2 parents f4db39c + 3fe5f62 commit c3577d4
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ jobs:
sleep 1
# We ignore _modules since sphinx puts all modules in the module
# overview but does not generate pages for .pyx modules.
linkchecker --check-extern --ignore-url=_modules/ http://localhost:8880
# We also ignore a url that is generated by sphinx itself (version 7.2.6).
linkchecker --check-extern --ignore-url='_modules/|https://www.sphinx-doc.org/' http://localhost:8880
- uses: JamesIves/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
20 changes: 17 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
cython: ["cython", "cython<3.0.0"]
exclude:
- python-version: 3.12
cython: cython<3.0.0
steps:
- uses: actions/checkout@v2
with: { submodules: recursive }
Expand All @@ -22,8 +25,19 @@ jobs:
- name: Install pplpy dependencies
shell: bash -l {0}
run: |
mamba install --quiet setuptools gmpy2 cysignals ppl "${{matrix.cython}}"
conda list
mamba install --quiet setuptools cysignals ppl gmp mpfr mpc "${{matrix.cython}}"
- name: Install gmpy2 via mamba
shell: bash -l {0}
if: ${{ matrix.python-version != '3.12' }}
run: |
mamba install --quiet gmpy2
python -c 'import gmpy2; print(gmpy2.version())'
- name: Install gmpy2 via pip
shell: bash -l {0}
if: ${{ matrix.python-version == '3.12' }}
run: |
pip install --pre gmpy2==2.2.0a1
python -c 'import gmpy2; print(gmpy2.version())'
- name: Install pplpy
shell: bash -l {0}
run: |
Expand Down
8 changes: 6 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ The available objects and functions from the `ppl` Python module are:
Installation
------------

<<<<<<< HEAD
=======

>>>>>>> upstream/master
The project is available at `Python Package Index <https://pypi.org/project/pplpy/>`_ and
can be installed with pip::

Expand Down Expand Up @@ -96,9 +100,9 @@ Requirements

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

- `cysignals <https://pypi.org/project/cysignals>`_
- `cysignals <https://pypi.org/project/cysignals/>`_

- `gmpy2 <https://pypi.org/project/gmpy2>`_
- `gmpy2 <https://pypi.org/project/gmpy2/>`_

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

Expand Down
1 change: 1 addition & 0 deletions environment.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ channels:
- defaults
dependencies:
- sphinx
- pip
- pip:
- linkchecker
- cython-lint
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
keywords = [
"polyhedron",
Expand Down

0 comments on commit c3577d4

Please sign in to comment.