From a7b96d242e2f4c882e42cf7622cb65de967bf05d Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Mon, 11 May 2020 09:00:21 +0000
Subject: [PATCH] Revert "Merge branch 'master' of
https://gitlab.cern.ch:8443/faser/calypso"
This reverts commit 4c9e84aa6660762727103731dfdac6e1161b962c
---
.gitlab-ci.yml | 2 +-
README.md | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58db0511..7fe8c1fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ build_image:
- cd build
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
- set +e && asetup --input=../../calypso/asetup.faser master,latest,Athena; set -e
- - cmake -DATLAS_PYTHON_CHECKER="" ../../calypso
+ - cmake ../../calypso
- make -j
artifacts:
paths:
diff --git a/README.md b/README.md
index 5eaf8194..d2e2cc4c 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,6 @@ asetup --input=calypso/asetup.faser master,latest,Athena
mkdir build
cd build
#build calypso
-cmake -DCMAKE_INSTALL_PREFIX=../run -DATLAS_PYTHON_CHECKER="" ../calypso ; make ; make install
-
-The ATLAS_PYTHON_CHECKER parameter to the cmake command is a temporary workaround for a problem with Flake
+cmake -DCMAKE_INSTALL_PREFIX=../run ../calypso ; make ; make install
It can be convenient to alias the "asetup --input=calypso/asetup.faser" to something like "fsetup"
\ No newline at end of file
--
GitLab