Merge pull request #200 from IN-CORE/release-1.11.1

Release 1.11.1
IN-CORE · Feb 18, 2025 · 6ab24cc · 6ab24cc
2 parents 4b99b25 + fbdbe29
commit 6ab24cc
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 20 deletions.
diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml
@@ -67,7 +67,8 @@ jobs:
         run: |
           conda install conda-build
           mkdir dist
-          conda build --output-folder dist \
+          conda build --package-format=tar.bz2 \
+                      --output-folder dist \
                       --label ${{ env.LABEL }} \
                       recipes
         shell: micromamba-shell {0}

diff --git a/.github/workflows/doc.yaml b/.github/workflows/doc.yaml
@@ -50,6 +50,8 @@ jobs:
               tags="${tags},${version}"
               version=${version%.*}
             done
+            # Remove any unwanted double quotes from tags
+            tags=$(echo $tags | sed 's/"//g')
             echo "VERSION=${version}" >> $GITHUB_ENV
             echo "TAGS=${tags}" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
@@ -60,6 +62,10 @@ jobs:
             echo "TAGS=${BRANCH}" >> $GITHUB_ENV
           fi
 
+      # debug TAGS
+      - name: Debug TAGS
+        run: echo "TAGS=${{ env.TAGS }}"
+
       # build image
       - name: Build image
         uses: elgohr/[email protected]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.11.1] - 2025-02-20
+
+### Changed
+- Conda build to include package format argument [#195](https://github.com/IN-CORE/pyincore-viz/issues/195)
+- Update production URL references to tools.in-core.org and dev to dev.in-core.org [#197](https://github.com/IN-CORE/pyincore-viz/issues/197)
+
+### Fixed
+- Documentation container tagging error by github action [#181](https://github.com/IN-CORE/pyincore-viz/issues/181)
+- Pytest error caused by removed hazard dataset [#182](https://github.com/IN-CORE/pyincore-viz/issues/182)
+
 ## [1.11.0] - 2024-10-23
 ### Added
 - Apply Black formatter [#169](https://github.com/IN-CORE/pyincore-viz/issues/169)

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

diff --git a/docs/source/refs.rst b/docs/source/refs.rst
@@ -5,9 +5,9 @@ References
 
     <embed>
         <ul>
-            <li><a href="https://incore.ncsa.illinois.edu/doc/incore/" target="_blank">IN-CORE</a> Manual</li>
-            <li><a href="https://incore.ncsa.illinois.edu/doc/pyincore/" target="_blank">pyIncore</a> Reference</li>
-            <li><a href="https://incore.ncsa.illinois.edu/doc/pyincore_data/" target="_blank">pyIncore-data</a> Reference</li>
-            <li><a href="https://incore.ncsa.illinois.edu/doc/api/" target="_blank">IN-CORE Web Services API</a> specifications</li>
+            <li><a href="https://tools.in-core.org/doc/incore/" target="_blank">IN-CORE</a> Manual</li>
+            <li><a href="https://tools.in-core.org/doc/pyincore/" target="_blank">pyIncore</a> Reference</li>
+            <li><a href="https://tools.in-core.org/doc/pyincore_data/" target="_blank">pyIncore-data</a> Reference</li>
+            <li><a href="https://tools.in-core.org/doc/api/" target="_blank">IN-CORE Web Services API</a> specifications</li>
         </ul>
     </embed>
diff --git a/environment.yml b/environment.yml
@@ -19,7 +19,7 @@ dependencies:
   - pandas>=2.1.2
   - pillow
   - pycodestyle>=2.6.0
-  - pyincore>=1.11.0
+  - pyincore>=1.20.0
   - pytest>=3.9.0
   - python-jose>=3.0
   - rasterio>=1.3.9
diff --git a/pyincore_viz/globals.py b/pyincore_viz/globals.py
@@ -10,7 +10,7 @@
 
 PACKAGE_VERSION = "1.10.0"
 
-INCORE_GEOSERVER_WMS_URL = "https://incore.ncsa.illinois.edu/geoserver/incore/wms"
+INCORE_GEOSERVER_WMS_URL = "https://tools.in-core.org/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.11.0" %}
+{% set version = "1.11.1" %}
 
 package:
   name: {{ name|lower }}
@@ -47,7 +47,7 @@ requirements:
     - owslib>=0.17.1
     - pandas>=2.1.2
     - pillow
-    - pyincore>=1.11.0
+    - pyincore>=1.20.0
     - rasterio>=1.3.9
 
 test:
@@ -67,10 +67,10 @@ test:
     # You can also put a file called run_test.py in the recipe that will be run at test time.
 
 about:
-  home: https://incore.ncsa.illinois.edu
+  home: https://tools.in-core.org
   license: MPL-2.0
   summary: 'Python library for visualization and utilities of pyIncore'
   description: 'pyincore-viz is a Python project that provides visualization and other utilities for use with 
   pyincore'
   dev_url: https://github.com/IN-CORE/pyincore-viz
-  doc_url: https://incore.ncsa.illinois.edu/doc/incore
+  doc_url: https://tools.in-core.org/doc/incore
diff --git a/requirements.min b/requirements.min
@@ -13,7 +13,7 @@ owslib>=0.17.1
 pandas>=2.1.2
 pillow
 pycodestyle>=2.6.0
-pyincore>=1.11.0
+pyincore>=1.20.0
 pytest>=3.9.0
 python-jose>=3.0
 rasterio>=1.3.9
diff --git a/requirements.txt b/requirements.txt
@@ -13,7 +13,7 @@ owslib>=0.17.1
 pandas>=2.1.2
 pillow
 pycodestyle>=2.6.0
-pyincore>=1.11.0
+pyincore>=1.20.0
 pytest>=3.9.0
 python-jose>=3.0
 rasterio>=1.3.9
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup, find_packages
 
 # version number of pyincore
-version = "1.11.0"
+version = "1.11.1"
 
 with open("README.rst", encoding="utf-8") as f:
     readme = f.read()
@@ -18,7 +18,7 @@
     description="IN-CORE visualization python package",
     long_description=readme,
     long_description_content_type="text/x-rst",
-    url="https://incore.ncsa.illinois.edu",
+    url="https://tools.in-core.org",
     license="Mozilla Public License v2.0",
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -60,7 +60,7 @@
         "owslib>=0.17.1",
         "pandas>=2.1.2",
         "pillow",
-        "pyincore>=1.11.0",
+        "pyincore>=1.20.0",
         "rasterio>=1.3.9",
     ],
     extras_require={

diff --git a/tests/pyincore_viz/test_pyincore_viz.py b/tests/pyincore_viz/test_pyincore_viz.py
@@ -29,13 +29,13 @@ def test_visualize_model_earthquake(client):
 
 
 def test_visualize_dataset_earthquake(client):
-    eq_hazard_id = "5ba8ed5cec23090435209069"
+    eq_hazard_id = "5b902cb273c3371e1236b36b"
     viz.plot_earthquake(eq_hazard_id, client)
     assert True
 
 
 def test_visualize_dataset_earthquake_with_demand(client):
-    eq_hazard_id = "5ba8ed5cec23090435209069"
+    eq_hazard_id = "5b902cb273c3371e1236b36b"
     viz.plot_earthquake(eq_hazard_id, client, "0.4 SA")
     assert True
 

diff --git a/versions.md b/versions.md
@@ -18,7 +18,7 @@ This file is autogenerated and lists the latest versions of all dependencies. Th
 | pandas | | \>=0.24.1        | 2.0.3 |
 | pillow | |                  | 10.0.0 |
 | pycodestyle | | \>=2.6.0         | 2.11.0 |
-| pyincore | | \>=1.11.0        | 1.12.0a1 |
+| pyincore | | \>=1.20.0        | 1.12.0a1 |
 | pytest | | \>=3.9.0         | 7.4.0 |
 | python-jose | | \>=3.0           | 3.3.0 |
 | rasterio | | \>=1.3.3         | 1.3.8 |