From 6d53f32fdd773ed633e72085443f2bc38c44e5ba Mon Sep 17 00:00:00 2001
From: Tamas Gal <himself@tamasgal.com>
Date: Wed, 4 Dec 2024 13:08:01 +0100
Subject: [PATCH] Usability fixes and Python 3.12 for CI
---
.gitlab-ci.yml | 80 +++++---------------------
{{cookiecutter.project_slug}}/Makefile | 3 +
2 files changed, 16 insertions(+), 67 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 489a543..98a745d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,110 +9,56 @@ stages:
before_script:
- pip install -U pip setuptools wheel
- pip install cookiecutter
- - pip install jinja2-time
- cookiecutter --no-input .
- cd awesome
- - git init
-install-py3.6:
- image: docker.km3net.de/base/python:3.6
- stage: install
- script:
- - make install
-
-install-py3.7:
- image: docker.km3net.de/base/python:3.7
+install-py3.9:
+ image: docker.km3net.de/base/python:3.9
stage: install
script:
- make install
-install-py3.8:
- image: docker.km3net.de/base/python:3.8
+install-py3.12:
+ image: git.km3net.de:4567/common/dockerfiles/base/python:3.12
stage: install
script:
- make install
-install-py3.9:
+install-dev-py3.9:
image: docker.km3net.de/base/python:3.9
- stage: install
- script:
- - make install
-
-install-dev-py3.6:
- image: docker.km3net.de/base/python:3.6
stage: install-dev
script:
- make install-dev
-install-dev-py3.7:
- image: docker.km3net.de/base/python:3.7
+install-dev-py3.12:
+ image: git.km3net.de:4567/common/dockerfiles/base/python:3.12
stage: install-dev
script:
- make install-dev
-install-dev-py3.8:
- image: docker.km3net.de/base/python:3.8
- stage: install-dev
- script:
- - make install-dev
-
-install-dev-py3.9:
+test-py3.9:
image: docker.km3net.de/base/python:3.9
- stage: install-dev
- script:
- - make install-dev
-
-test-py3.6:
- image: docker.km3net.de/base/python:3.6
- stage: test
- script:
- - make install-dev
- - make test
-
-test-py3.7:
- image: docker.km3net.de/base/python:3.7
stage: test
script:
- make install-dev
- make test
-test-py3.8:
- image: docker.km3net.de/base/python:3.8
+test-py3.12:
+ image: git.km3net.de:4567/common/dockerfiles/base/python:3.12
stage: test
script:
- make install-dev
- make test
-test-py3.9:
+doc-py3.9:
image: docker.km3net.de/base/python:3.9
- stage: test
- script:
- - make install-dev
- - make test
-
-doc-py3.6:
- image: docker.km3net.de/base/python:3.6
stage: doc
script:
- make install-dev
- cd doc && make html
-doc-py3.7:
- image: docker.km3net.de/base/python:3.7
- stage: doc
- script:
- - make install-dev
- - cd doc && make html
-
-doc-py3.8:
- image: docker.km3net.de/base/python:3.8
- stage: doc
- script:
- - make install-dev
- - cd doc && make html
-
-doc-py3.9:
- image: docker.km3net.de/base/python:3.9
+doc-py3.12:
+ image: git.km3net.de:4567/common/dockerfiles/base/python:3.12
stage: doc
script:
- make install-dev
diff --git a/{{cookiecutter.project_slug}}/Makefile b/{{cookiecutter.project_slug}}/Makefile
index b2d0a2a..b4d67ad 100644
--- a/{{cookiecutter.project_slug}}/Makefile
+++ b/{{cookiecutter.project_slug}}/Makefile
@@ -5,6 +5,9 @@ install-dev:
pip install -e ".[dev]"
python -m ipykernel install --user --name={{cookiecutter.project_slug}}
+venv:
+ python3 -m venv venv
+
clean:
python setup.py clean --all
--
GitLab