Skip to content

Commit

Permalink
Only use conda-forge channel in environment (#398)
Browse files Browse the repository at this point in the history
* Revert back scikit-gstat on conda channels

* Modify setup with coreg submodule and description
  • Loading branch information
rhugonnet committed Aug 12, 2023
1 parent bc39216 commit 16f2fab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dev-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dependencies:
- scipy
- tqdm
- scikit-image
- scikit-gstat>=1.0
- pytransform3d
- geoutils==0.0.11

Expand All @@ -40,7 +41,6 @@ dependencies:
# - richdem

- pip:
- scikit-gstat>=1.0.11
- -e ./

# Development-specific
Expand Down
5 changes: 1 addition & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ dependencies:
- scipy
- tqdm
- scikit-image
- scikit-gstat>=1.0
- pytransform3d
- geoutils==0.0.11
- pip

- pip:
- scikit-gstat>=1.0.11


# - pip:
# - git+https://github.com/GlacioHack/GeoUtils.git
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
setup(
name="xdem",
version=FULLVERSION,
description="Set of tools to manipulate Digital Elevation Models (DEMs) ",
description="Analysis of digital elevation models (DEMs)",
long_description=LONG_DESCRIPTION,
long_description_content_type="text/markdown",
url="https://github.com/GlacioHack/xdem",
author="The GlacioHack Team",
author_email="this-is-not-an-email@a.com", # This is needed for PyPi unfortunately.
license="BSD-3",
packages=["xdem"],
packages=["xdem", "xdem.coreg"],
install_requires=[
"numpy",
"scipy",
Expand Down

0 comments on commit 16f2fab

Please sign in to comment.