Skip to content

Commit

Permalink
Merge pull request #26 from embray/fix-ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
embray committed Jun 2, 2024
2 parents 89a156b + 8a4f573 commit 285350a
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ jobs:
fail-fast: false
matrix:
platform: ["ubuntu-latest", "macos-latest"]
python-version: ["3.6", "3.7", "3.8"]
python-version: ["3.7", "3.8"]
gap-version: ["4.10.2", "4.11.0"]
exclude:
- python-version: "3.6"
gap-version: "4.11.0"
- python-version: "3.7"
gap-version: "4.11.0"
- python-version: "3.8"
gap-version: "4.10.2"
- platform: "macos-latest"
python-version: "3.7"
runs-on: "${{ matrix.platform }}"
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
- uses: actions/checkout@v4
- uses: actions/cache@v4
env:
# Increase this value to reset cache manually
CACHE_NUMBER: 0
with:
path: ~/conda_pkgs_dir
key: "${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ matrix.python-version }}-${{ matrix.gap-version }}"
- uses: "conda-incubator/setup-miniconda@v2"
- uses: "conda-incubator/setup-miniconda@v3"
with:
auto-update-conda: true
python-version: "${{ matrix.python-version }}"
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ gappy/*.dll
.eggs/
dist/

## Local development virtual env
.venv*

## setuptools_scm files
gappy/_version.py

Expand Down
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Changelog
v0.1.0a4 (unreleased)
---------------------

Breaking changes
^^^^^^^^^^^^^^^^

* Dropped support for Python 3.6; Python 3.7+ is officially supported (3.6 may
still work but is not tested).

Enhancements
^^^^^^^^^^^^

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ accessed in this way:

.. code-block:: python
>>> GAPInfo.Version
>>> gap.GAPInfo.Version
"4.dev"
Most basic Python types have direct equivalents in GAP, and can be passed
Expand Down
2 changes: 1 addition & 1 deletion gappy/gapobj.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ cdef class GapObj:
>>> from cysignals.alarm import alarm, AlarmInterrupt
>>> a, b = gap.GL(1000, 3).GeneratorsOfGroup(); g = a * b
>>> try:
... alarm(0.5); g ^ (2 ^ 10000)
... alarm(0.5); g ^ (gap(2) ^ 10000)
... except AlarmInterrupt:
... print('interrupted long computation')
...
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[metadata]
name = gappy-system
author = E. Madison Bray
author-email = embray@lri.fr
author_email = erik.m.bray@gmail.com
description = Python interface to GAP
url = https://github.com/embray/gappy
long_description = file: README.rst, CHANGES.rst
Expand All @@ -16,15 +16,14 @@ classifiers =
License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Operating System :: POSIX :: Linux
Programming Language :: Cython
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Topic :: Scientific/Engineering :: Mathematics

[options]
# We set packages to find: to automatically find all sub-packages
packages = find:
python_requires = >=3.6
python_requires = >=3.7
setup_requires = setuptools_scm
install_requires =
cysignals
Expand Down

0 comments on commit 285350a

Please sign in to comment.