Merge branch 'feature/gitlab_URL' into 'master'

Updated GitLab project URL See merge request cara/cara!396
CERN · Sep 15, 2022 · b62eeff · b62eeff
2 parents 3b5c483 + 127efea
commit b62eeff
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,5 +1,5 @@
 # This module is part of CAiMIRA. Please see the repository at
-# https://gitlab.cern.ch/cara/cara for details of the license and terms of use.
+# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use.
 name: CI
 
 on:

diff --git a/README.md b/README.md
@@ -76,10 +76,10 @@ In no event shall the authors or copyright holders be liable for any claim, dama
 ## Running CAiMIRA locally
 
 The easiest way to run a version of CAiMIRA Calculator is to use docker. A pre-built
-image of CAiMIRA is made available at https://gitlab.cern.ch/cara/cara/container_registry.
+image of CAiMIRA is made available at https://gitlab.cern.ch/cara/caimira/container_registry.
 In order to run CAiMIRA locally with docker, run the following:
 
-    $ docker run -it -p 8080:8080 gitlab-registry.cern.ch/cara/cara/calculator
+    $ docker run -it -p 8080:8080 gitlab-registry.cern.ch/cara/caimira/calculator
 
 This will start a local version of CAiMIRA, which can be visited at http://localhost:8080/.
 

diff --git a/app-config/caimira-public-docker-image/run_caimira.sh b/app-config/caimira-public-docker-image/run_caimira.sh
@@ -1,6 +1,6 @@
 
 echo 'CAiMIRA is running on http://localhost:8080'
-echo 'Please see https://gitlab.cern.ch/cara/cara for terms of use.'
+echo 'Please see https://gitlab.cern.ch/cara/caimira for terms of use.'
 
 # Run a proxy for the apps (listening on 8080).
 nginx -c /opt/caimira/nginx.conf

diff --git a/app-config/openshift/buildconfig.yaml b/app-config/openshift/buildconfig.yaml
@@ -50,7 +50,7 @@
   parameters:
     - name: GIT_REPO
       description: The GIT repo URL
-      value: 'https://gitlab.cern.ch/cara/cara.git'
+      value: 'https://gitlab.cern.ch/cara/caimira.git'
     - name: GIT_BRANCH
       description: The name of the GIT branch to use when building the app, e.g. `live/caimira-test` in TEST, `master` in prod
       required: true
diff --git a/caimira/__init__.py b/caimira/__init__.py
@@ -1,5 +1,5 @@
 # This module is part of CAiMIRA. Please see the repository at
-# https://gitlab.cern.ch/cara/cara for details of the license and terms of use.
+# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use.
 """
 Documentation for the CAiMIRA package
 

diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
@@ -1,5 +1,5 @@
 # This module is part of CAiMIRA. Please see the repository at
-# https://gitlab.cern.ch/cara/cara for details of the license and terms of use.
+# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use.
 
 import asyncio
 import concurrent.futures
@@ -32,7 +32,7 @@
 # calculator version. If the calculator needs to make breaking changes (e.g. change
 # form attributes) then it can also increase its MAJOR version without needing to
 # increase the overall CAiMIRA version (found at ``caimira.__version__``).
-__version__ = "4.2"
+__version__ = "4.3"
 
 
 class BaseRequestHandler(RequestHandler):

diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2
@@ -343,7 +343,7 @@
 							{% elif form.virus_type == "SARS_CoV_2_DELTA" %}
 							<a href="https://www.bmj.com/content/373/bmj.n1513">SARS-CoV-2 (Delta VOC)</a>
 							{% elif form.virus_type == "SARS_CoV_2_OMICRON" %}
-							<a href="https://gitlab.cern.ch/cara/cara/-/issues/226">SARS-CoV-2 (Omicron VOC)</a>
+							<a href="https://gitlab.cern.ch/cara/caimira/-/issues/226">SARS-CoV-2 (Omicron VOC)</a>
 							{% endif %}
 							</p></li>
 							<li><p class="data_text">Room Volume: {{ model.concentration_model.room.volume }} m³</p></li>

diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2
@@ -23,7 +23,7 @@
           Please see the <a href="/about">About</a> page for more details on the methodology, assumptions and limitations of CAiMIRA.
           </p>
           <p>
-          The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our <a href="https://gitlab.cern.ch/cara/cara">code repository</a>.
+          The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our <a href="https://gitlab.cern.ch/cara/caimira">code repository</a>.
           It includes detailed instructions on how to run your own version of this tool.
           </p>
           <br>
@@ -73,7 +73,7 @@
         <a href="https://doi.org/10.5281/zenodo.6520432"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.6520432.svg" alt="DOI"></a><br>
         © Copyright 2020-2021 CERN. All rights not expressly granted are reserved.<br>
         Licensed under the Apache License, Version 2.0<br>
-        <a href=https://gitlab.cern.ch/cara/cara/-/blob/master/LICENSE><i>LICENSE</i></a>
+        <a href=https://gitlab.cern.ch/cara/caimira/-/blob/master/LICENSE><i>LICENSE</i></a>
       </ul>
     </p>
   </div>

diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2
@@ -90,9 +90,9 @@
                     policy issues. Any initiative is conducted on a best effort and as-is basis, without liability or
                     warranty.</em></span></p>
           <p style="font-size:10px;">
-              CAiMIRA is <a href="https://gitlab.cern.ch/cara/cara/-/blob/master/LICENSE" class="ext">Apache 2.0 licensed</a> open-source
+              CAiMIRA is <a href="https://gitlab.cern.ch/cara/caimira/-/blob/master/LICENSE" class="ext">Apache 2.0 licensed</a> open-source
               software developed at CERN.
-              You can find the source code at <a href="https://gitlab.cern.ch/cara/cara">https://gitlab.cern.ch/cara/cara</a>,
+              You can find the source code at <a href="https://gitlab.cern.ch/cara/caimira">https://gitlab.cern.ch/cara/caimira</a>,
               where we welcome contributions, feature requests and issue reports.
           </p>
         </div>

diff --git a/caimira/models.py b/caimira/models.py
@@ -1,5 +1,5 @@
 # This module is part of CAiMIRA. Please see the repository at
-# https://gitlab.cern.ch/cara/cara for details of the license and terms of use.
+# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use.
 """
 This module implements the core CAiMIRA models.
 

diff --git a/caimira/scripts/themes/base/caimira_script.command b/caimira/scripts/themes/base/caimira_script.command
@@ -1,5 +1,5 @@
 cd Downloads
-git clone https://gitlab.cern.ch/cara/cara.git
+git clone https://gitlab.cern.ch/cara/caimira.git
 cd caimira
 if [[ `uname -m` == 'arm64' ]]; then
   pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple

diff --git a/caimira/scripts/themes/base/caimira_script.sh b/caimira/scripts/themes/base/caimira_script.sh
@@ -1,4 +1,4 @@
-git clone https://gitlab.cern.ch/cara/cara.git
+git clone https://gitlab.cern.ch/cara/caimira.git
 cd caimira
 pip install -e .
 echo "############################################"

diff --git a/caimira/scripts/themes/cern/caimira_script.command b/caimira/scripts/themes/cern/caimira_script.command
@@ -1,5 +1,5 @@
 cd Downloads
-git clone https://gitlab.cern.ch/cara/cara.git
+git clone https://gitlab.cern.ch/cara/caimira.git
 cd caimira
 if [[ `uname -m` == 'arm64' ]]; then
   pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple

diff --git a/caimira/scripts/themes/cern/caimira_script.sh b/caimira/scripts/themes/cern/caimira_script.sh
@@ -1,4 +1,4 @@
-git clone https://gitlab.cern.ch/cara/cara.git
+git clone https://gitlab.cern.ch/cara/caimira.git
 cd caimira
 pip install -e .
 echo "############################################"

diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
 # This module is part of CAiMIRA. Please see the repository at
-# https://gitlab.cern.ch/cara/cara for details of the license and terms of use.
+# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use.
 """
 setup.py for CAiMIRA.