Skip to content

GEOPY-2049: merge release to develop branch#197

Merged
sebhmg merged 10 commits intodevelopfrom
GEOPY-2049-dev
Apr 18, 2025
Merged

GEOPY-2049: merge release to develop branch#197
sebhmg merged 10 commits intodevelopfrom
GEOPY-2049-dev

Conversation

@sebhmg
Copy link
Contributor

@sebhmg sebhmg commented Apr 18, 2025

GEOPY-2049 - environment for coming pre-release

sebhmg added 10 commits April 17, 2025 12:56
[GEOPY-2141] correctly declare dask for pip and dask-core for conda
GEOPY-2141: fixup dask dependency: do not lock on pypi
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	environments/py-3.12-linux-64-dev.conda.lock.yml
#	environments/py-3.12-linux-64.conda.lock.yml
#	environments/py-3.12-win-64-dev.conda.lock.yml
#	environments/py-3.12-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	py-3.12.conda-lock.yml
#	pyproject.toml
#	recipe.yaml
#	simpeg_drivers/__init__.py
@github-actions github-actions bot changed the title Geopy 2049 merge release to develop branch GEOPY-2049: merge release to develop branch Apr 18, 2025
@sebhmg sebhmg merged commit 748e289 into develop Apr 18, 2025
11 of 13 checks passed
@sebhmg sebhmg deleted the GEOPY-2049-dev branch April 18, 2025 18:59
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.

1 participant