minor fixes

Ouranosinc · Jan 29, 2024 · b8b88d4 · b8b88d4
1 parent a16dca6
commit b8b88d4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
@@ -24,6 +24,7 @@ def remove_folder(folder_path):
 def replace_contents(filepath):
     replacements = {
         "__BUMP_VERSION_TOKEN__": "secrets.BUMP_VERSION_TOKEN",
+        "__ENV_CURRENT_VERSION__": "env.CURRENT_VERSION",
         "__GITHUB_REF__": "github.ref",
         "__GITHUB_REF_NAME__": "github.ref_name",
         "__GITHUB_TOKEN__": "secrets.GITHUB_TOKEN",

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/bump-version.yml b/{{cookiecutter.project_slug}}/.github/workflows/bump-version.yml
@@ -75,6 +75,8 @@ jobs:
       - name: Current Version
         run: |
           bump-my-version show current_version
+          CURRENT_VERSION="$(grep -E '__version__'  xclim/__init__.py | cut -d ' ' -f3)"
+          echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
       - name: Conditional Bump Version
         run: |
           if [[ __ENV_CURRENT_VERSION__ =~ -dev(\.\d+)? ]]; then

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/dependency-review.yml b/{{cookiecutter.project_slug}}/.github/workflows/dependency-review.yml
@@ -28,4 +28,4 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d97
+        uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -16,7 +16,7 @@ build:
     python: "mambaforge-22.9"
   jobs:
     pre_build:
-      - sphinx-apidoc -o docs/apidoc --private --module-first ${{ cookiecutter.project_slug }}
+      - sphinx-apidoc -o docs/apidoc --private --module-first {{ cookiecutter.project_slug }}
       {%- if cookiecutter.add_translations == 'y' %}
       - sphinx-build -M gettext docs docs/_build
       {%- endif %}

diff --git a/{{cookiecutter.project_slug}}/environment-dev.yml b/{{cookiecutter.project_slug}}/environment-dev.yml
@@ -21,7 +21,7 @@ dependencies:
   - pytest-cov>=4.0.0
   {%- endif %}
   {%- if cookiecutter.use_black == 'y' %}
-  - black ==24.11.1
+  - black ==24.1.1
   - blackdoc ==0.3.9
   - isort ==5.13.2
   {%- endif %}