Skip to content

Commit

Permalink
Merge pull request #2976 from catalyst-cooperative/nightly-build-2023…
Browse files Browse the repository at this point in the history
…-10-24

Merge dev into main for 2023-10-24
  • Loading branch information
zaneselvans authored Oct 24, 2023
2 parents 35c64c0 + b51d235 commit f3f1f2a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ repos:
# Formatters: hooks that re-write Python & documentation files
####################################################################################
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.292
rev: v0.1.1
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]

# Format the code
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.9.1
rev: 23.10.0
hooks:
- id: black
language_version: python3.11
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"dask>=2022.5,<2023.10.1",
"datapackage>=1.11,<1.16", # Transition datastore to use frictionless.
"email-validator>=1.0.3", # pydantic[email]
"fsspec>=2022.5,<2023.9.3",
"fsspec>=2022.5,<2023.10.1",
"gcsfs>=2022.5,<2023.9.3",
"geopandas>=0.13,<0.15",
"grpcio==1.57.0", # Required by dagster. Version works with MacOS
Expand All @@ -33,7 +33,7 @@ dependencies = [
"jellyfish>=1.0.1,<1.1", # recordlinkage dependency
"jinja2>=3,<3.2",
"matplotlib>=3.6.1,<3.9",
"networkx>=3,<3.2",
"networkx>=3,<3.3",
"numba>=0.55.2", # pandas[performance]
"numexpr>=2.8.0", # pandas[performance]
"numpy>=1.24,<2.0a0",
Expand Down Expand Up @@ -118,12 +118,12 @@ pudl_check_fks = "pudl.etl.check_foreign_keys:main"

[project.optional-dependencies]
dev = [
"black>=22,<23.10",
"black>=23,<23.11",
"build>=1,<1.1",
"ipdb>=0.13,<0.14",
"jedi>=0.18,<0.20",
"lxml>=4.6,<4.10",
"ruff>=0.0.287",
"ruff>=0.1,<0.2",
"tox>=4,<4.12",
"twine>=4,<4.1",
]
Expand All @@ -145,10 +145,10 @@ test = [
"pre-commit>=3,<3.6",
"pytest-console-scripts>=1.1,<1.5",
"pytest-cov>=4,<4.2",
"pytest-mock>=3,<3.12",
"pytest-mock>=3,<3.13",
"pytest>=7,<7.5",
"responses>=0.14,<0.24",
"ruff>=0.0.287",
"ruff>=0.1,<0.2",
"tox>=4,<4.12",
]
datasette = ["datasette>=0.60,<0.65"]
Expand Down

0 comments on commit f3f1f2a

Please sign in to comment.