Skip to content

Commit

Permalink
Merge branch 'master' into update-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
lkstrp authored Nov 5, 2024
2 parents 84179a8 + 77177bf commit f27d8d4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
# Run ruff to lint and format
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.6.9
rev: v0.7.2
hooks:
# Run the linter.
- id: ruff
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
# built documents.
#
# The short X.Y version.
release: str = get_version("pypsa")
release: str = get_version("atlite")
version: str = ".".join(release.split(".")[:2])
# The full version, including alpha/beta/rc tags.
release = version
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ classifiers=[
]
requires-python = ">=3.9"
dependencies = [
"numpy",
"numpy<2.0",
"scipy",
"pandas>=0.25",
"bottleneck",
Expand Down

0 comments on commit f27d8d4

Please sign in to comment.