From 70652e9a1d48016037b48fd47c346f0b8337dcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corn=C3=A9=20Lukken?= <lukken@astron.nl>
Date: Wed, 29 Jan 2025 14:56:53 +0000
Subject: [PATCH] Fix actually populating cookiecutter vars

---
 cookiecutter.json                                   |  2 +-
 {{cookiecutter.project_slug}}/.gitlab-ci.yml        |  4 +++-
 {{cookiecutter.project_slug}}/README.md             |  4 ++--
 {{cookiecutter.project_slug}}/docs/source/conf.py   |  2 +-
 {{cookiecutter.project_slug}}/setup.cfg             |  4 ++--
 {{cookiecutter.project_slug}}/tox.ini               | 13 +++++++------
 .../{{cookiecutter.project_slug}}/__init__.py       |  7 -------
 7 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index c142007..35e5d91 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,6 +1,6 @@
 {
     "project_name": "My Awesome App",
     "project_slug": "{{ cookiecutter.project_name.lower()|replace(' ', '_')|replace('-', '_')|replace('.', '_')|trim() }}",
-    "project_url": "git.astron.nl/{{ cookiecutter.project_slug }}",
+    "project_url": "https://git.astron.nl/{{ cookiecutter.project_slug }}",
     "description": "An example package for CI/CD working group"
 }
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 93fffac..3376755 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 default:
-  image: $CI_REGISTRY_IMAGE/ci-build-runner:$CI_COMMIT_REF_SLUG
+  image:
+    name: $CI_REGISTRY_IMAGE/ci-build-runner:$CI_COMMIT_REF_SLUG
+    pull_policy: always
   before_script:
     - python --version # For debugging
   cache:
diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 12a816d..eb72cc4 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -2,9 +2,9 @@
 
 ![Build status]({{cookiecutter.project_url}}/badges/main/pipeline.svg)
 ![Test coverage]({{cookiecutter.project_url}}/badges/main/coverage.svg)
-<!-- ![Latest release](https://git.astron.nl/templates/python-package/badges/main/release.svg) -->
+<!-- ![Latest release]({{cookiecutter.project_url}}/badges/main/release.svg) -->
 
-An example repository of an CI/CD pipeline for building, testing and publishing a python package.
+{{cookiecutter.description}}
 
 ## Installation
 ```
diff --git a/{{cookiecutter.project_slug}}/docs/source/conf.py b/{{cookiecutter.project_slug}}/docs/source/conf.py
index c144327..17a5fca 100644
--- a/{{cookiecutter.project_slug}}/docs/source/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/source/conf.py
@@ -3,7 +3,7 @@
 
 import os
 
-from {{cookiecutter.project_slug}} import __version__
+from {{cookiecutter.project_slug}}._version import __version__
 
 # -- General configuration ----------------------------------------------------
 
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index ac0ae10..5755b7a 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -1,9 +1,9 @@
 [metadata]
 name = {{cookiecutter.project_slug}}
-description = An example package for CI/CD working group
+description = {{cookiecutter.description}}
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://git.astron.nl/templates/python-package
+url = {{cookiecutter.project_url}}
 license = Apache License 2.0
 classifiers =
     Development Status :: 3 - Alpha
diff --git a/{{cookiecutter.project_slug}}/tox.ini b/{{cookiecutter.project_slug}}/tox.ini
index 871b5de..5132bd5 100644
--- a/{{cookiecutter.project_slug}}/tox.ini
+++ b/{{cookiecutter.project_slug}}/tox.ini
@@ -1,7 +1,9 @@
 [tox]
 # Generative environment list to test all supported Python versions
-envlist = py3{8,9,10,11,12},black,pep8,pylint
-minversion = 3.18.0
+envlist = py3{9,10,11,12,13},black,pep8,pylint
+min_version = 4.3.3
+requires =
+    tox-ignore-env-name-mismatch >= 0.2.0
 
 [testenv]
 usedevelop = True
@@ -9,25 +11,24 @@ package = wheel
 wheel_build_env = .pkg
 
 setenv =
-    LANGUAGE=en_US
-    LC_ALL=en_US.UTF-8
     PYTHONWARNINGS=default::DeprecationWarning
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/tests/requirements.txt
 commands =
     {envpython} --version
-    {envpython} -m pytest
+    {envpython} -m pytest tests/{posargs}
 
 [testenv:coverage]
 commands =
     {envpython} --version
-    {envpython} -m pytest --cov-report term --cov-report xml --cov-report html --cov={{cookiecutter.project_slug}}
+    {envpython} -m pytest --cov-report term --cov-report xml --cov-report html --cov={{cookiecutter.project_slug}} tests/{posargs}
 
 # Use generative name and command prefixes to reuse the same virtualenv
 # for all linting jobs.
 [testenv:{pep8,black,pylint,format}]
 usedevelop = False
+package = editable
 envdir = {toxworkdir}/linting
 commands =
     pep8: {envpython} -m flake8 --version
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
index 58d3379..d0dc7a8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
@@ -2,10 +2,3 @@
 #  SPDX-License-Identifier: Apache-2.0
 
 """ {{cookiecutter.project_name}} """
-
-try:
-    from importlib import metadata
-except ImportError:  # for Python<3.8
-    import importlib_metadata as metadata
-
-__version__ = metadata.version("{{cookiecutter.project_slug}}")
-- 
GitLab