Merge branch 'dev' into 'master'

Upgrade to v1.4.0

See merge request iek-3/shared-code/geokit!48

.gitignore

@@ -20,10 +20,22 @@ testing/results/*.cpg
 testing/results/*.csv
 testing/results/eligibility_plots
 
+# Example results
+Examples/*.tif
+Examples/*.shp
+Examples/*.dbf
+Examples/*.shx
+Examples/*.prj
+Examples/*.cpg
+Examples/*.csv
+Examples/*.gpkg
+
 # Extras
 .vscode/settings.json
 .vscode/launch.json
 .coverage
 .pytest
 .cache/v/cache/lastfailed
 .pytest_cache/*
+
+

.gitlab-ci.yml

@@ -1,18 +1,25 @@
-image: continuumio/miniconda3:latest
+image: mambaorg/micromamba
 
 stages:
   - test
 
-test:
+.test_template:
   stage: test
-  tags: 
-    - linux
+  before_script:
+    # create environment
+    - micromamba create -y -n geokit --file=requirements-dev.yml
+    - eval "$(micromamba shell hook --shell bash)"
+    - micromamba activate geokit
+    # Install geokit with no --no-deps flag to create a reproducible environment
+    - python -m pip install -e . --no-deps
 
-  script: 
-    - conda install mamba -c conda-forge
-    - mamba env update -n geokit --file=requirements.yml
-    - mamba env update -n geokit --file=requirements-dev.yml
-    - mamba info --envs
-    - source activate geokit
-    - python -m pip install -e .
+test-code:
+  extends: .test_template
+  script:
+    # Test code
     - python -m pytest --cov=geokit geokit/test/
+
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - when: always

Examples/README.md

@@ -1,5 +1,8 @@
 ## Example Index
 
-* [Create a shape file from a pandas DataFrame](dataframe_to_shapefile.ipynb)
-* [Determine the average of raster values in a region](regional_raster_average.ipynb)
-* [Showcase of RegionMask fuctionalities](RegionMask.ipynb)
+* [Examples for Spatial Reference System](example_01_srs.ipynb)
+* [Examples for Geometry Operations](example_02_geometry.ipynb)
+* [Examples for Vector Datasets and Operations](example_03_vector.ipynb)
+* [Examples for Raster Datasets and Operations](example_04_raster.ipynb)
+* [Examples for Extent](example_05_Extent.ipynb)
+* [Examples for Region Mask](example_06_RegionMask.ipynb)