From e101323787d73d239de5735127acde082712b105 Mon Sep 17 00:00:00 2001 From: Felix Dangel <48687646+f-dangel@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:40:48 -0400 Subject: [PATCH] [REQ] Deprecate python 3.8 (#128) * [REQ] Deprecate python 3.8 * [REQ] Use Python 3.9 for RTD build * [FIX] Update python in conda env, adapt doctest to numpy>=2 * [REQ] Use numpy<2 --- .conda_env.yml | 4 ++-- .github/workflows/lint-black.yaml | 4 ++-- .github/workflows/lint-darglint.yaml | 4 ++-- .github/workflows/lint-flake8.yaml | 4 ++-- .github/workflows/lint-isort.yaml | 4 ++-- .github/workflows/lint-pydocstyle.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- .readthedocs.yaml | 2 +- changelog.md | 5 +++++ pyproject.toml | 4 ++-- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.conda_env.yml b/.conda_env.yml index 7ae46e6..427640e 100644 --- a/.conda_env.yml +++ b/.conda_env.yml @@ -3,7 +3,7 @@ channels: - pytorch - defaults dependencies: - - pip=21.2.4 - - python=3.8.5 + - python=3.9.16 + - pip=23.1.2 - pip: - -e .[lint,test,docs] diff --git a/.github/workflows/lint-black.yaml b/.github/workflows/lint-black.yaml index 845479e..657ec75 100644 --- a/.github/workflows/lint-black.yaml +++ b/.github/workflows/lint-black.yaml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/lint-darglint.yaml b/.github/workflows/lint-darglint.yaml index 7465bf0..0b52177 100644 --- a/.github/workflows/lint-darglint.yaml +++ b/.github/workflows/lint-darglint.yaml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/lint-flake8.yaml b/.github/workflows/lint-flake8.yaml index c9fe10a..8a391a9 100644 --- a/.github/workflows/lint-flake8.yaml +++ b/.github/workflows/lint-flake8.yaml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/lint-isort.yaml b/.github/workflows/lint-isort.yaml index cdde138..721c908 100644 --- a/.github/workflows/lint-isort.yaml +++ b/.github/workflows/lint-isort.yaml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/lint-pydocstyle.yaml b/.github/workflows/lint-pydocstyle.yaml index 5cd4baa..47e40e1 100644 --- a/.github/workflows/lint-pydocstyle.yaml +++ b/.github/workflows/lint-pydocstyle.yaml @@ -15,10 +15,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5dc6c11..794063a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,10 +14,10 @@ jobs: name: "Python ${{ matrix.python-version }}" runs-on: ubuntu-latest env: - USING_COVERAGE: '3.8' + USING_COVERAGE: '3.9' strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] steps: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3d33c3e..0d9ce49 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -9,7 +9,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.9" python: install: diff --git a/changelog.md b/changelog.md index f24a918..2e1490f 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed/Removed + +- Deprecate Python 3.8 as it will reach its end of life in October 2024 + ([PR](https://github.com/f-dangel/curvlinops/pull/128)) + ## [2.0.0] - 2024-08-15 This major release is almost fully backward compatible with the `1.x.y` release diff --git a/pyproject.toml b/pyproject.toml index fd4e2af..1164203 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,6 @@ classifiers = [ "Development Status :: 4 - Beta", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -40,12 +39,13 @@ dependencies = [ "backpack-for-pytorch>=1.6.0,<2.0.0", "torch>=2.0", "scipy>=1.7.1,<2.0.0", + "numpy<2.0.0", "tqdm>=4.61.0,<5.0.0", "einops", "einconv", ] # Require a specific Python version, e.g. Python 2.7 or >= 3.4 -requires-python = ">=3.8" +requires-python = ">=3.9" ############################################################################### # Development dependencies #