Skip to content

GEOPY-1188#628

Merged
domfournier merged 133 commits into
developfrom
GEOPY-1188
Nov 2, 2023
Merged

GEOPY-1188#628
domfournier merged 133 commits into
developfrom
GEOPY-1188

Conversation

@domfournier
Copy link
Copy Markdown
Contributor

@domfournier domfournier commented Nov 1, 2023

GEOPY-1188 - Update develop from release

domfournier and others added 30 commits August 31, 2023 15:34
Co-authored-by: Sébastien Hensgen <sebastienh@mirageoscience.com>
GEOPY-875: Add warning message if version differ
…into GEOPY-1057

# Conflicts:
#	conda-py-3.10-lock.yml
#	conda-py-3.9-lock.yml
#	environments/conda-py-3.10-linux-64-dev.lock.yml
#	environments/conda-py-3.10-linux-64.lock.yml
#	environments/conda-py-3.10-osx-64-dev.lock.yml
#	environments/conda-py-3.10-osx-64.lock.yml
#	environments/conda-py-3.10-win-64-dev.lock.yml
#	environments/conda-py-3.10-win-64.lock.yml
#	environments/conda-py-3.9-linux-64-dev.lock.yml
#	environments/conda-py-3.9-linux-64.lock.yml
#	environments/conda-py-3.9-osx-64-dev.lock.yml
#	environments/conda-py-3.9-osx-64.lock.yml
#	environments/conda-py-3.9-win-64-dev.lock.yml
#	environments/conda-py-3.9-win-64.lock.yml
sebhmg and others added 25 commits October 24, 2023 17:16
Co-authored-by: MatthieuCMira <109624972+MatthieuCMira@users.noreply.github.com>
it already comes as an indirect dependency
GEOPY-1116: update Pillow as recommended by GitHub advisory
Copy link
Copy Markdown
Contributor

@benk-mira benk-mira left a comment

Choose a reason for hiding this comment

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

Let 'er rip!

@domfournier domfournier merged commit 74ba85e into develop Nov 2, 2023
@domfournier domfournier deleted the GEOPY-1188 branch November 2, 2023 20:20
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.

4 participants