Merge 724b735 into 21afaef

OSeMOSYS · Dec 11, 2023 · f114082 · f114082
2 parents 21afaef + 724b735
commit f114082
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
@@ -30,6 +30,7 @@ jobs:
       - name: Upload coverage data to converalls.io
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
         run: |
           pip install --upgrade coveralls
           coveralls --service=github
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,25 +1,18 @@
 {
+    "title": "otoole: OSeMOSYS Tools for Energy Work",
+    "description": "A Python package to provide commonly used pre- and post-processing steps when working with OSeMOSYS models",
     "license": "MIT",
     "upload_type": "software",
     "creators": [
-        {
-            "name": "Will Usher",
-            "affiliation": "KTH Royal Institute of Technology",
-            "orcid": "0000-0001-9367-1791"
-        },
         {
             "name": "Trevor Barnes",
             "affiliation": "Simon Fraser University",
             "orcid": "0000-0003-2458-2968"
         },
         {
-            "name": "Hauke Henke",
+            "name": "Will Usher",
             "affiliation": "KTH Royal Institute of Technology",
-            "orcid": "0000-0003-0098-8701"
-        },
-        {
-            "name": "Christoph Muschner",
-            "orcid": "0000-0001-8144-5260"
+            "orcid": "0000-0001-9367-1791"
         }
     ],
     "access_right": "open"

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,17 @@
 Changelog
 =========
 
+Version 1.1.2
+=============
+- Update zenodo metadata for JOSS
+
+Version 1.1.1
+=============
+- Fixes CPLEX result processing docs
+- Added joss status badge to readme
+- Fix Tests on Windows
+- Update graphviz install instructions
+
 Version 1.1.0
 =============
 - Public Python API added to call otoole directly in Python files

diff --git a/CITATION.cff b/CITATION.cff
@@ -14,6 +14,6 @@ authors:
     given-names: Christoph
     orcid: https://orcid.org/0000-0001-8144-5260
 title: "otoole: OSeMOSYS tools for energy work"
-version: 1.0.0
-doi: 10.5281/zenodo.7677990
+version: 1.1.1
+doi: 10.5281/zenodo.10292217
 date-released: 2023-02-26