From be6b0ad27ee9ddde32fc792e2eb0bccd37f4d2b0 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 4 Nov 2021 09:18:44 +0100 Subject: [PATCH 1/6] Added scripts to install and run CARA --- cara/scripts/cara_script.command | 6 ++++++ cara/scripts/cara_script.sh | 5 +++++ 2 files changed, 11 insertions(+) create mode 100755 cara/scripts/cara_script.command create mode 100755 cara/scripts/cara_script.sh diff --git a/cara/scripts/cara_script.command b/cara/scripts/cara_script.command new file mode 100755 index 00000000..e154d2db --- /dev/null +++ b/cara/scripts/cara_script.command @@ -0,0 +1,6 @@ +cd Downloads +git clone https://gitlab.cern.ch/cara/cara.git +cd cara +git lfs pull +pip3 install -e . +python3 -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern \ No newline at end of file diff --git a/cara/scripts/cara_script.sh b/cara/scripts/cara_script.sh new file mode 100755 index 00000000..966bba7b --- /dev/null +++ b/cara/scripts/cara_script.sh @@ -0,0 +1,5 @@ +git clone https://gitlab.cern.ch/cara/cara.git +cd cara +git lfs pull +pip install -e . +python -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern From efcafbe01b1ed6681495b7ce5dc5de8c0fe62d2d Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 4 Nov 2021 11:57:35 +0100 Subject: [PATCH 2/6] Added scripts for different themes --- cara/scripts/themes/base/cara_script.command | 6 ++++++ cara/scripts/themes/base/cara_script.sh | 5 +++++ cara/scripts/{ => themes/cern}/cara_script.command | 0 cara/scripts/{ => themes/cern}/cara_script.sh | 0 4 files changed, 11 insertions(+) create mode 100755 cara/scripts/themes/base/cara_script.command create mode 100755 cara/scripts/themes/base/cara_script.sh rename cara/scripts/{ => themes/cern}/cara_script.command (100%) rename cara/scripts/{ => themes/cern}/cara_script.sh (100%) diff --git a/cara/scripts/themes/base/cara_script.command b/cara/scripts/themes/base/cara_script.command new file mode 100755 index 00000000..d4fc9048 --- /dev/null +++ b/cara/scripts/themes/base/cara_script.command @@ -0,0 +1,6 @@ +cd Downloads +git clone https://gitlab.cern.ch/cara/cara.git +cd cara +git lfs pull +pip3 install -e . +python3 -m cara.apps.calculator \ No newline at end of file diff --git a/cara/scripts/themes/base/cara_script.sh b/cara/scripts/themes/base/cara_script.sh new file mode 100755 index 00000000..d739a4d1 --- /dev/null +++ b/cara/scripts/themes/base/cara_script.sh @@ -0,0 +1,5 @@ +git clone https://gitlab.cern.ch/cara/cara.git +cd cara +git lfs pull +pip install -e . +python -m cara.apps.calculator diff --git a/cara/scripts/cara_script.command b/cara/scripts/themes/cern/cara_script.command similarity index 100% rename from cara/scripts/cara_script.command rename to cara/scripts/themes/cern/cara_script.command diff --git a/cara/scripts/cara_script.sh b/cara/scripts/themes/cern/cara_script.sh similarity index 100% rename from cara/scripts/cara_script.sh rename to cara/scripts/themes/cern/cara_script.sh From 0532c152f20c0019328b2bbcb3a44cec20d7bde6 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 5 Nov 2021 11:46:04 +0100 Subject: [PATCH 3/6] updated scripts for m1 machines --- cara/scripts/themes/base/cara_script.command | 4 ++++ cara/scripts/themes/cern/cara_script.command | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cara/scripts/themes/base/cara_script.command b/cara/scripts/themes/base/cara_script.command index d4fc9048..5d34e193 100755 --- a/cara/scripts/themes/base/cara_script.command +++ b/cara/scripts/themes/base/cara_script.command @@ -2,5 +2,9 @@ cd Downloads git clone https://gitlab.cern.ch/cara/cara.git cd cara git lfs pull +if [[ `uname -m` == 'arm64' ]]; then + pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple + pip3 install -U --no-use-pep517 scikit-learn +fi pip3 install -e . python3 -m cara.apps.calculator \ No newline at end of file diff --git a/cara/scripts/themes/cern/cara_script.command b/cara/scripts/themes/cern/cara_script.command index e154d2db..f217789b 100755 --- a/cara/scripts/themes/cern/cara_script.command +++ b/cara/scripts/themes/cern/cara_script.command @@ -2,5 +2,9 @@ cd Downloads git clone https://gitlab.cern.ch/cara/cara.git cd cara git lfs pull +if [[ `uname -m` == 'arm64' ]]; then + pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple + pip3 install -U --no-use-pep517 scikit-learn +fi pip3 install -e . python3 -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern \ No newline at end of file From 37edf3163e8ad0632e247d5201e143bd320a29d8 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Fri, 5 Nov 2021 15:47:50 +0100 Subject: [PATCH 4/6] Added installer for cython and git lfs --- cara/scripts/themes/base/cara_script.command | 2 ++ cara/scripts/themes/cern/cara_script.command | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cara/scripts/themes/base/cara_script.command b/cara/scripts/themes/base/cara_script.command index 5d34e193..f0b10069 100755 --- a/cara/scripts/themes/base/cara_script.command +++ b/cara/scripts/themes/base/cara_script.command @@ -1,9 +1,11 @@ cd Downloads git clone https://gitlab.cern.ch/cara/cara.git cd cara +git lfs install git lfs pull if [[ `uname -m` == 'arm64' ]]; then pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple + pip3 install Cython pip3 install -U --no-use-pep517 scikit-learn fi pip3 install -e . diff --git a/cara/scripts/themes/cern/cara_script.command b/cara/scripts/themes/cern/cara_script.command index f217789b..9abec5d5 100755 --- a/cara/scripts/themes/cern/cara_script.command +++ b/cara/scripts/themes/cern/cara_script.command @@ -1,9 +1,11 @@ cd Downloads git clone https://gitlab.cern.ch/cara/cara.git cd cara +git lfs install git lfs pull if [[ `uname -m` == 'arm64' ]]; then pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple + pip3 install Cython pip3 install -U --no-use-pep517 scikit-learn fi pip3 install -e . From 4c0708bb8ff31bcbc5c83f07c31cad5d3a0c9e47 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 8 Nov 2021 11:40:30 +0100 Subject: [PATCH 5/6] Added message when cara is running on scriptd --- cara/scripts/themes/base/cara_script.command | 3 ++- cara/scripts/themes/base/cara_script.sh | 1 + cara/scripts/themes/cern/cara_script.command | 3 ++- cara/scripts/themes/cern/cara_script.sh | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cara/scripts/themes/base/cara_script.command b/cara/scripts/themes/base/cara_script.command index f0b10069..e2de10bc 100755 --- a/cara/scripts/themes/base/cara_script.command +++ b/cara/scripts/themes/base/cara_script.command @@ -9,4 +9,5 @@ if [[ `uname -m` == 'arm64' ]]; then pip3 install -U --no-use-pep517 scikit-learn fi pip3 install -e . -python3 -m cara.apps.calculator \ No newline at end of file +python3 -m cara.apps.calculator +echo "CARA is now running at http://localhost:8080" \ No newline at end of file diff --git a/cara/scripts/themes/base/cara_script.sh b/cara/scripts/themes/base/cara_script.sh index d739a4d1..faafb482 100755 --- a/cara/scripts/themes/base/cara_script.sh +++ b/cara/scripts/themes/base/cara_script.sh @@ -3,3 +3,4 @@ cd cara git lfs pull pip install -e . python -m cara.apps.calculator +echo "CARA is now running at http://localhost:8080" \ No newline at end of file diff --git a/cara/scripts/themes/cern/cara_script.command b/cara/scripts/themes/cern/cara_script.command index 9abec5d5..4ca03012 100755 --- a/cara/scripts/themes/cern/cara_script.command +++ b/cara/scripts/themes/cern/cara_script.command @@ -9,4 +9,5 @@ if [[ `uname -m` == 'arm64' ]]; then pip3 install -U --no-use-pep517 scikit-learn fi pip3 install -e . -python3 -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern \ No newline at end of file +python3 -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern +echo "CARA is now running at http://localhost:8080" \ No newline at end of file diff --git a/cara/scripts/themes/cern/cara_script.sh b/cara/scripts/themes/cern/cara_script.sh index 966bba7b..3b07586e 100755 --- a/cara/scripts/themes/cern/cara_script.sh +++ b/cara/scripts/themes/cern/cara_script.sh @@ -3,3 +3,4 @@ cd cara git lfs pull pip install -e . python -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern +echo "CARA is now running at http://localhost:8080" \ No newline at end of file From 8880a5689434ca593fed589dc5ce0d99b5cc172b Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 8 Nov 2021 11:44:01 +0100 Subject: [PATCH 6/6] Added git lfs install to windows scrips --- cara/scripts/themes/base/cara_script.sh | 1 + cara/scripts/themes/cern/cara_script.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/cara/scripts/themes/base/cara_script.sh b/cara/scripts/themes/base/cara_script.sh index faafb482..835ca024 100755 --- a/cara/scripts/themes/base/cara_script.sh +++ b/cara/scripts/themes/base/cara_script.sh @@ -1,5 +1,6 @@ git clone https://gitlab.cern.ch/cara/cara.git cd cara +git lfs install git lfs pull pip install -e . python -m cara.apps.calculator diff --git a/cara/scripts/themes/cern/cara_script.sh b/cara/scripts/themes/cern/cara_script.sh index 3b07586e..ea59872f 100755 --- a/cara/scripts/themes/cern/cara_script.sh +++ b/cara/scripts/themes/cern/cara_script.sh @@ -1,5 +1,6 @@ git clone https://gitlab.cern.ch/cara/cara.git cd cara +git lfs install git lfs pull pip install -e . python -m cara.apps.calculator --theme=cara/apps/calculator/themes/cern