Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Python 3.9 #356

Merged
merged 7 commits into from
Jan 9, 2024
Merged

Remove Python 3.9 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e39db23
pyupgrade from 3.9 to 3.10
davidorme Jan 3, 2024
a8cb086
Remove 3.9 from CI process
davidorme Jan 3, 2024
b152555
Resolving issue with badly declared new type
davidorme Jan 3, 2024
03e7cd2
TypeAlias didn't quite work
davidorme Jan 3, 2024
8fcc1f0
Updating python versions support in pyproject.toml
davidorme Jan 4, 2024
2650769
Updating doc package versions in pyproject.toml
davidorme Jan 4, 2024
344d547
'Solving' some doc build issues
davidorme Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"
- uses: pre-commit/[email protected]

test:
Expand All @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
python-version: [ "3.9" , "3.10", "3.11" ]
python-version: [ "3.10", "3.11" ]

steps:
- uses: actions/checkout@v3
Expand All @@ -40,7 +40,7 @@ jobs:
run: poetry run pytest --cov-report xml

- name: Upload coverage to Codecov
if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9')
if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10')
uses: codecov/codecov-action@v3

docs_build:
Expand All @@ -50,7 +50,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"

- name: Install Poetry
uses: abatilo/[email protected]
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,8 @@ repos:
rev: v0.33.0
hooks:
- id: markdownlint
- repo: https://github.com/asottile/pyupgrade
rev: v3.13.0
hooks:
- id: pyupgrade
args: [--py310-plus]
4 changes: 4 additions & 0 deletions docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ class MyReferenceStyle(AuthorYearReferenceStyle):
("py:class", "virtual_rainforest.models.abiotic.energy_balance.EnergyBalance"),
# Something off about JSONSchema intersphinx mapping?
("py:obj", "virtual_rainforest.core.schema.ValidatorWithDefaults.ID_OF"),
# HACK - sphinx seems to thing GRID_STRUCTURE_SIG is a tuple not a type alias
("py:obj", "virtual_rainforest.core.grid.GRID_STRUCTURE_SIG.__repr__"),
("py:obj", "virtual_rainforest.core.grid.GRID_STRUCTURE_SIG.count"),
("py:obj", "virtual_rainforest.core.grid.GRID_STRUCTURE_SIG.index"),
]
intersphinx_mapping = {
"numpy": ("https://numpy.org/doc/stable/", None),
Expand Down
4 changes: 1 addition & 3 deletions docs/source/development/design/core.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ concept that matters!

```toml
[core.data.soil_depth]
values = {forest_cover.M=0.1,
forest_cover.L=0.5,
forest_cover.F=1.0}
values = {forest_cover.M=0.1, forest_cover.L=0.5, forest_cover.F=1.0}
```

These use one of the first three approaches above, which index _individual_
Expand Down
Loading