From b4b51eb64a837e67dd74fc5ffd197248d0c67080 Mon Sep 17 00:00:00 2001
From: Dantali0n <info@dantalion.nl>
Date: Thu, 28 Sep 2023 16:52:07 +0200
Subject: [PATCH] Install docker in the base image
---
docker/ci-runner/Dockerfile | 3 ++-
{{cookiecutter.project_slug}}/.gitlab-ci.yml | 6 +++---
{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile | 2 +-
{{cookiecutter.project_slug}}/docs/source/conf.py | 2 +-
{{cookiecutter.project_slug}}/tox.ini | 2 ++
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/docker/ci-runner/Dockerfile b/docker/ci-runner/Dockerfile
index 937fe86..8b96217 100644
--- a/docker/ci-runner/Dockerfile
+++ b/docker/ci-runner/Dockerfile
@@ -1,4 +1,5 @@
FROM python:3.11
RUN python -m pip install --upgrade pip
-RUN pip install --upgrade cookiecutter tox twine
+RUN pip install --upgrade cookiecutter tox twine cibuildwheel==2.13.1 cookiecutter
+RUN curl -sSL https://get.docker.com/ | sh
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 5d15cbf..1498ae3 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -79,14 +79,14 @@ run_unit_tests_coverage:
package_files:
stage: package
- image: python:3.8
+# image: python:3.8
artifacts:
expire_in: 1w
paths:
- dist/*
script:
- - curl -sSL https://get.docker.com/ | sh
- - python -m pip install cibuildwheel==2.13.1 cookiecutter
+# - curl -sSL https://get.docker.com/ | sh
+# - python -m pip install cibuildwheel==2.13.1 cookiecutter
- cibuildwheel --platform linux --output-dir dist
package_docs:
diff --git a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile
index 01d5ee1..54b2c9c 100644
--- a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile
+++ b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile
@@ -1,4 +1,4 @@
FROM python:3.11
RUN python -m pip install --upgrade pip
-RUN pip install --upgrade tox twine
+RUN pip install --upgrade tox twine cibuildwheel==2.13.1
diff --git a/{{cookiecutter.project_slug}}/docs/source/conf.py b/{{cookiecutter.project_slug}}/docs/source/conf.py
index c144327..4f02a28 100644
--- a/{{cookiecutter.project_slug}}/docs/source/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/source/conf.py
@@ -20,7 +20,7 @@ extensions = [
# Assumes tox is used to call sphinx-build
project_root_directory = os.getcwd()
-apidoc_module_dir = "../../{{cookiecutter.project_slug}}"
+apidoc_module_dir = "../../src"
apidoc_output_dir = "source_documentation"
apidoc_excluded_paths = []
apidoc_separate_modules = True
diff --git a/{{cookiecutter.project_slug}}/tox.ini b/{{cookiecutter.project_slug}}/tox.ini
index 5d298cb..efe9166 100644
--- a/{{cookiecutter.project_slug}}/tox.ini
+++ b/{{cookiecutter.project_slug}}/tox.ini
@@ -45,6 +45,8 @@ allowlist_externals =
sh
; unset LC_ALL / LANGUAGE from testenv, would fail sphinx otherwise
setenv =
+ PYTHONWARNINGS=default::DeprecationWarning
+ DYNAMIC_VERSION_SOURCE={toxinidir}
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/docs/requirements.txt
--
GitLab