Merge pull request #15 from movestore/feature/exchange-samples

exchange samples
movestore · Sep 11, 2024 · 2c499b9 · 2c499b9
2 parents 1aaa18c + 290338a
commit 2c499b9
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,9 +7,10 @@
 
 # User-specific stuff
 .idea/**/workspace.xml
+.idea/**/misc.xml
+.idea/**/*.iml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
-.idea/**/misc.xml
 .idea/**/dictionaries
 .idea/**/shelf
 

diff --git a/.idea/python-sdk.iml b/.idea/python-sdk.iml
diff --git a/CHANGELOG_SDK.md b/CHANGELOG_SDK.md
@@ -1,5 +1,13 @@
 # Changelog SDK
 
+## 2024-09 `v2.2.1`
+
+- exchange samples: generated by next MoveApps move2 to movingpandas translator app
+
+## 2024-09 `v2.2.0`
+
+- switch build from `micromamba` to `miniforge3`
+
 ## 2024-03 `v2.1.0`
 
 - introduce app-setting-type `USER_FILE`

diff --git a/Dockerfile_smoketest b/Dockerfile_smoketest
@@ -31,4 +31,4 @@ COPY --chown=$UID:$GID . $PROJECT_DIR
 RUN conda env create --prefix $ENV_PREFIX --file $PROJECT_DIR/environment.yml && \
     conda clean --all --yes
 
-ENTRYPOINT [ "conda", "run", "--prefix", "${ENV_PREFIX}", "python3", "sdk.py" ]
+ENTRYPOINT [ "conda", "run", "--no-capture-output", "--prefix", "${ENV_PREFIX}", "python3", "sdk.py" ]
diff --git a/Dockerfile_unittest b/Dockerfile_unittest
@@ -15,4 +15,4 @@ COPY app/ ./app/
 RUN conda env create --prefix ${ENV_PREFIX}  --file environment.yml && \
     conda clean --all --yes
 
-RUN conda run --prefix ${ENV_PREFIX} python3 -m unittest
+RUN conda run --no-capture-output --prefix ${ENV_PREFIX} python3 -m unittest
diff --git a/environment.yml b/environment.yml
@@ -2,7 +2,7 @@ name: moveapps-python-sdk
 channels:
   - conda-forge
 dependencies:
-  - python=3.10
+  - python=3.11
   - pandas
   - geopandas
   - movingpandas

diff --git a/resources/samples/input1_LatLon.pickle b/resources/samples/input1_LatLon.pickle
diff --git a/resources/samples/input1_Mollweide.pickle b/resources/samples/input1_Mollweide.pickle
diff --git a/resources/samples/input2_LatLon.pickle b/resources/samples/input2_LatLon.pickle
diff --git a/resources/samples/input2_Mollweide.pickle b/resources/samples/input2_Mollweide.pickle
diff --git a/resources/samples/input3_LatLon.pickle b/resources/samples/input3_LatLon.pickle
diff --git a/resources/samples/input3_Mollweide.pickle b/resources/samples/input3_Mollweide.pickle
diff --git a/resources/samples/input4_LatLon.pickle b/resources/samples/input4_LatLon.pickle
diff --git a/resources/samples/input4_Mollweide.pickle b/resources/samples/input4_Mollweide.pickle
diff --git a/tests/app/test_app.py b/tests/app/test_app.py
@@ -15,7 +15,7 @@ def setUp(self) -> None:
 
     def test_app_returns_input(self):
         # prepare
-        expected: mpd.TrajectoryCollection = pd.read_pickle(os.path.join(ROOT_DIR, 'tests/resources/app/input2.pickle'))
+        expected: mpd.TrajectoryCollection = pd.read_pickle(os.path.join(ROOT_DIR, 'tests/resources/app/input2_LatLon.pickle'))
         config: dict = {}
 
         # execute

diff --git a/tests/resources/app/input2.pickle b/tests/resources/app/input2.pickle
diff --git a/tests/resources/app/input2_LatLon.pickle b/tests/resources/app/input2_LatLon.pickle