Skip to content

Commit

Permalink
Relock conda environment to use frictionless v5
Browse files Browse the repository at this point in the history
  • Loading branch information
zaneselvans committed Apr 15, 2024
1 parent f255b5d commit b79cc9b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies = [
"bottleneck>=1.3.7", # pandas[performance]; 1.3.7 required for Python 3.12
"build>=1.2",
"catalystcoop.dbfread>=3.0,<3.1",
"catalystcoop.ferc-xbrl-extractor>=1.3.3,<1.4",
"catalystcoop.ferc-xbrl-extractor>=1.4,<2",
"click>=8",
"coloredlogs>=14.0", # Dagster requires 14.0
"conda-lock>=2.5.2",
Expand All @@ -29,7 +29,7 @@ dependencies = [
"datasette>=0.64",
"doc8>=1.1",
"email-validator>=1.0.3", # pydantic[email]
"frictionless>=4.40,<5",
"frictionless>=5,<6",
"fsspec>=2024",
"furo>=2024",
"gcsfs>=2024",
Expand Down
10 changes: 4 additions & 6 deletions src/pudl/workspace/datastore.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,10 @@ def _validate_datapackage(self, datapackage_json: dict):
Throws ValueError if invalid.
"""
# TODO (daz): when we upgrade to frictionless>=5.0, this will be:
# dp = frictionless.Package.validate_descriptor(datapackage_json)
# if not dp.valid:
dp = frictionless.Package(datapackage_json)
if not dp.metadata_validate():
msg = f"Found {len(dp.errors)} datapackage validation errors:\n"
for e in dp.errors:
report = frictionless.Package.validate_descriptor(datapackage_json)
if not report.valid:
msg = f"Found {len(report.errors)} datapackage validation errors:\n"
for e in report.errors:
msg = msg + f" * {e}\n"
raise ValueError(msg)

Expand Down

0 comments on commit b79cc9b

Please sign in to comment.