From ea9429cdfb6f1ed5527645990b5328244d324591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jan 2025 16:32:18 +0100
Subject: [PATCH 1/6] FIX: module path
---
.docker/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 97b8fdf..c2d8249 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -26,7 +26,7 @@ COPY . /git
# Delete .git because it is huge.
RUN rm -r /git/.git
-RUN cd /git/ && pip3 install --break-system-packages .
+RUN cd /git/loanpy && pip3 install --break-system-packages .
WORKDIR /git/integrationtests
# wait for server,
--
GitLab
From dcb0f3ce4f5a267ac5abfa03ceb4765adb6120dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jan 2025 16:36:13 +0100
Subject: [PATCH 2/6] FIX: image name
---
.gitlab-ci.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1944b70..bb675b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
variables:
- CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/linkahead-python-package-template/testenv:$CI_COMMIT_REF_NAME
- CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-pyinttest/base:latest
+ CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/linkahead-loan/testenv:$CI_COMMIT_REF_NAME
stages:
- info
@@ -32,7 +31,6 @@ stages:
.env: &env
- echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)"
- - echo "CI_REGISTRY_IMAGE_BASE = $CI_REGISTRY_IMAGE_BASE"
- echo "CI_REGISTRY_IMAGE = $CI_REGISTRY_IMAGE"
- echo "CAOSDB_TAG = $CAOSDB_TAG"
- echo "REFTAG = $REFTAG"
--
GitLab
From 0cae261e67efc2548166e7176169e8957640032c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jan 2025 16:39:42 +0100
Subject: [PATCH 3/6] FIX: path
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb675b3..3997932 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,9 +77,8 @@ unittest_py3.8:
script: &python_test_script
# install dependencies
- pip install pytest pytest-cov
- - pip install .
# actual test
- - pytest --cov=linkahead_python_package_template -vv ./unittests
+ - cd laonpy && pytest --cov=linkahead_python_package_template -vv ./unittests
unittest_py3.9:
tags: [cached-dind]
--
GitLab
From 6569315fcc1bff171e75a44e99dc88e4be973a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jan 2025 16:45:16 +0100
Subject: [PATCH 4/6] FIX: gitlab yml
---
.gitlab-ci.yml | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3997932..74e8f5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,47 +62,50 @@ info:
script:
- *env
-unittest_py3.11:
- tags: [cached-dind]
- stage: test
- image: $CI_REGISTRY_IMAGE
- script:
- - python3 -c "import sys; assert sys.version.startswith('3.11')"
- - tox
-
-unittest_py3.8:
+unittest_py3.9:
tags: [cached-dind]
stage: test
- image: python:3.8
+ variables:
+ PYVER: "3.9"
+ image: python:3.9
script: &python_test_script
# install dependencies
+ - *env
- pip install pytest pytest-cov
+ - python3 -c "import sys; assert sys.version.startswith('$PYVER')"
# actual test
- - cd laonpy && pytest --cov=linkahead_python_package_template -vv ./unittests
+ - cd loanpy && pytest --cov=loanpy -vv ./unittests
-unittest_py3.9:
- tags: [cached-dind]
+unittest_py3.10:
+ variables:
+ PYVER: "3.10"
stage: test
- image: python:3.11
+ tags: [cached-dind]
+ image: python:3.10
script: *python_test_script
-unittest_py3.10:
+unittest_py3.11:
+ variables:
+ PYVER: "3.11"
tags: [cached-dind]
stage: test
- image: python:3.10
+ image: python:3.11
script: *python_test_script
unittest_py3.12:
- tags: [cached-dind]
+ variables:
+ PYVER: "3.12"
stage: test
+ tags: [cached-dind]
image: python:3.12
script: *python_test_script
unittest_py3.13:
- allow_failure: true
+ variables:
+ PYVER: "3.13"
tags: [cached-dind]
stage: test
- image: python:3.13-rc
+ image: python:3.13
script: *python_test_script
build-testenv:
--
GitLab
From 528e6964272722a54eeabda2433823e345501f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jan 2025 16:48:54 +0100
Subject: [PATCH 5/6] FIX: missing install
---
.gitlab-ci.yml | 1 +
loanpy/pyproject.toml | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74e8f5e..bc0f3db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,6 +72,7 @@ unittest_py3.9:
# install dependencies
- *env
- pip install pytest pytest-cov
+ - pip install .
- python3 -c "import sys; assert sys.version.startswith('$PYVER')"
# actual test
- cd loanpy && pytest --cov=loanpy -vv ./unittests
diff --git a/loanpy/pyproject.toml b/loanpy/pyproject.toml
index c8603d8..5379cb7 100644
--- a/loanpy/pyproject.toml
+++ b/loanpy/pyproject.toml
@@ -23,9 +23,9 @@ classifiers = [
]
requires-python = ">= 3.8"
dependencies = [
- "caosadvancedtools",
- "py3-validate-email",
- "linkahead"
+ "caosadvancedtools",
+ "py3-validate-email",
+ "linkahead"
]
[project.urls]
--
GitLab
From 2bc160b5ca3da929082db6718bfd045cefbc6f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Tue, 14 Jan 2025 16:51:24 +0100
Subject: [PATCH 6/6] FIX: install
---
.gitlab-ci.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc0f3db..08cea83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,11 +71,10 @@ unittest_py3.9:
script: &python_test_script
# install dependencies
- *env
- - pip install pytest pytest-cov
- - pip install .
- python3 -c "import sys; assert sys.version.startswith('$PYVER')"
+ - pip install pytest pytest-cov
# actual test
- - cd loanpy && pytest --cov=loanpy -vv ./unittests
+ - cd loanpy && pip install . && pytest --cov=loanpy -vv ./unittests
unittest_py3.10:
variables:
--
GitLab