From 4941f8a41b16732e0b88b8a32062fa03e8c92d7f Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Tue, 17 Nov 2020 15:45:25 +0000
Subject: [PATCH] Merge branch 'feature/install-without-setuptools' into
'master'
[bin] Do not require setuptools for install.py
Closes dumux-website#40
See merge request dumux-repositories/dumux!2397
(cherry picked from commit 78bef1d69b23ba91d40489db9340347df0398402)
321f1a32 [bin] Do not require setuptools for install.py
---
bin/installdumux.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/installdumux.py b/bin/installdumux.py
index 013aedf920..610ac7020a 100755
--- a/bin/installdumux.py
+++ b/bin/installdumux.py
@@ -7,7 +7,7 @@ import os
import sys
import subprocess
from distutils.spawn import find_executable
-from pkg_resources import parse_version
+from distutils.version import LooseVersion
def show_message(message):
print("*" * 120)
@@ -18,7 +18,7 @@ def show_message(message):
def check_cpp_version():
requiredversion = "7"
result = subprocess.check_output(["g++", "-dumpversion"]).decode().strip()
- if parse_version(result) < parse_version(requiredversion):
+ if LooseVersion(result) < LooseVersion(requiredversion):
print("-- An error occured while checking for prerequistes.")
raise Exception("g++ greater than or equal to {} is required for dumux releases >=3.2!".format(requiredversion))
--
GitLab