From a3d7a33b75250fe3c2827541ade6aac89ba36b91 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Fri, 23 Jun 2023 10:18:41 +0200
Subject: [PATCH 1/2] remove redundant deps from pyptojet.toml
---
pyproject.toml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 951bf92..6b69508 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,12 +21,10 @@ Home = "https://gitlab.gwdg.de/mpsd-cs/mpsd-software-manager/"
[project.optional-dependencies]
dev = [
- "black",
"pre-commit",
"pytest",
"pytest-mock",
"pytest-cov",
- "ruff",
]
[tool.pytest.ini_options]
--
GitLab
From 4cd478dad6bcbd3a6e850c70876166f63b2ea5fb Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Fri, 23 Jun 2023 10:21:49 +0200
Subject: [PATCH 2/2] ci: install deps from pyproject.toml
---
.gitlab-ci.yml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7499244..bede632 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ stages:
- echo "Install Python3"
- apt-get update
- - apt-get install -y python3 python3-venv python3-rich
+ - apt-get install -y python3 python3-venv
- python3 -m venv --help
- python3 -m venv venv
- source venv/bin/activate
@@ -39,13 +39,10 @@ stages:
- echo "Install Python dependencies for running the tests"
- pip install -U pip
- pip --version
- - pip install pytest black ruff archspec
-
+ - pip install .[dev]
- echo "Diagnostics - which versions are we using"
- python3 --version
- pytest --version
- - black --version
- - ruff --version
- echo "Install additional packages we need to run spack-setup.sh"
- apt-get install -y git rsync
--
GitLab