From 22e576cb1f1d04b46dc645f6bf6278f273f1ec0f Mon Sep 17 00:00:00 2001
From: Robert Rosca <robert.rosca@xfel.eu>
Date: Thu, 25 Feb 2021 10:32:17 +0100
Subject: [PATCH] Adjust CI for new setup.py requirements
---
.gitlab-ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb8dd05a0..6235d5643 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,5 +56,10 @@ cython-editable-install-test:
only: [merge_requests]
<<: *before_script
script:
+<<<<<<< HEAD
- python3 -m pip install -e ".[test]"
- python3 -m pytest --color yes --verbose ./tests/test_agipdalgs.py
+=======
+ - python3 -m pip install ".[test]"
+ - pytest -vv tests/test_*
+>>>>>>> Adjust CI for new setup.py requirements
--
GitLab