diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 20a79941..0f8fc5fd 100644 --- 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/caimira/caimira for details of the license and terms of use. name: CI on: diff --git a/README.md b/README.md index db51d327..3c33f035 100644 --- 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/caimira/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/caimira/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 index bfaa57ab..22d80533 100755 --- 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/caimira/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 index 3fa3bcdb..5a72a0cd 100644 --- 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/caimira/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 index cf04da3a..fd40e4db 100644 --- 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/caimira/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 index 2010a624..e927413a 100644 --- 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/caimira/caimira for details of the license and terms of use. import asyncio import concurrent.futures diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2 index 17d219ca..473c1ed5 100644 --- 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" %} SARS-CoV-2 (Delta VOC) {% elif form.virus_type == "SARS_CoV_2_OMICRON" %} - SARS-CoV-2 (Omicron VOC) + SARS-CoV-2 (Omicron VOC) {% endif %}

  • Room Volume: {{ model.concentration_model.room.volume }} m³

    • diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2 index 68727548..ebec79da 100644 --- a/caimira/apps/templates/base/index.html.j2 +++ b/caimira/apps/templates/base/index.html.j2 @@ -23,7 +23,7 @@ Please see the About page for more details on the methodology, assumptions and limitations of CAiMIRA.

    - The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our code repository. + The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our code repository. It includes detailed instructions on how to run your own version of this tool.


    @@ -73,7 +73,7 @@ DOI
    © Copyright 2020-2021 CERN. All rights not expressly granted are reserved.
    Licensed under the Apache License, Version 2.0
    - LICENSE + LICENSE

    diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2 index 3bc7083c..894296c5 100644 --- 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.

    - CAiMIRA is Apache 2.0 licensed open-source + CAiMIRA is Apache 2.0 licensed open-source software developed at CERN. - You can find the source code at https://gitlab.cern.ch/cara/cara, + You can find the source code at https://gitlab.cern.ch/caimira/caimira, where we welcome contributions, feature requests and issue reports.

    diff --git a/caimira/models.py b/caimira/models.py index 437055fd..7496a872 100644 --- 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/caimira/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 index 49b418e4..c750cbdf 100755 --- 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/caimira/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 index 8d0d15de..0e16f4ad 100755 --- 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/caimira/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 index 277fc3d1..9c9c4e01 100755 --- 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/caimira/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 index 306b94c9..695f67d8 100755 --- 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/caimira/caimira.git cd caimira pip install -e . echo "############################################" diff --git a/setup.py b/setup.py index 108a3811..08ddb890 100644 --- 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/caimira/caimira for details of the license and terms of use. """ setup.py for CAiMIRA.