Skip to content

Commit

Permalink
Merge pull request #245 from eshwen/esh-bump-everything
Browse files Browse the repository at this point in the history
Bump all dependencies and pre-commit hooks
  • Loading branch information
eshwen authored Dec 10, 2024
2 parents 8fdb903 + 48a4fa3 commit 1434646
Show file tree
Hide file tree
Showing 12 changed files with 2,692 additions and 2,938 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: eshwen/adrenaline/builder@v0.5.0
- uses: eshwen/adrenaline/builder@v0.6.0
with:
python-version: '3.10'
install-dev-deps: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
lint:
uses: eshwen/adrenaline/.github/workflows/python-quality-check.yml@v0.5.0
uses: eshwen/adrenaline/.github/workflows/python-quality-check.yml@v0.6.0
with:
python-version: '3.10'
path: 'my_project/'
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.10", "3.11", "3.12" ]
python-version: [ "3.10", "3.11", "3.12", "3.13" ]

steps:
- uses: actions/checkout@v4

- name: Test
uses: eshwen/adrenaline/test-python@v0.5.0
uses: eshwen/adrenaline/test-python@v0.6.0
with:
python-version: ${{ matrix.python-version }}
pkg-name: 'my_project/'
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ default_stages: [ pre-commit, pre-push, commit, push ]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-merge-conflict
- id: check-shebang-scripts-are-executable
Expand All @@ -27,19 +27,19 @@ repos:
- id: auto-walrus

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.4.10' # Must match requirements-dev.txt
rev: 'v0.8.2' # Must match requirements-dev.txt
hooks:
- id: ruff
args: [ --fix, --exit-non-zero-on-fix ]
- id: ruff-format

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.10.1 # Must match requirements-dev.txt
rev: v1.13.0 # Must match requirements-dev.txt
hooks:
- id: mypy
additional_dependencies:
- 'pandera~=0.19.3' # Must match requirements.txt
- 'pydantic~=2.7.4' # Must match requirements.txt
- 'pandera~=0.21.1' # Must match requirements.txt
- 'pydantic~=2.10.3' # Must match requirements.txt

- repo: https://github.com/python-poetry/poetry
rev: '1.8.0'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Documentation](https://img.shields.io/badge/docs-Documentation%20--%20GitHub%20Pages-brightgreen?style=flat&logo=readthedocs)](https://eshwen.github.io/ds-python-boilerplate/index.html)

[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12-blue?logo=Python&logoColor=yellow&link=https%3A%2F%2Fwww.python.org%2F)](https://python.org)
[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue?logo=Python&logoColor=yellow&link=https%3A%2F%2Fwww.python.org%2F)](https://python.org)
[![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)](https://python-poetry.org/)
[![Docker](https://badgen.net/badge/icon/docker?icon=docker&label)](https://docker.com/)

Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/conda.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
```

1. Stops automatically activating the `base` env when opening the terminal.
2. This project also supports 3.11 and 3.12 if you want to use those instead.
2. This project also supports 3.11 - 3.13 if you want to use those instead.

4. And finally, install the requirements:

Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/poetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Then, navigate to the project's root directory, and create the `virtualenv` envi
poetry env use 3.10 # (1)
```

1. This project also supports 3.11 and 3.12 if you want to use those instead.
1. This project also supports 3.11 - 3.13 if you want to use those instead.

In future sessions (on the CLI), you can enter the environment by navigating to the project's root directory and running

Expand Down
4 changes: 2 additions & 2 deletions docs/tooling/quality.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ like `flake8`, `isort` (automatic import sorting), and `pydocstyle` (docstring c
To only check your code, run

```shell
ruff my_project/ tests/
ruff check my_project/ tests/
```

To automatically fix any issues, run

```shell
ruff --fix my_project/ tests/
ruff check --fix my_project/ tests/
```

Ruff now contains a formatter to replace [Black]. It ensures consistently-formatted, highly readable code.
Expand Down
5,098 changes: 2,438 additions & 2,660 deletions poetry.lock

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ authors = ["Eshwen Bhal, PhD <[email protected]>"]
readme = "README.md"

[tool.poetry.dependencies]
python = ">=3.10,<3.13"
python = ">=3.10,<3.14"

# Terminal colours
colorama = "*"

# Data processing
pandas = { version = "^2.1.3", extras = ["performance", "visualisation", "computation", "excel", "sql-other"] }
numpy = "<2" # TODO: Remove this once libraries like pandera are updated to support the 2.0 changes

# Machine learning
#tensorflow-macos = "*"
Expand Down Expand Up @@ -49,7 +48,7 @@ PyYAML = "*"

[tool.poetry.group.dev.dependencies]
pre-commit = "^3.3.3"
ruff = "^0.4.5"
ruff = "^0.8.2"

# Type hinting
mypy = "^1.8.0"
Expand Down
Loading

0 comments on commit 1434646

Please sign in to comment.