Merge pull request #625 from IN-CORE/main

Main to dev

.github/workflows/conda.yaml

@@ -18,7 +18,7 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: get release info
         id: release_info
@@ -40,7 +40,7 @@ jobs:
           fi
 
       - name: Cache conda
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           # Increase this value to reset cache if environment.yml has not changed
           CACHE_NUMBER: 0

.github/workflows/doc.yaml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       # checkout source code
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # calculate some variables that are used later
       - name: version information
@@ -84,4 +84,4 @@ jobs:
           username: ${{ secrets.HUB_USERNAME }}
           password: ${{ secrets.HUB_PASSWORD }}
           tags: "${{ env.TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1

.github/workflows/pypi.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: get release info
         id: release_info
@@ -50,7 +50,7 @@ jobs:
           pip install -r requirements.txt
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           # This path is specific to Ubuntu
           path: ~/.cache/pip
@@ -66,7 +66,7 @@ jobs:
 
       - name: Publish distribution to PyPI
         if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ env.TOKEN }}
           repository_url: ${{ env.REPO_URL }}

.github/workflows/pytests.yml

@@ -19,10 +19,10 @@ jobs:
     name: Python ${{ matrix.vars.python-version }} Test
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache conda
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           # Increase this value to reset cache if environment.yml has not changed
           CACHE_NUMBER: 0

.github/workflows/requirements.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # check all requirements
       - name: requirements check

CHANGELOG.md

@@ -6,16 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## [Unreleased]
+## [1.20.0] - 2024-10-24
 
 ### Fixed
 - Fixed Sphinx autodoc skipping class methods with custom decorators. [#518](https://github.com/IN-CORE/pyincore/issues/518)
 - Pyomo version fixed to fix indp solver failure [#585](https://github.com/IN-CORE/pyincore/issues/585)
 - Uploaded raster files doesn't respect the order [#614](https://github.com/IN-CORE/pyincore/issues/614)
+- Fixed the pypi publish of the package [#621](https://github.com/IN-CORE/pyincore/issues/621)
 
 ### Changed
 - Support Interdependent recovery of residential buildings and households [#606](https://github.com/IN-CORE/pyincore/pull/606)
 - Remove unused insecure IN-CORE client [#581](https://github.com/IN-CORE/pyincore/issues/581)
+- Update GH actions to use the latest version [#623](https://github.com/IN-CORE/pyincore/issues/623)
 
 ### Added
 - Apply Black formatter [#589](https://github.com/IN-CORE/pyincore/issues/589)

docs/source/conf.py

@@ -33,9 +33,9 @@
 author = ""
 
 # The short X.Y version
-version = "1.19"
+version = "1.20"
 # The full version, including alpha/beta/rc tags
-release = "1.19.0"
+release = "1.20.0"
 
 # -- General configuration ---------------------------------------------------
 

pyincore/globals.py

@@ -10,7 +10,7 @@
 import os
 import shutil
 
-PACKAGE_VERSION = "1.19.0"
+PACKAGE_VERSION = "1.20.0"
 
 INCORE_API_PROD_URL = "https://incore.ncsa.illinois.edu"
 INCORE_API_DEV_URL = "https://incore-dev.ncsa.illinois.edu"

pyincore/utils/datasetutil.py

@@ -152,7 +152,7 @@ def _apply_retrofit_value(row):
                     )
                     else None
                 )
-                _ = (
+                type = (
                     row["config_mappingEntryKey"]["type"]
                     if (
                         "config_mappingEntryKey" in row.index
@@ -164,6 +164,14 @@ def _apply_retrofit_value(row):
 
                 if target_column and expression:
                     if target_column in row.index:
+                        # Don't delete this line. Retrofit value is calculated based on the expression and will be
+                        # used in the later eval
+                        retrofit_value = (  # noqa: F841
+                            float(row["retrofit_value"])
+                            if type == "number"
+                            else row["retrofit_value"]
+                        )
+
                         # Dangerous! Be careful with the expression
                         row[target_column] = eval(f"row[target_column]{expression}")
                     else:

setup.py

@@ -7,7 +7,7 @@
 from setuptools import setup, find_packages
 
 # version number of pyincore
-version = "1.19.0"
+version = "1.20.0"
 
 with open("README.rst", encoding="utf-8") as f:
     readme = f.read()