Skip to content

Commit

Permalink
Merge branch 'main' into pure-torch-base-and-hessian
Browse files Browse the repository at this point in the history
  • Loading branch information
f-dangel committed Sep 20, 2024
2 parents 1f75e3a + e30f713 commit 20f05ec
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .conda_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
9 changes: 5 additions & 4 deletions .github/workflows/lint-black.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ jobs:
black:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9
cache: pip
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/lint-darglint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ jobs:
darglint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9
cache: pip
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/lint-flake8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ jobs:
flake8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9
cache: pip
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/lint-isort.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ jobs:
isort:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9
cache: pip
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/lint-pydocstyle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ jobs:
if: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9
cache: pip
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: "3.x"
cache: pip
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ 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
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "${{ matrix.python-version }}"
cache: pip
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sphinx:
build:
os: ubuntu-22.04
tools:
python: "3.8"
python: "3.9"

python:
install:
Expand Down
10 changes: 10 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ 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))

### Internal

- Update Github action versions and cache `pip`
([PR](https://github.com/f-dangel/curvlinops/pull/129))

## [2.0.0] - 2024-08-15

This major release is almost fully backward compatible with the `1.x.y` release
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 #
Expand Down

0 comments on commit 20f05ec

Please sign in to comment.