From 59cb5a25ab0775efdd947f296ba33e87f1940856 Mon Sep 17 00:00:00 2001
From: Markus Holzer <markus.holzer@fau.de>
Date: Tue, 16 Jan 2024 09:30:59 +0100
Subject: [PATCH] Small changes
---
.gitlab-ci.yml | 2 +-
setup.py | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb8fb3c2..e25c6fbd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,7 @@ minimal-sympy-master:
- pip install git+https://gitlab-ci-token:${CI_JOB_TOKEN}@i10git.cs.fau.de/pycodegen/pystencils.git@master#egg=pystencils
- python -m pip install --upgrade git+https://github.com/sympy/sympy.git
- pip list
- - python setup.py quicktest
+ - python quicktest.py
allow_failure: true
tags:
- docker
diff --git a/setup.py b/setup.py
index e5b34490..7b51269f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,13 @@
-from setuptools import setup
+from setuptools import setup, __version__ as setuptools_version
+
+if int(setuptools_version.split('.')[0]) < 61:
+ raise Exception(
+ "[ERROR] lbmpy requires at least setuptools version 61 to install.\n"
+ "If this error occurs during an installation via pip, it is likely that there is a conflict between "
+ "versions of setuptools installed by pip and the system package manager. "
+ "In this case, it is recommended to install lbmpy into a virtual environment instead."
+ )
+
import versioneer
--
GitLab