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

Jump to bottom

restrict geopandas until conflicts are resolved #1127

Merged
merged 3 commits into from
Jul 3, 2024
Merged

restrict geopandas until conflicts are resolved #1127

merged 3 commits into from
Jul 3, 2024

Conversation

martacki
Copy link
Member

@martacki martacki commented Jul 1, 2024 •
edited
Loading

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
fneum
fneum reviewed Jul 2, 2024
View reviewed changes
envs/environment.yaml Outdated Show resolved Hide resolved
fneum
fneum requested changes Jul 2, 2024
View reviewed changes
Copy link
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.

@martacki @fneum
Update envs/environment.yaml
358561a 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
@martacki martacki enabled auto-merge July 3, 2024 06:33
@martacki martacki merged commit 02abc99 into master Jul 3, 2024
6 checks passed
@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
Reviewers

@fneum fneum fneum requested changes

@FabianHofmann FabianHofmann Awaiting requested review from FabianHofmann

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@martacki @fneum