From b764ce50a5672a2c786deb1b357ebccfce0f27f1 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 11 Jun 2020 11:50:56 +0200
Subject: [PATCH] Removed --gitlab option.
---
README.md | 1 -
ogscm/cli.py | 6 +++---
ogscm/cli_args.py | 4 ----
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index fca26d0..5b974f7 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,6 @@ Additional options:
--gui Builds the GUI (Data Explorer) (default: False)
--docs Setup documentation requirements (Doxygen) (default: False)
--jenkins Setup Jenkins slave (default: False)
- --gitlab Setup for GitLab-CI (default: False)
--cvode Install and configure with cvode (default: False)
--cppcheck Install cppcheck (default: False)
--iwyy Install include-what-you-use (default: False)
diff --git a/ogscm/cli.py b/ogscm/cli.py
index 966b7e2..31d9711 100644
--- a/ogscm/cli.py
+++ b/ogscm/cli.py
@@ -39,7 +39,7 @@ def main(): # pragma: no cover
cli = Cli_Args()
args = cli.parse_args()
- if args.jenkins or args.gitlab:
+ if args.jenkins:
args.ogs = ['off']
if args.deploy != '':
args.build = True
@@ -256,7 +256,7 @@ def main(): # pragma: no cover
if args.gui:
Stage0 += packages(
apt=[
- 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',
+ 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',x
'libxt-dev'
],
yum=[
@@ -297,7 +297,6 @@ def main(): # pragma: no cover
# Stage0 += boost(version='1.66.0') # header only?
Stage0 += packages(apt=['libboost-dev'], yum=['boost-devel'], epel=True)
# Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'})
- Stage0 += eigen()
vtk_cmake_args = [
'-DModule_vtkIOXML=ON',
'-DVTK_Group_Rendering=OFF',
@@ -337,6 +336,7 @@ def main(): # pragma: no cover
ldconfig=True)
if ompi != 'off':
Stage0 += petsc(version='3.11.3', ldconfig=True)
+ Stage0 += eigen(version='3.3.7')
if args.cvode:
Stage0 += cvode()
if args.cppcheck:
diff --git a/ogscm/cli_args.py b/ogscm/cli_args.py
index e3189d5..3d51948 100644
--- a/ogscm/cli_args.py
+++ b/ogscm/cli_args.py
@@ -153,10 +153,6 @@ class Cli_Args(argparse.ArgumentParser):
dest='jenkins',
action='store_true',
help='Setup Jenkins slave')
- switches_g.add_argument('--gitlab',
- dest='gitlab',
- action='store_true',
- help='Setup for GitLab-CI')
switches_g.add_argument('--cvode',
dest='cvode',
action='store_true',
--
GitLab