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

Merge dev into main for 2023-10-24 #2976

Merged
merged 10 commits into from
Oct 24, 2023
Merged

Merge dev into main for 2023-10-24 #2976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0cac4e2
Bump ruff and black versions
zaneselvans Oct 19, 2023
a74a191
Merge pull request #2952 from catalyst-cooperative/ruff-v0.1
zaneselvans Oct 19, 2023
1aab2b3
Update pytest-mock requirement from <3.12,>=3 to >=3,<3.13
dependabot[bot] Oct 23, 2023
085da54
Update networkx requirement from <3.2,>=3 to >=3,<3.3
dependabot[bot] Oct 23, 2023
4ddc67a
Update fsspec requirement from <2023.9.3,>=2022.5 to >=2022.5,<2023.10.1
dependabot[bot] Oct 23, 2023
b70ac60
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Oct 23, 2023
50e1c27
Merge pull request #2972 from catalyst-cooperative/pre-commit-ci-upda…
zaneselvans Oct 23, 2023
422b1d8
Merge pull request #2971 from catalyst-cooperative/dependabot/pip/dev…
zaneselvans Oct 23, 2023
62cc5a1
Merge pull request #2970 from catalyst-cooperative/dependabot/pip/dev…
zaneselvans Oct 23, 2023
b51d235
Merge pull request #2969 from catalyst-cooperative/dependabot/pip/dev…
zaneselvans Oct 23, 2023
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
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
View file
Open in desktop
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