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

Bump GDAL to 3.9.0 explicitly to align with PUDL dependencies #354

Merged
merged 8 commits into from
Jun 12, 2024
Merged

Bump GDAL to 3.9.0 explicitly to align with PUDL dependencies #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77bfc90
Bumb GDAL to 3.9.0 explicitly to align with PUDL dependencies
zaneselvans Jun 12, 2024
ce26f11
Temporarily point at gdal-3.9.0 PUDL branch.
zaneselvans Jun 12, 2024
fdbb61d
Try disabling environment cache
zaneselvans Jun 12, 2024
3650644
Revert to caching conda environment.
zaneselvans Jun 12, 2024
528c876
Stop using cached environment to avoid yanked filelock version
zaneselvans Jun 12, 2024
1328baf
Stop using cached environment to avoid yanked filelock version
zaneselvans Jun 12, 2024
4e8a232
Revert to pudl@main and caching python environment
zaneselvans Jun 12, 2024
8113e0d
Remove dask pin and refresh cache key
zaneselvans Jun 12, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/tox-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
condarc: |
channels:
- conda-forge
- defaults
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conda / mamba recommends not including the default anaconda channel for package consistency.

channel_priority: strict

- name: Log conda environnment information
Expand Down
1 change: 1 addition & 0 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ dependencies:
# TODO: we shouldn't have to install all this geo stuff, so once we break the
# dependency on `pudl` we should remove this too.
- fiona>=1.9.5
- gdal>=3.9.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Force the environment to install the most recent GDAL.

- pip:
- --editable ./[dev,docs,tests]
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies = [
"arelle-release>=2.25,<2.28",
"catalystcoop.pudl @ git+https://github.com/catalyst-cooperative/pudl.git",
"coloredlogs>=14",
"dask<2024.6", # Temporary pin -- conda packaging problem upstream
"dask>=2024",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This temporary problem went away, and I needed to change the hash of pyproject.toml to clear the environment cache, which had the bad version of a package stuck in it.

"feedparser>=6.0",
"frictionless>=5,<6",
"pydantic>=2.7,<3",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ commands =
pre-commit run --all-files --show-diff-on-failure name-tests-test

[testenv:linters]
description = Run the pre-commit, flake8 and bandit linters.
description = Run the pre-commit and ruff linters.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of date description.

skip_install = false
extras =
{[testenv:pre_commit]extras}
Expand Down
Loading