Only use conda-forge channel in environment (#398)

* Revert back scikit-gstat on conda channels * Modify setup with coreg submodule and description
GlacioHack · Aug 12, 2023 · 16f2fab · 16f2fab
1 parent bc39216
commit 16f2fab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/dev-environment.yml b/dev-environment.yml
@@ -17,6 +17,7 @@ dependencies:
   - scipy
   - tqdm
   - scikit-image
+  - scikit-gstat>=1.0
   - pytransform3d
   - geoutils==0.0.11
 
@@ -40,7 +41,6 @@ dependencies:
 #  - richdem
 
   - pip:
-    - scikit-gstat>=1.0.11
     - -e ./
 
     # Development-specific

diff --git a/environment.yml b/environment.yml
@@ -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
diff --git a/setup.py b/setup.py
@@ -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",