Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/setup-pyth…
Browse files Browse the repository at this point in the history
…on-5
  • Loading branch information
leouieda authored Feb 7, 2024
2 parents 90a29dc + 416ac38 commit 8b62cb7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
env:
REQUIREMENTS: env/requirements-docs.txt env/requirements-build.txt
PYTHON: "3.10"
PYTHON: "3.11"

steps:
# Cancel any previous run of the test job
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Install requirements
run: python -m pip install -r env/requirements-build.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Install requirements
run: python -m pip install -r env/requirements-style.txt
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Install requirements
run: python -m pip install -r env/requirements-style.txt
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,21 @@ jobs:
- ubuntu
- macos
- windows
python:
- "3.7"
- "3.10"
cached:
- true
dependencies:
- oldest
- latest
include:
- python: "3.7"
dependencies: oldest
- python: "3.10"
dependencies: latest
- dependencies: oldest
python: "3.9"
- dependencies: latest
python: "3.11"
- os: ubuntu
python: "3.10"
python: "3.11"
dependencies: latest
cached: false

env:
REQUIREMENTS: env/requirements-build.txt env/requirements-test.txt
# Used to tag codecov submissions
Expand Down Expand Up @@ -157,7 +158,7 @@ jobs:
run: coverage xml

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
file: ./coverage.xml
env_vars: OS,PYTHON,DEPENDENCIES
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python==3.10
- python==3.11
- pip
- make
# Run
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ classifiers =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
url = https://github.com/fatiando/ensaio
project_urls =
Documentation = https://www.fatiando.org/ensaio
Expand Down

0 comments on commit 8b62cb7

Please sign in to comment.