Skip to content

restrict geopandas until conflicts are resolved#1127

Merged
martacki merged 3 commits intomasterfrom
fix_env
Jul 3, 2024
Merged

restrict geopandas until conflicts are resolved#1127
martacki merged 3 commits intomasterfrom
fix_env

Conversation

@martacki
Copy link
Copy Markdown
Member

@martacki martacki commented Jul 1, 2024

Changes proposed in this Pull Request

there seem to be conflicts in a latest geopandas v1.0.0 release, which affect multiple scripts (particularly sector coupled code is affected)

Resolves Issues #1124 #1125 #1126, maybe even #1123 (not sure though)

Checklist

  • I tested my contribution locally and it seems to work fine.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in all of config.default.yaml.
  • Changes in configuration options are also documented in doc/configtables/*.csv.
  • A release note doc/release_notes.rst is added.

@martacki martacki requested a review from FabianHofmann July 1, 2024 13:19
Copy link
Copy Markdown
Member

@fneum fneum left a comment

Choose a reason for hiding this comment

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

LGTM, just better to constraint <1 in case there are patches for sub v1 verison.

Co-authored-by: Fabian Neumann <[email protected]>
@martacki martacki enabled auto-merge July 3, 2024 06:33
@martacki martacki merged commit 02abc99 into master Jul 3, 2024
@martacki martacki deleted the fix_env branch July 4, 2024 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants