Merge pull request #133 from IN-CORE/release-1.8.3

Release 1.8.3
IN-CORE · Aug 16, 2023 · 95770f7 · 95770f7
2 parents b32f9f5 + c5f460a
commit 95770f7
Show file tree

Hide file tree

Showing 11 changed files with 148 additions and 126 deletions.
diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml
@@ -26,7 +26,7 @@ jobs:
           if [ "${{ github.event.release.tag_name }}" != "" ]; then
             version=$(echo ${{ github.event.release.tag_name }} | sed 's/^v//')
           else
-            version="$(awk -F= '/^PACKAGE_VERSION/ { print $2}' pyincore-viz/globals.py | sed 's/[ "]//g').${{ github.run_number }}"
+            version="$(awk -F= '/^PACKAGE_VERSION/ { print $2}' pyincore_viz/globals.py | sed 's/[ "]//g').${{ github.run_number }}"
           fi
           echo "VERSION=${version}" >> $GITHUB_ENV
           echo "VERSION=${version}"
@@ -49,23 +49,28 @@ jobs:
           key:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}
 
-      - name: Install miniconda
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Install micromamba
+        uses: mamba-org/setup-micromamba@v1
         with:
-          miniconda-version: "latest"
-          python-version: 3.8
-          use-mamba: true
-          mamba-version: "*"
-          channels: conda-forge,in-core
-          use-only-tar-bz2: true
-          conda-build-version: "*"
+          create-args: >-
+            python=3.9
+            conda
+          environment-file: environment.yml
+          generate-run-shell: true
+          condarc: |
+            channels:
+              - IN-CORE
+              - conda-forge
+              - defaults
 
       - name: Build conda package
         run: |
+          conda install conda-build
           mkdir dist
           conda build --output-folder dist \
                       --label ${{ env.LABEL }} \
                       recipes
+        shell: micromamba-shell {0}
 
       - name: Upload conda package
         if: github.event_name == 'release'
@@ -75,6 +80,7 @@ jobs:
                           --user IN-CORE \
                           --label ${{ env.LABEL }} \
                           dist/*/pyincore-viz-${{ env.VERSION }}-*.tar.bz2
+        shell: micromamba-shell {0}
 
       - name: Upload binaries to release
         if: github.event_name == 'release'

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -13,6 +13,11 @@ jobs:
   # ----------------------------------------------------------------------
   unit-test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        vars: [ { python-version: '3.8', sleep: '0s' }, { python-version: '3.9', sleep: '60s' } ]
+#                { python-version: '3.10', sleep: '120s' }, { python-version: '3.11', sleep: '180s' } ]
+    name: Python ${{ matrix.vars.python-version }} Test
     steps:
       - name: Checkout source code
         uses: actions/checkout@v2
@@ -28,25 +33,28 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
             hashFiles('environment.yml') }}
 
-      - name: Install miniconda
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Install micromamba
+        uses: mamba-org/setup-micromamba@v1
         with:
-          miniconda-version: "latest"
-          mamba-version: "*"
-          use-mamba: true
-          python-version: 3.8
-          activate-environment: base
-          channels: conda-forge,in-core
+          create-args: >-
+            python=${{ matrix.vars.python-version }}
+            pytest
           environment-file: environment.yml
-          use-only-tar-bz2: true
-          conda-build-version: "*"
+          generate-run-shell: true
+
+      - name: Sleep for ${{ matrix.vars.sleep }} to avoid multiple pytests run concurrently
+        uses: jakejarvis/wait-action@master
+        with:
+          time: ${{ matrix.vars.sleep }}
 
       - name: Run pyincore viz tests with pytest
         run: |
           echo "${{secrets.PYTEST_USER_TOKEN}}" > tests/pyincore_viz/.incorepw
-          $CONDA/bin/pytest --cache-clear -s tests/pyincore_viz/test_pyincore_viz.py --junitxml=test-reports/viz_results.xml
+          python -m pytest tests/pyincore_viz/test_pyincore_viz.py
+        shell: micromamba-shell {0}
 
       - name: Run analysis viz tests with pytest
         run: |
           echo "${{secrets.PYTEST_USER_TOKEN}}" > tests/pyincore_viz/.incorepw
-          $CONDA/bin/pytest --cache-clear -s tests/pyincore_viz/test_analysis_viz.py --junitxml=test-reports/analysis_results.xml
+          python -m pytest tests/pyincore_viz/test_analysis_viz.py
+        shell: micromamba-shell {0}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.8.3] - 2023-08-16
+### Changed
+- Pytest changed to use micromamba [#128](https://github.com/IN-CORE/pyincore-viz/issues/128)
+
+### Fixed
+- Conda package building and uploading github action [#131](https://github.com/IN-CORE/pyincore-viz/issues/131)
+
 ## [1.8.2] - 2023-06-14
 
 ### Changed

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -33,7 +33,7 @@
 # The short X.Y version
 version = '1.8'
 # The full version, including alpha/beta/rc tags
-release = '1.8.2'
+release = '1.8.3'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/environment.yml b/environment.yml
@@ -2,13 +2,14 @@ name: pyincore_viz
 channels:
   - conda-forge
   - defaults
+  - in-core
 dependencies:
   - gdal
   - branca>=0.3.0
   - contextily>=1.0.0
   - deprecated
   - geopandas>=0.6.1
-  - ipyleaflet>=0.17.2
+  - ipyleaflet>=0.16.0
   - ipywidgets>=7.6.0
   - lxml>=4.6.3
   - matplotlib>=2.1.0
@@ -18,7 +19,7 @@ dependencies:
   - pandas>=0.24.1
   - pillow
   - pycodestyle>=2.6.0
-  - pyincore>=1.7.0
+  - pyincore>=1.11.0
   - pytest>=3.9.0
   - python-jose>=3.0
   - rasterio>=1.3.3
diff --git a/pyincore_viz/globals.py b/pyincore_viz/globals.py
@@ -8,7 +8,7 @@
 import logging
 from logging import config as logging_config
 
-PACKAGE_VERSION = "1.8.2"
+PACKAGE_VERSION = "1.8.3"
 
 INCORE_GEOSERVER_WMS_URL = "https://incore.ncsa.illinois.edu/geoserver/incore/wms"
 INCORE_GEOSERVER_DEV_WMS_URL = "https://incore-dev.ncsa.illinois.edu/geoserver/incore/wms"

diff --git a/recipes/meta.yaml b/recipes/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "pyincore-viz" %}
-{% set version = "1.8.2" %}
+{% set version = "1.8.3" %}
 
 package:
   name: {{ name|lower }}
@@ -47,7 +47,7 @@ requirements:
     - owslib>=0.17.1
     - pandas>=0.24.1
     - pillow
-    - pyincore>=1.7.0
+    - pyincore>=1.11.0
     - rasterio>=1.3.3
 
 test:

diff --git a/requirements.min b/requirements.min
@@ -13,7 +13,7 @@ owslib>=0.17.1
 pandas>=0.24.1
 pillow
 pycodestyle>=2.6.0
-pyincore>=1.7.0
+pyincore>=1.11.0
 pytest>=3.9.0
 python-jose>=3.0
 rasterio>=1.3.3
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ branca>=0.3.0
 contextily>=1.0.0
 deprecated
 geopandas>=0.6.1
-ipyleaflet>=0.17.2
+ipyleaflet>=0.16.0
 ipywidgets>=7.6.0
 lxml>=4.6.3
 matplotlib>=2.1.0
@@ -13,7 +13,7 @@ owslib>=0.17.1
 pandas>=0.24.1
 pillow
 pycodestyle>=2.6.0
-pyincore>=1.7.0
+pyincore>=1.11.0
 pytest>=3.9.0
 python-jose>=3.0
 rasterio>=1.3.3
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup, find_packages
 
 # version number of pyincore
-version = '1.8.2'
+version = '1.8.3'
 
 with open("README.rst", encoding="utf-8") as f:
     readme = f.read()
@@ -66,7 +66,7 @@
         'owslib>=0.17.1',
         'pandas>=0.24.1',
         'pillow',
-        'pyincore>=1.7.0',
+        'pyincore>=1.11.0',
         'rasterio>=1.3.3'
     ],