From 615c62e547ecaeb1799999173b02c3b8a0d6cc06 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 11:21:13 +0200 Subject: [PATCH 1/8] trying to build just in a virtualenv (no conda); ignore the local venv for this --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3289c03..829815d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ gappy/*.dll .eggs/ dist/ +## Local development virtual env +.venv + ## setuptools_scm files gappy/_version.py From d2907b4537eee94564eccefd399f1772babc0189 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 11:22:14 +0200 Subject: [PATCH 2/8] fix warning from setuptools about author-email and fix author's email --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c40469d..9b69d26 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From 6af94adb9a412c14c6e1c7b2a640744f7805a7cf Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 11:28:21 +0200 Subject: [PATCH 3/8] fix slightly misleading doctest in readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1f0980a..02a6b4d 100644 --- a/README.rst +++ b/README.rst @@ -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 From 86a61be0e30e5307ba39697f72a1b00e6c9ec038 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 11:49:54 +0200 Subject: [PATCH 4/8] update github action versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 883b1b7..2f8753d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: gap-version: "4.10.2" 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 From 49755c89a43a2df11d9af3dca8d9b258e20e6120 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 11:53:42 +0200 Subject: [PATCH 5/8] try upgrading setup-miniconda action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f8753d..44b9f61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: 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 }}" From b228b47222239b1c2d6a804d048fb371030db176 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 11:57:12 +0200 Subject: [PATCH 6/8] drop older pythons on MacOS (will probably drop them entirely later, and add 3.9+) --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44b9f61..40fa42e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,10 @@ jobs: gap-version: "4.11.0" - python-version: "3.8" gap-version: "4.10.2" + - platform: "macos-latest" + python-version: "3.6" + - platform: "macos-latest" + python-version: "3.7" runs-on: "${{ matrix.platform }}" steps: - uses: actions/checkout@v4 From 523a3533b8026ff58fc54e241b3a9e205efca897 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 12:29:01 +0200 Subject: [PATCH 7/8] go ahead and drop Python 3.6 outright as it is already starting to cause some maintenance headaches --- .github/workflows/ci.yml | 6 +----- .gitignore | 2 +- CHANGES.rst | 6 ++++++ setup.cfg | 3 +-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40fa42e..da6d3d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,17 +13,13 @@ 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.6" - platform: "macos-latest" python-version: "3.7" runs-on: "${{ matrix.platform }}" diff --git a/.gitignore b/.gitignore index 829815d..cfd3be0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ gappy/*.dll dist/ ## Local development virtual env -.venv +.venv* ## setuptools_scm files gappy/_version.py diff --git a/CHANGES.rst b/CHANGES.rst index 68a0895..3218cdf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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 ^^^^^^^^^^^^ diff --git a/setup.cfg b/setup.cfg index 9b69d26..0c33e14 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,6 @@ 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 @@ -24,7 +23,7 @@ classifiers = [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 From 8a4f57390662f82d262b5491c3a823e15d3b5c00 Mon Sep 17 00:00:00 2001 From: "E. Madison Bray" Date: Sun, 2 Jun 2024 12:41:02 +0200 Subject: [PATCH 8/8] fix stupid bug in test that was responsible for it failing randomly :) --- gappy/gapobj.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gappy/gapobj.pyx b/gappy/gapobj.pyx index 0b84ea5..e520eb7 100644 --- a/gappy/gapobj.pyx +++ b/gappy/gapobj.pyx @@ -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') ...