Merge pull request #311 from cgre-aachen/dev_gemgis1

Dev gemgis1

.github/workflows/pypi_release.yml

@@ -26,8 +26,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-        pip install -r requirements.txt
+        #pip install setuptools wheel twine
+        #pip install -r requirements.txt
+        pip install gemgis[build]
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERS }}

docs/conf.py

@@ -21,11 +21,11 @@
 # -- GemGIS configuration ---------------------------------------------------
 import os
 import sys
-sys.path.insert(0, os.path.abspath(".."))
-sys.path.insert(0, os.path.abspath('../..'))
-sys.path.insert(0, os.path.abspath("gemgis/"))
-sys.path.insert(0, os.path.abspath("../gemgis/"))
-sys.path.insert(0, os.path.abspath("../../gemgis/"))
+#sys.path.insert(0, os.path.abspath(".."))
+#sys.path.insert(0, os.path.abspath('../..'))
+#sys.path.insert(0, os.path.abspath("gemgis/"))
+#sys.path.insert(0, os.path.abspath("../gemgis/"))
+#sys.path.insert(0, os.path.abspath("../../gemgis/"))
 
 # The full version, including alpha/beta/rc tags
 

environment.yml

@@ -1,11 +1,13 @@
+# Requirements as of October 2023
 name: gemgis_env
 channels:
   - conda-forge
 dependencies: 
   - python>=3.10
-  - geopandas
-  - rasterio
-  - pyvista
-  - pip
-  - pip:
-    - gemgis
+  # geopandas will also install numpy, pandas, shapely, fiona, and pyproj
+  - geopandas>=0.14.0
+  # rasterio will also install affine
+  - rasterio>=1.3.8
+  # pyvista also install pooch and matplotlib
+  - pyvista>=0.42.2
+  - gemgis>=1.1

environment_dev.yml

@@ -2,37 +2,30 @@ name: gemgis_dev_env
 channels:
   - conda-forge
 dependencies:
-  #- python>=3.10
-  #- geopandas=0.13.2
-  #- rasterio=1.3.8
-  #- pyvista=0.39.1
+  - python>=3.10
+  # geopandas will also install numpy, pandas, shapely, fiona, and pyproj
+  - geopandas>=0.14.0
+  # rasterio will also install affine
+  #- rasterio>=1.3.8 will be installed through rioxarray
+  # pyvista also install pooch and matplotlib
+  #- pyvista>=0.42.2 will be installed through pvgeo
+  - gemgis>=1.1
+  - rioxarray
+  - scipy
+  - owslib
+  - scikit-image
+  - mplstereonet
+  - PyPDF2
+  - xmltodict
+  - geopy
+  - scikit-learn
+  - tqdm
+  - requests
+  - pooch<1.5.0
   - pip
   - pip:
-    - gempy==2.3
-    - rasterio==1.3.8
-    - geopandas==0.13.2
-    - pyvista
-    - shapely
-    - fiona
-    - pyproj
-    - gemgis
-    - matplotlib
-    - pandas
-    - scipy
-    - owslib
-    - xarray
-    - scikit-image
-    - rioxarray
-    - mplstereonet
-    - PyPDF2
-    - xmltodict
-    - geopy
-    - scikit-learn
-    - tqdm
-    - requests
+    - gempy>=2.3
     - PVGeo
-    - pooch<1.5.0
-    - gemgis==1.0.11
     - pyqt5
     - nbsphinx
     - sphinx_markdown_tables

gemgis/utils.py

@@ -2458,7 +2458,7 @@ def open_mpk(path_in: str):
     """
     # Trying to import py7zr but returning error if py7zr is not installed
     try:
-        import py7zr as gp
+        import py7zr
     except ModuleNotFoundError:
         raise ModuleNotFoundError(
             'py7zr package is not installed. Use pip install py7zr to install the latest version')

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools>=68.1.2",
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
-package-dir = { "" = "gemgis" }
+packages = ["gemgis"]
 
 [project]
 name = "GemGIS"
@@ -34,11 +34,44 @@ classifiers = [
     'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
     'Operating System :: OS Independent',
 ]
+# These dependencies are needed to import GemGIS successfully
+# These dependencies will automatically install other packages like numpy, pandas or matplotlib
 dependencies = [
     'geopandas',
     'rasterio',
     'pyvista',
 ]
+
+[project.optional-dependencies]
+optionals = [
+    'scipy',
+    'PyPDF2',
+    'tqdm',
+    'gempy',
+    'pvgeo',
+    'xml',
+    'scikit-image',
+    'xmltodict',
+    'geopy',
+    'scikit-learn',
+    'py7zr',
+    'segysak',
+    'rioxarray',
+    'tqdm',
+    'mplstereonet',
+    'xarray',
+    'owslib',
+    'requests',
+    'urllib'
+]
+
+build = [
+    'setuptools',
+    'wheel',
+    'twine',
+    'build'
+      ]
+
 [project.urls]
 Documentation = 'https://gemgis.readthedocs.io/'
 Home = 'https://gemgis.readthedocs.io/'

requirements.txt

@@ -1,5 +1,10 @@
-# Requirements should be installed via conda-forge
+# Requirements as of October 2023
 
-geopandas
-rasterio
-pyvista
+# geopandas will also install numpy, pandas, shapely, fiona, and pyproj
+geopandas>=0.14.0
+
+# rasterio will also install affine
+rasterio>=1.3.8
+
+# pyvista also install pooch and matplotlib
+pyvista>=0.42.2

requirements_optional.txt

@@ -1,23 +1,21 @@
 # Optional dependencies
 
-gempy>=2.3
-owslib
-geopy
-matplotlib
+scipy
 PyPDF2
 tqdm
+gempy
+pvgeo
+xml
 scikit-image
-scikit-learn
 xmltodict
-scipy
-mplstereonet
+geopy
+scikit-learn
+py7zr
+segysak
 rioxarray
-pytest
-numpy
-pandas
-shapely
-affine
+tqdm
+mplstereonet
+xarray
 owslib
-pooch<1.5.0
-pytest-cov
-pyqt5
+requests
+urllib