[airavata-django-portal] branch airavata-3499 deleted (was 0906deb3)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch airavata-3499 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git was 0906deb3 Merge pull request #66 from musecian/patch-3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[airavata] branch AIRAVATA-3697 deleted (was 71bc7c3d30)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3697 in repository https://gitbox.apache.org/repos/asf/airavata.git was 71bc7c3d30 AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[airavata] branch master updated: Ansible: tus upload directory cleanup script
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 1b1d9c9b57 Ansible: tus upload directory cleanup script
1b1d9c9b57 is described below
commit 1b1d9c9b57cb5f80fef4896a74cd20f1f6007bab
Author: Marcus Christie
AuthorDate: Thu Sep 28 18:21:35 2023 -0400
Ansible: tus upload directory cleanup script
---
dev-tools/ansible/roles/tusd/tasks/main.yml | 8
.../ansible/roles/tusd/templates/tus-temp-dir-cleanup.cron.j2 | 4
2 files changed, 12 insertions(+)
diff --git a/dev-tools/ansible/roles/tusd/tasks/main.yml
b/dev-tools/ansible/roles/tusd/tasks/main.yml
index 7655525e86..2d4d7afdeb 100644
--- a/dev-tools/ansible/roles/tusd/tasks/main.yml
+++ b/dev-tools/ansible/roles/tusd/tasks/main.yml
@@ -129,6 +129,14 @@
backup: yes
become: yes
+- name: copy clean up cron job to /etc/cron.daily
+ template:
+src: "tus-temp-dir-cleanup.cron.j2"
+dest: /etc/cron.daily/tus-temp-dir-cleanup.cron
+mode: 0755
+ become: yes
+ become_user: root
+
- name: start tusd
service:
name: tus
diff --git
a/dev-tools/ansible/roles/tusd/templates/tus-temp-dir-cleanup.cron.j2
b/dev-tools/ansible/roles/tusd/templates/tus-temp-dir-cleanup.cron.j2
new file mode 100644
index 00..5c6240f0db
--- /dev/null
+++ b/dev-tools/ansible/roles/tusd/templates/tus-temp-dir-cleanup.cron.j2
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Delete files that are older than 7 days
+find {{ tusd_upload_dir }} -mtime +7 -exec rm -rf {} \;
[airavata-django-portal] branch master updated: Updating instructions for pushing a new docker image
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git The following commit(s) were added to refs/heads/master by this push: new 7a0dba86 Updating instructions for pushing a new docker image 7a0dba86 is described below commit 7a0dba868cd3a3b4faa13e56d6c8dad829b7be9c Author: Marcus Christie AuthorDate: Thu Sep 28 18:37:53 2023 -0400 Updating instructions for pushing a new docker image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84d32571..aa8a1697 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ docker buildx create --name mybuilder --use then run ``` -docker buildx build --pull --platform linux/amd64,linux/arm64 -t TAG --push . +docker buildx build --pull --platform linux/amd64,linux/arm64 -t apache/airavata-django-portal:latest --push . ``` ## Documentation
[airavata-django-portal] branch master updated: Updating tutorial to apache dockerhub image
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/master by this push:
new 7f0f98fb Updating tutorial to apache dockerhub image
7f0f98fb is described below
commit 7f0f98fb62283c93221a6af1f5725a426fe13cd8
Author: Marcus Christie
AuthorDate: Thu Sep 28 18:36:03 2023 -0400
Updating tutorial to apache dockerhub image
---
docs/tutorial/custom_ui_tutorial.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/tutorial/custom_ui_tutorial.md
b/docs/tutorial/custom_ui_tutorial.md
index 40b07c2c..0e8c606f 100644
--- a/docs/tutorial/custom_ui_tutorial.md
+++ b/docs/tutorial/custom_ui_tutorial.md
@@ -599,7 +599,7 @@ the settings_local.py file for local development. Move or
copy it to the
2. Run the following to create a Docker container called
**custom-ui-tutorial**.
cd $HOME/custom_ui_tutorial_app
-docker run --pull always -d --name custom-ui-tutorial -p 8000:8000
-v "${PWD}:/extensions" -v
"${PWD}/settings_local.py:/code/django_airavata/settings_local.py"
machristie/airavata-django-portal
+docker run --pull always -d --name custom-ui-tutorial -p 8000:8000
-v "${PWD}:/extensions" -v
"${PWD}/settings_local.py:/code/django_airavata/settings_local.py"
apache/airavata-django-portal
3. Wait until the Docker container starts up. Go to <http://localhost:8000>
and when it loads and you see **Welcome to your new Wagtail site!**, then
you're ready to proceed to the next step.
[airavata-django-portal] branch master updated: Switching to apache cookiecutter repos
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git The following commit(s) were added to refs/heads/master by this push: new 28fe5598 Switching to apache cookiecutter repos 28fe5598 is described below commit 28fe559867bb0a594b5de4217282c37b494f0048 Author: Marcus Christie AuthorDate: Wed Sep 27 15:05:10 2023 -0400 Switching to apache cookiecutter repos --- docs/dev/custom_django_app.md | 2 +- docs/dev/custom_output_view_provider.md | 4 ++-- docs/tutorial/custom_ui_tutorial.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/dev/custom_django_app.md b/docs/dev/custom_django_app.md index 939a0b5b..e7785348 100644 --- a/docs/dev/custom_django_app.md +++ b/docs/dev/custom_django_app.md @@ -33,7 +33,7 @@ pip install -U cookiecutter Django app template. ``` -cookiecutter https://github.com/machristie/cookiecutter-airavata-django-app.git +cookiecutter https://github.com/apache/airavata-cookiecutter-django-app.git ``` You'll need to answer some questions. The project name is the most important diff --git a/docs/dev/custom_output_view_provider.md b/docs/dev/custom_output_view_provider.md index b8a89036..88f8fade 100644 --- a/docs/dev/custom_output_view_provider.md +++ b/docs/dev/custom_output_view_provider.md @@ -42,7 +42,7 @@ pip install -U cookiecutter custom django app. Use cookiecutter to run the Airavata Django app template. ``` -cookiecutter https://github.com/machristie/cookiecutter-airavata-django-app.git +cookiecutter https://github.com/apache/airavata-cookiecutter-django-app.git ``` You'll need to answer some questions. The project name is the most important @@ -65,7 +65,7 @@ See [Adding a Custom Django App](./custom_django_app.md) for more details. ``` cd custom_django_app # Or whatever you named your custom Django app -cookiecutter https://github.com/machristie/cookiecutter-airavata-django-output-view.git -f +cookiecutter https://github.com/apache/airavata-cookiecutter-django-output-view.git -f ``` You'll need to answer some questions. For `project_name` give the name for your diff --git a/docs/tutorial/custom_ui_tutorial.md b/docs/tutorial/custom_ui_tutorial.md index 9175fccb..40b07c2c 100644 --- a/docs/tutorial/custom_ui_tutorial.md +++ b/docs/tutorial/custom_ui_tutorial.md @@ -557,7 +557,7 @@ pip install -U cookiecutter 2. Use cookiecutter to run the Airavata Django app template. ```sh -cookiecutter https://github.com/machristie/cookiecutter-airavata-django-app.git +cookiecutter https://github.com/apache/airavata-cookiecutter-django-app.git ``` You'll need to answer some questions. You can name it whatever you want, but to @@ -722,7 +722,7 @@ Now we'll also generate and implement a **Gaussian Eigenvalues View** provider. 2. Run the following cookiecutter template: ```sh -cookiecutter https://github.com/machristie/cookiecutter-airavata-django-output-view.git -f +cookiecutter https://github.com/apache/airavata-cookiecutter-django-output-view.git -f ``` You'll need to answer some questions again. For `project_name` give **Gaussian
[airavata-cookiecutter-django-output-view] 06/10: Fix module path to output view provider
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit d9cd404bd4e8a4bab464d4a3f28e96f974aadeb5
Author: Marcus Christie
AuthorDate: Thu Jun 3 10:03:44 2021 -0400
Fix module path to output view provider
---
hooks/post_gen_project.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index bcbdc86..c5255e4 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -51,7 +51,7 @@ def get_django_app_package_name(setup_cfg_file):
def insert_output_view_provider(setup_cfg_lines, index,
insert_entry_point_group=False):
updated_lines = setup_cfg_lines.copy()
-updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
{{cookiecutter.custom_django_app_module_name}}.{{cookiecutter.output_views_directory_name}}:{{cookiecutter.output_view_provider_class_name}}"
+ os.linesep)
+updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
{{cookiecutter.custom_django_app_module_name}}.{{cookiecutter.output_views_directory_name}}.{{cookiecutter.project_slug}}:{{cookiecutter.output_view_provider_class_name}}"
+ os.linesep)
if insert_entry_point_group:
updated_lines.insert(index+1, "airavata.output_view_providers =" +
os.linesep)
return updated_lines
[airavata-cookiecutter-django-output-view] 05/10: Airavata API sample code
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit b209f2a851ec4bbeee57db75c1219efe8bfd453e
Author: Marcus Christie
AuthorDate: Thu Jun 3 10:03:20 2021 -0400
Airavata API sample code
---
.../{{cookiecutter.project_slug}}.py | 24 ++
1 file changed, 24 insertions(+)
diff --git
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
index 188769f..5fa1c89 100644
---
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
+++
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
@@ -43,6 +43,30 @@ class {{ cookiecutter.output_view_provider_class_name }}:
# for more information.
+# Example code: Airavata API client
+# Make calls to the Airavata API from the output view provider, for
example:
+#
+# data_product = request.airavata_client.getDataProduct(
+#request.authz_token, experiment_output.value)
+#
+# In this example, the DataProduct object is loaded for the output
file.
+# 'experiment_output.value' has the Data Product URI for the output
+# file, the unique identifier in the Airavata API for this output file.
+# The returned DataProduct object contains metadata about the output
+# file and the location(s) where it is stored. See
+#
http://airavata.apache.org/api-docs/master/replica_catalog_models.html#Struct_DataProductModel
+# for more information.
+#
+# The authorization token is always the first argument of Airavata API
calls
+# and is available as 'request.authz_token'. Some API methods require a
+# 'gatewayID' argument and that is available on the Django settings
object
+# as 'settings.GATEWAY_ID'.
+# For documentation on other Airavata API methods, see
+#
https://docs.airavata.org/en/master/technical-documentation/airavata-api/.
+# The Airavata Django Portal uses the Airavata Python Client SDK:
+#
https://github.com/apache/airavata/tree/master/airavata-api/airavata-client-sdks/airavata-python-sdk
+
+
{% if cookiecutter.output_view_display_type == "link" %}
label = "Link to Google"
url = "https://google.com;
[airavata-cookiecutter-django-output-view] 10/10: Windows: fixes extra whitespace when inserting output view provider in setup.cfg #1
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit 7724c7eba70f1b75edb9b1f4df9bb40c18062627
Author: Marcus Christie
AuthorDate: Wed Jul 14 14:01:57 2021 -0400
Windows: fixes extra whitespace when inserting output view provider in
setup.cfg #1
---
hooks/post_gen_project.py | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index c5255e4..9281a3d 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -51,9 +51,11 @@ def get_django_app_package_name(setup_cfg_file):
def insert_output_view_provider(setup_cfg_lines, index,
insert_entry_point_group=False):
updated_lines = setup_cfg_lines.copy()
-updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
{{cookiecutter.custom_django_app_module_name}}.{{cookiecutter.output_views_directory_name}}.{{cookiecutter.project_slug}}:{{cookiecutter.output_view_provider_class_name}}"
+ os.linesep)
+# Just use \n for line endings. readlines and writelines already does
+# platform specific line ending conversion.
+updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
{{cookiecutter.custom_django_app_module_name}}.{{cookiecutter.output_views_directory_name}}.{{cookiecutter.project_slug}}:{{cookiecutter.output_view_provider_class_name}}\n")
if insert_entry_point_group:
-updated_lines.insert(index+1, "airavata.output_view_providers =" +
os.linesep)
+updated_lines.insert(index+1, "airavata.output_view_providers =\n")
return updated_lines
setup_cfg_file = find_setup_cfg_file()
[airavata-cookiecutter-django-output-view] 02/10: Add some sanity checks: should be run from within the custom django app root directory
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit 8aca829df908cfdf45be9888347c7aedae482c7f
Author: Marcus Christie
AuthorDate: Wed Jun 2 10:30:33 2021 -0400
Add some sanity checks: should be run from within the custom django app
root directory
---
cookiecutter.json | 1 +
hooks/post_gen_project.py | 10 -
hooks/pre_gen_project.py | 26 ++
.../__init__.py| 0
.../{{cookiecutter.project_slug}}.py | 0
5 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/cookiecutter.json b/cookiecutter.json
index 7765419..0d2f1da 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -3,6 +3,7 @@
"project_slug": "{{ cookiecutter.project_name | slugify(separator='_')}}",
"project_short_description": "{{ cookiecutter.project_name }} generates data
for an output view in the Airavata Django Portal",
"output_view_provider_class_name": "{{ cookiecutter.project_name | title |
replace(' ', '') }}Provider",
+ "custom_django_app_module_name": "",
"output_views_directory_name": "output_views",
"output_view_display_type": ["image", "link", "html"],
"number_of_output_files": ["single (URI)", "multiple (URI_COLLECTION)"]
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 919288f..bcbdc86 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -1,6 +1,8 @@
import os
import sys
+from setuptools.config import read_configuration
+
def find_setup_cfg_file():
currdir = os.getcwd()
@@ -41,9 +43,15 @@ def find_last_line_of_entry_points(setup_cfg_lines):
# Return None if we couldn't find it
return entry_points_end if entry_points_end > 0 else None
+def get_django_app_package_name(setup_cfg_file):
+setup_cfg_dict = read_configuration(setup_cfg_file)
+entry_point =
setup_cfg_dict['options']['entry_points']['airavata.djangoapp'][0]
+django_app_package_name = entry_point.split('=')[0].strip()
+return django_app_package_name
+
def insert_output_view_provider(setup_cfg_lines, index,
insert_entry_point_group=False):
updated_lines = setup_cfg_lines.copy()
-updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
FIXME.{{cookiecutter.output_views_directory_name}}:{{cookiecutter.output_view_provider_class_name}}"
+ os.linesep)
+updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
{{cookiecutter.custom_django_app_module_name}}.{{cookiecutter.output_views_directory_name}}:{{cookiecutter.output_view_provider_class_name}}"
+ os.linesep)
if insert_entry_point_group:
updated_lines.insert(index+1, "airavata.output_view_providers =" +
os.linesep)
return updated_lines
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
new file mode 100644
index 000..b7885d6
--- /dev/null
+++ b/hooks/pre_gen_project.py
@@ -0,0 +1,26 @@
+import os
+import sys
+
+
+# make sure setup.cfg is one directory up
+cwd = os.getcwd()
+django_app_dir = os.path.dirname(cwd)
+if not os.path.isfile(os.path.join(django_app_dir, "setup.cfg")):
+print(f"ERROR: Could not find setup.cfg file in {django_app_dir}",
file=sys.stderr)
+print(f"Are you sure you are running this cookiecutter in an Airavata
Django app directory? The setup.cfg should be in the current directory.",
file=sys.stderr)
+sys.exit(1)
+
+# make sure {{cookiecutter.custom_django_app_module_name}} looks like django
app directory
+django_app_module_dir = os.path.join(django_app_dir,
"{{cookiecutter.custom_django_app_module_name}}")
+if not os.path.isfile(os.path.join(django_app_module_dir, "apps.py")):
+# Try to find the django app module
+directories = [d for d in os.listdir(django_app_dir) if
os.path.isdir(os.path.join(django_app_dir, d))]
+candidate = None
+for directory in directories:
+if os.path.isfile(os.path.join(django_app_dir, directory, 'apps.py')):
+candidate = directory
+break
+print(f"ERROR: {{cookiecutter.custom_django_app_module_name}} doesn't look
like a Django app module", file=sys.stderr)
+if candidate is not None:
+print(f"Did you mean '{candidate}' instead of
'{{cookiecutter.custom_django_app_module_name}}'?", file=sys.stderr)
+sys.exit(1)
diff --git
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/__init__.py
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutt
[airavata-cookiecutter-django-output-view] 08/10: Add a check for output_views.py, with mitigation instructions
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit 633348f340820179cbf1aa684198099873011166
Author: Marcus Christie
AuthorDate: Thu Jun 3 11:47:58 2021 -0400
Add a check for output_views.py, with mitigation instructions
---
README.md| 13 +
hooks/pre_gen_project.py | 5 +
2 files changed, 18 insertions(+)
diff --git a/README.md b/README.md
index f9761f8..4b5d61a 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,16 @@ Then run the following:
When prompted for the name of the `custom_django_app_module_name`, give it the
name of your Airavata Django app. Keeping with the example, you would supply
`test_django_app`.
+
+## Converting output_views.py to a module directory
+
+If your Django app has an output_views.py file you'll get an error since this
+cookiecutter assumes that `output_views` is a module directory. To convert it
to
+module directory:
+
+1. Create an `output_views/` directory in the same directory where your
+ output_views.py file lives.
+2. Either, rename your `output_views.py` file to `output_views/__init__.py`
+3. Or, create an empty `output_views/__init__.py` file and move/rename as
+ appropriate your `output_views.py` file to a file in the `output_views/`
+ directory. You'll need to update the entry_points in setup.cfg.
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index b7885d6..b4367df 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -24,3 +24,8 @@ if not os.path.isfile(os.path.join(django_app_module_dir,
"apps.py")):
if candidate is not None:
print(f"Did you mean '{candidate}' instead of
'{{cookiecutter.custom_django_app_module_name}}'?", file=sys.stderr)
sys.exit(1)
+
+# Make sure that there isn't an output_views isn't a file
+if os.path.isfile(os.path.join(django_app_module_dir,
"{{cookiecutter.output_views_directory_name}}.py")):
+print(f"ERROR: {os.path.join(django_app_module_dir,
'{{cookiecutter.output_views_directory_name}}.py')} is a file. Convert to a
module directory. See the README:
https://github.com/machristie/cookiecutter-airavata-django-output-view.;)
+sys.exit(1)
[airavata-cookiecutter-django-output-view] 01/10: initial commit
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit 4a20d70be78b1f7202b87686520ec92b96d0aacc
Author: Marcus Christie
AuthorDate: Fri May 28 15:11:21 2021 -0400
initial commit
---
README.md | 10 +++
cookiecutter.json | 9 +++
hooks/post_gen_project.py | 72 ++
.../{{cookiecutter.project_slug}}.py | 49 +++
4 files changed, 140 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 000..515c7a5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+
+# Airavata Django Portal Output View Provider Cookiecutter
+
+## Quickstart
+
+
+cd custom_django_app/custom_django_app/
+cookiecutter
https://github.com/machristie/cookiecutter-airavata-django-output-view.git -f
+
+`-f` is needed because output_views/ directory should already exist
diff --git a/cookiecutter.json b/cookiecutter.json
new file mode 100644
index 000..7765419
--- /dev/null
+++ b/cookiecutter.json
@@ -0,0 +1,9 @@
+{
+ "project_name": "My Custom Output View",
+ "project_slug": "{{ cookiecutter.project_name | slugify(separator='_')}}",
+ "project_short_description": "{{ cookiecutter.project_name }} generates data
for an output view in the Airavata Django Portal",
+ "output_view_provider_class_name": "{{ cookiecutter.project_name | title |
replace(' ', '') }}Provider",
+ "output_views_directory_name": "output_views",
+ "output_view_display_type": ["image", "link", "html"],
+ "number_of_output_files": ["single (URI)", "multiple (URI_COLLECTION)"]
+}
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
new file mode 100644
index 000..919288f
--- /dev/null
+++ b/hooks/post_gen_project.py
@@ -0,0 +1,72 @@
+import os
+import sys
+
+
+def find_setup_cfg_file():
+currdir = os.getcwd()
+while currdir != os.path.dirname(currdir):
+setupcfg_path = os.path.join(currdir, "setup.cfg")
+if os.path.isfile(setupcfg_path):
+return setupcfg_path
+else:
+currdir = os.path.dirname(currdir)
+# Couldn't find it, returning None
+return None
+
+def find_last_line_of_output_view_providers(setup_cfg_lines):
+output_vps_start = -1
+output_vps_end = -1
+for index, line in enumerate(setup_cfg_lines):
+if line.strip().startswith('airavata.output_view_providers'):
+output_vps_start = index
+# If the line is non-blank and has a dangling item, update the end
index
+elif line.startswith(' ') and line.strip() != '' and output_vps_start
> 0:
+output_vps_end = index
+elif output_vps_end > 0:
+break
+# Return None if we couldn't find it
+return output_vps_end if output_vps_end > 0 else None
+
+def find_last_line_of_entry_points(setup_cfg_lines):
+entry_points_start = -1
+entry_points_end = -1
+for index, line in enumerate(setup_cfg_lines):
+if line.strip() == '[options.entry_points]':
+entry_points_start = index
+# If the line is non-blank and doesn't start a new section, update the
end index
+elif line.strip() != '' and not line.startswith('[') and
entry_points_start > 0:
+entry_points_end = index
+elif entry_points_end > 0:
+break
+# Return None if we couldn't find it
+return entry_points_end if entry_points_end > 0 else None
+
+def insert_output_view_provider(setup_cfg_lines, index,
insert_entry_point_group=False):
+updated_lines = setup_cfg_lines.copy()
+updated_lines.insert(index+1, "{{cookiecutter.project_slug}} =
FIXME.{{cookiecutter.output_views_directory_name}}:{{cookiecutter.output_view_provider_class_name}}"
+ os.linesep)
+if insert_entry_point_group:
+updated_lines.insert(index+1, "airavata.output_view_providers =" +
os.linesep)
+return updated_lines
+
+setup_cfg_file = find_setup_cfg_file()
+if not setup_cfg_file:
+print("Could not find setup.cfg file! Are you running this from within a
custom Django app?", file=sys.stderr)
+sys.exit(1)
+
+with open(setup_cfg_file, 'r+') as f:
+lines = f.readlines()
+end_of_output_view_providers =
find_last_line_of_output_view_providers(lines)
+updated_lines = None
+if end_of_output_view_providers is not None:
+updated_lines = insert_output_view_provider(lines,
end_of_output_view_providers)
+else:
+end_of_entry_points = find_last_line_of_entry_points(lines)
+if end_of_entry_points is not None:
+updated_li
[airavata-cookiecutter-django-output-view] 09/10: improve error message
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit 0370c2321e7c73902e53def5a1a839b2f623c9ec
Author: Marcus Christie
AuthorDate: Fri Jun 4 12:19:37 2021 -0400
improve error message
---
hooks/pre_gen_project.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index b4367df..25e89f7 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -22,7 +22,7 @@ if not os.path.isfile(os.path.join(django_app_module_dir,
"apps.py")):
break
print(f"ERROR: {{cookiecutter.custom_django_app_module_name}} doesn't look
like a Django app module", file=sys.stderr)
if candidate is not None:
-print(f"Did you mean '{candidate}' instead of
'{{cookiecutter.custom_django_app_module_name}}'?", file=sys.stderr)
+print(f"For custom_django_app_module_name, did you mean '{candidate}'
instead of '{{cookiecutter.custom_django_app_module_name}}'?", file=sys.stderr)
sys.exit(1)
# Make sure that there isn't an output_views isn't a file
[airavata-cookiecutter-django-output-view] 03/10: adding quickstart to README
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git commit 1dee5ea41b38c2844bf6aec523b1475dd41664e2 Author: Marcus Christie AuthorDate: Wed Jun 2 11:34:54 2021 -0400 adding quickstart to README --- README.md | 25 ++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 515c7a5..f9761f8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,29 @@ - # Airavata Django Portal Output View Provider Cookiecutter ## Quickstart +Install the latest Cookiecutter if you haven't installed it yet: + +pip install --user -U cookiecutter + +This cookiecutter assumes that you are running it inside the root directory of a +custom Airavata Django app. If you don't yet have a custom Airavata Django app, +there is a cookiecutter you can use to create one: +https://github.com/machristie/cookiecutter-airavata-django-app. + +Once you have your custom Airavata Django app, go into the root directory and +run this cookiecutter there. For example, if you created an Airavata Django app +with the name `test_django_app`, then change to that directory (this is the +directory that contains the `setup.cfg` file) + +cd path/to/test_django_app + +Then run the following: -cd custom_django_app/custom_django_app/ cookiecutter https://github.com/machristie/cookiecutter-airavata-django-output-view.git -f -`-f` is needed because output_views/ directory should already exist +`-f` is needed because `output_views/` directory should already exist. + +When prompted for the name of the `custom_django_app_module_name`, give it the +name of your Airavata Django app. Keeping with the example, you would supply +`test_django_app`.
[airavata-cookiecutter-django-output-view] branch main created (now 7724c7e)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git at 7724c7e Windows: fixes extra whitespace when inserting output view provider in setup.cfg #1 This branch includes the following new commits: new 4a20d70 initial commit new 8aca829 Add some sanity checks: should be run from within the custom django app root directory new 1dee5ea adding quickstart to README new da284f3 user_storage module example code new b209f2a Airavata API sample code new d9cd404 Fix module path to output view provider new a58488f adding setting import new 633348f Add a check for output_views.py, with mitigation instructions new 0370c23 improve error message new 7724c7e Windows: fixes extra whitespace when inserting output view provider in setup.cfg #1 The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[airavata-cookiecutter-django-output-view] 04/10: user_storage module example code
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit da284f3fcdd48c09fc1c0dc08a134f8cf56d8cbd
Author: Marcus Christie
AuthorDate: Wed Jun 2 11:51:30 2021 -0400
user_storage module example code
---
.../{{cookiecutter.project_slug}}.py | 29 ++
1 file changed, 29 insertions(+)
diff --git
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
index 3077383..188769f 100644
---
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
+++
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
@@ -4,6 +4,9 @@ import io
from django.template.loader import render_to_string
{% endif %}
+from airavata_django_portal_sdk import user_storage
+
+
class {{ cookiecutter.output_view_provider_class_name }}:
display_type = "{{ cookiecutter.output_view_display_type }}"
# As a performance optimization, the output view provider can be invoked
@@ -14,6 +17,32 @@ class {{ cookiecutter.output_view_provider_class_name }}:
name = "{{ cookiecutter.project_name }}"
def generate_data(self, request, experiment_output, experiment,{% if
"single" in cookiecutter.number_of_output_files %} output_file=None,{% else %}
output_files=None,{% endif %} **kwargs):
+
+# Use `output_file` or `output_files` to read from the output file(s).
+# See
https://docs.python.org/3/tutorial/inputoutput.html#methods-of-file-objects
+# for how to read from file objects. For example, to read the entire
file, use:
+#
+# entire_file = output_file.read()
+
+
+# Example code: user_storage module
+# To find other files in the experiment data directory, use the
+# user_storage module of the airavata_django_portal_sdk. You can use
the
+# following to list the files and directories in the experiment data
+# directory:
+#
+# dirs, files = user_storage.list_experiment_dir(request,
experiment.experimentId)
+#
+# The 'files' variable is a list of dictionaries, each one will have a
+# 'data-product-uri' key. Use the data-product-uri to open the file:
+#
+# data_product_uri = files[0]['data-product-uri']
+# data = user_storage.open_file(request,
data_product_uri=data_product_uri)
+#
+# See
https://airavata-django-portal-sdk.readthedocs.io/en/latest/#module-user_storage
+# for more information.
+
+
{% if cookiecutter.output_view_display_type == "link" %}
label = "Link to Google"
url = "https://google.com;
[airavata-cookiecutter-django-output-view] 07/10: adding setting import
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-output-view.git
commit a58488f3d0db190526eb810adaac89ef76cd98a2
Author: Marcus Christie
AuthorDate: Thu Jun 3 10:06:20 2021 -0400
adding setting import
---
.../{{cookiecutter.project_slug}}.py | 1 +
1 file changed, 1 insertion(+)
diff --git
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
index 5fa1c89..fa10e9f 100644
---
a/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
+++
b/{{cookiecutter.custom_django_app_module_name}}/{{cookiecutter.output_views_directory_name}}/{{cookiecutter.project_slug}}.py
@@ -1,3 +1,4 @@
+from django.conf import settings
{% if cookiecutter.output_view_display_type == "image" %}
import io
{% elif cookiecutter.output_view_display_type == "html" %}
[airavata-cookiecutter-django-app] 13/16: version upgrade
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 215d5732a1607031e816d181d899408d3a129ede
Author: Marcus Christie
AuthorDate: Fri Sep 24 17:02:44 2021 -0400
version upgrade
---
{{cookiecutter.project_slug}}/setup.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/setup.cfg
b/{{cookiecutter.project_slug}}/setup.cfg
index 41252a4..70ecdae 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -8,7 +8,7 @@ packages = find:
# Include data files as specified in MANIFEST.in
include_package_data = True
install_requires =
-django >= 2.2
+django >= 3.2
airavata-django-portal-sdk
[options.entry_points]
[airavata-cookiecutter-django-app] 08/16: Fixing output_views module
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit e9ce781b77a544ac095e7cbc7fa0eef7ac1e4147
Author: Marcus Christie
AuthorDate: Fri Jun 4 12:28:50 2021 -0400
Fixing output_views module
---
.../{output_views.py => output_views}/__init__.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/output_views.py/__init__.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/output_views/__init__.py
similarity index 100%
rename from
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/output_views.py/__init__.py
rename to
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/output_views/__init__.py
[airavata-cookiecutter-django-app] 07/16: Adding JavaScript SDK sample code
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 8a72803381850bcabc62f40152fc3bd2db5409a5
Author: Marcus Christie
AuthorDate: Thu Jun 3 11:32:56 2021 -0400
Adding JavaScript SDK sample code
---
.../{{cookiecutter.project_slug}}/home.html| 28 ++
1 file changed, 28 insertions(+)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
index 523a4e0..0913ce1 100644
---
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
+++
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
@@ -9,3 +9,31 @@
{% endblock content %}
+
+{% block scripts %}
+
+
+
+const { models, services, session, utils } = AiravataAPI;
+
+// Your code here ...
+// Example code: AiravataAPI JavaScript SDK
+// Use the JavaScript SDK to make REST API calls. For example, load the
most
+// recent 5 experiments created by the current user:
+//
+// services.ExperimentSearchService
+// .list({limit: 5,
+// [models.ExperimentSearchFields.USER_NAME.name]:
session.Session.username,
+// })
+// .then(data => {
+// const experiments = data.results;
+// // Do something with the experiments ...
+// });
+//
+// See the Gateways tutorial for more examples:
+//
<a rel="nofollow" href="https://apache-airavata-django-portal.readthedocs.io/en/latest/tutorial/gateways_tutorial/#tutorial-exercise-create-a-custom-django-app">https://apache-airavata-django-portal.readthedocs.io/en/latest/tutorial/gateways_tutorial/#tutorial-exercise-create-a-custom-django-app</a>
+// To see what is in the `AiravataAPI` JavaScript library, take a look at
+// it's index.js file:
+//
<a rel="nofollow" href="https://github.com/apache/airavata-django-portal/blob/master/django_airavata/apps/api/static/django_airavata_api/js/index.js">https://github.com/apache/airavata-django-portal/blob/master/django_airavata/apps/api/static/django_airavata_api/js/index.js</a>
+
+{% endblock scripts %}
[airavata-cookiecutter-django-app] 16/16: AIRAVATA-3649 Adding documentation link
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 6339f7047f954af9cc269f8771c031695291e411
Author: Marcus Christie
AuthorDate: Fri Oct 7 13:37:10 2022 -0400
AIRAVATA-3649 Adding documentation link
---
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py | 2 +-
.../{{cookiecutter.project_slug}}/queue_settings_calculators.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
index 3d8838f..b667001 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
@@ -26,6 +26,6 @@ class {{ cookiecutter.app_config_class_name }}(AppConfig):
# for more details for more details.
def ready(self) -> None:
-# Uncomment to register your queue settings calculators. See TODO
+# Uncomment to register your queue settings calculators.
# from {{ cookiecutter.project_slug }} import
queue_settings_calculators # noqa
pass
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
index df7ba89..8f70e10 100644
---
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
+++
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
@@ -1,7 +1,7 @@
from airavata.model.experiment.ttypes import ExperimentModel
from airavata_django_portal_sdk.decorators import queue_settings_calculator
-# See TODO for more information
+# See
https://apache-airavata-django-portal.readthedocs.io/en/latest/dev/queue_settings_calculator/
for more information
@queue_settings_calculator(
id="{{ cookiecutter.project_slug}}-my-queue-settings-calculator", name="{{
cookiecutter.project_name}}: My Queue Settings Calculator"
)
[airavata-cookiecutter-django-app] 15/16: Adding queue_settings_calculators.py boilerplate
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 3d256c54e18c822b7cb0d76dc4adb2ce0a45e1e4
Author: Marcus Christie
AuthorDate: Mon Aug 29 14:42:00 2022 -0400
Adding queue_settings_calculators.py boilerplate
---
.../{{cookiecutter.project_slug}}/apps.py | 5 +
.../queue_settings_calculators.py | 23 ++
2 files changed, 28 insertions(+)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
index b8af0d7..3d8838f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
@@ -24,3 +24,8 @@ class {{ cookiecutter.app_config_class_name }}(AppConfig):
# description of *nav* in
#
https://apache-airavata-django-portal.readthedocs.io/en/latest/dev/new_django_app/#appconfig-settings
# for more details for more details.
+
+def ready(self) -> None:
+# Uncomment to register your queue settings calculators. See TODO
+# from {{ cookiecutter.project_slug }} import
queue_settings_calculators # noqa
+pass
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
new file mode 100644
index 000..df7ba89
--- /dev/null
+++
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/queue_settings_calculators.py
@@ -0,0 +1,23 @@
+from airavata.model.experiment.ttypes import ExperimentModel
+from airavata_django_portal_sdk.decorators import queue_settings_calculator
+
+# See TODO for more information
+@queue_settings_calculator(
+id="{{ cookiecutter.project_slug}}-my-queue-settings-calculator", name="{{
cookiecutter.project_name}}: My Queue Settings Calculator"
+)
+def my_queue_settings_calculator(request, experiment_model: ExperimentModel):
+# See
https://airavata.apache.org/api-docs/master/experiment_model.html#Struct_ExperimentModel
for ExperimentModel fields
+
+# TODO: Implement logic here to determine appropriate queue settings for
experiment_model
+total_core_count = 4
+queue_name = "shared"
+node_count = 1
+walltime_limit = 30
+
+# Return a dictionary with the queue settings values
+result = {}
+result["totalCPUCount"] = total_core_count
+result["queueName"] = queue_name
+result["nodeCount"] = node_count
+result["wallTimeLimit"] = walltime_limit
+return result
[airavata-cookiecutter-django-app] 09/16: Add missing 'load static'
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 947efa76661cda2c88d00f390af882feebc6f5af
Author: Marcus Christie
AuthorDate: Fri Jun 4 14:01:28 2021 -0400
Add missing 'load static'
---
.../templates/{{cookiecutter.project_slug}}/home.html | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
index 0913ce1..5c705b2 100644
---
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
+++
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
@@ -1,5 +1,7 @@
{% extends 'base.html' %}
+{% load static %}
+
{% block content %}
[airavata-cookiecutter-django-app] 12/16: Updating "gateways tutorial" -> "custom ui tutorial"
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit aedc492e36b7b2dc0e2fc9d59bb7242c2ebca74d
Author: Marcus Christie
AuthorDate: Wed Jul 7 14:52:00 2021 -0400
Updating "gateways tutorial" -> "custom ui tutorial"
---
.../templates/{{cookiecutter.project_slug}}/home.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
index 5c705b2..5e184a2 100644
---
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
+++
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{{cookiecutter.project_slug}}/home.html
@@ -32,8 +32,8 @@
// // Do something with the experiments ...
// });
//
-// See the Gateways tutorial for more examples:
-//
https://apache-airavata-django-portal.readthedocs.io/en/latest/tutorial/gateways_tutorial/#tutorial-exercise-create-a-custom-django-app
+// See the Custom UI tutorial for more examples:
+//
https://apache-airavata-django-portal.readthedocs.io/en/latest/tutorial/custom_ui_tutorial/#tutorial-exercise-create-a-custom-django-app
// To see what is in the `AiravataAPI` JavaScript library, take a look at
// it's index.js file:
//
https://github.com/apache/airavata-django-portal/blob/master/django_airavata/apps/api/static/django_airavata_api/js/index.js
[airavata-cookiecutter-django-app] 11/16: Add documentation on how to configure settings in AppConfig class
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 4e8f6084380345790aef286aea24eed1206b2592
Author: Marcus Christie
AuthorDate: Wed Jul 7 14:50:45 2021 -0400
Add documentation on how to configure settings in AppConfig class
---
.../{{cookiecutter.project_slug}}/apps.py | 19 +++
1 file changed, 19 insertions(+)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
index 0055edc..b8af0d7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/apps.py
@@ -2,6 +2,25 @@ from django.apps import AppConfig
class {{ cookiecutter.app_config_class_name }}(AppConfig):
+# Standard Django app configuration. For more information on these
settings,
+# see
https://docs.djangoproject.com/en/2.2/ref/applications/#application-configuration
name = '{{ cookiecutter.project_slug }}'
label = name
verbose_name = "{{ cookiecutter.project_name }}"
+
+# The following are Airavata Django Portal specific custom Django app
settings
+
+# Set url_home to a namespaced URL that will be the homepage when the
custom
+# app is selected from the main menu
+url_home = "{{ cookiecutter.project_slug }}:home"
+
+# Set fa_icon_class to a FontAwesome CSS class for an icon to associate
with
+# the custom app. Find an icon class at
https://fontawesome.com/icons?d=gallery=2=regular,solid=free
+fa_icon_class = "fa-circle"
+
+# Second level navigation. Defines sub-navigation that displays on the left
+# hand side navigation bar in the Django Portal. This is optional but
+# recommended if your custom Django app has multiple entry points. See the
+# description of *nav* in
+#
https://apache-airavata-django-portal.readthedocs.io/en/latest/dev/new_django_app/#appconfig-settings
+# for more details for more details.
[airavata-cookiecutter-django-app] 04/16: AppConfig class name to end in "Config"
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 061cfff4c22f538abdfb67b0173dfef822859c8a
Author: Marcus Christie
AuthorDate: Fri May 28 15:26:06 2021 -0400
AppConfig class name to end in "Config"
---
cookiecutter.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cookiecutter.json b/cookiecutter.json
index b162761..d0f23d8 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -2,7 +2,7 @@
"project_name": "My Custom Django App",
"project_slug": "{{ cookiecutter.project_name | slugify(separator='_')}}",
"project_short_description": "Custom Django app with everything needed to be
installed in the airavata-django-portal",
- "app_config_class_name": "{{ cookiecutter.project_name | title | replace('
', '') }}",
+ "app_config_class_name": "{{ cookiecutter.project_name | title | replace('
', '') }}Config",
"version": "0.1.0",
"_copy_without_render": [
"*.html"
[airavata-cookiecutter-django-app] 14/16: Handle hyphens in project name when creating class name
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 6de79babe9739a9217208baae03011ab42a602f6
Author: Marcus Christie
AuthorDate: Thu Jan 13 16:52:02 2022 -0500
Handle hyphens in project name when creating class name
Fixes #1
---
cookiecutter.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cookiecutter.json b/cookiecutter.json
index d0f23d8..109b4cf 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -2,7 +2,7 @@
"project_name": "My Custom Django App",
"project_slug": "{{ cookiecutter.project_name | slugify(separator='_')}}",
"project_short_description": "Custom Django app with everything needed to be
installed in the airavata-django-portal",
- "app_config_class_name": "{{ cookiecutter.project_name | title | replace('
', '') }}Config",
+ "app_config_class_name": "{{ cookiecutter.project_name | slugify(separator='
') | title | replace(' ', '') }}Config",
"version": "0.1.0",
"_copy_without_render": [
"*.html"
[airavata-cookiecutter-django-app] 06/16: Adding Airavata API client example call
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 5a38df026aee619f6c9d84ca601091df911a0f03
Author: Marcus Christie
AuthorDate: Wed Jun 2 13:27:13 2021 -0400
Adding Airavata API client example call
---
{{cookiecutter.project_slug}}/setup.cfg | 1 +
.../{{cookiecutter.project_slug}}/views.py | 21 +
2 files changed, 22 insertions(+)
diff --git a/{{cookiecutter.project_slug}}/setup.cfg
b/{{cookiecutter.project_slug}}/setup.cfg
index cbe2c59..41252a4 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -9,6 +9,7 @@ packages = find:
include_package_data = True
install_requires =
django >= 2.2
+airavata-django-portal-sdk
[options.entry_points]
airavata.djangoapp =
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
index 6e47202..764354e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
@@ -1,3 +1,4 @@
+from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse, HttpResponseNotFound
from django.shortcuts import render
@@ -9,10 +10,30 @@ from airavata_django_portal_sdk import user_storage
@login_required
def home(request):
+# Example code: Airavata API client
+# Make calls to the Airavata API from your view, for example:
+#
+# experiments = request.airavata_client.searchExperiments(
+#request.authz_token, settings.GATEWAY_ID, request.user.username,
filters={},
+#limit=20, offset=0)
+#
+# The authorization token is always the first argument of Airavata API
calls
+# and is available as 'request.authz_token'. Some API methods require a
+# 'gatewayID' argument and that is available on the Django settings object
+# as 'settings.GATEWAY_ID'.
+# For documentation on other Airavata API methods, see
+#
https://docs.airavata.org/en/master/technical-documentation/airavata-api/.
+# The Airavata Django Portal uses the Airavata Python Client SDK:
+#
https://github.com/apache/airavata/tree/master/airavata-api/airavata-client-sdks/airavata-python-sdk
+
+
+# Example code: user_storage module
# In your Django views, you can make calls to the user_storage module to
manage a user's files in the gateway
+#
# user_storage.listdir(request, "") # lists the user's home directory
# user_storage.open_file(request, data_product_uri=...) # open's a file
for a given data_product_uri
# user_storage.save(request, "path/in/user/storage", file) # save a file
to a path in the user's storage
+#
# For more information as well as other user_storage functions, see
https://airavata-django-portal-sdk.readthedocs.io/en/latest/
return render(request, "{{ cookiecutter.project_slug }}/home.html", {
[airavata-cookiecutter-django-app] 10/16: Add README for static folder
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit e1c4ce975901c272ca5d95dbc604b5881338bfa1
Author: Marcus Christie
AuthorDate: Wed Jun 9 10:25:47 2021 -0400
Add README for static folder
---
.../static/{{cookiecutter.project_slug}}/README.md | 16
1 file changed, 16 insertions(+)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/{{cookiecutter.project_slug}}/README.md
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/{{cookiecutter.project_slug}}/README.md
new file mode 100644
index 000..375e970
--- /dev/null
+++
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/{{cookiecutter.project_slug}}/README.md
@@ -0,0 +1,16 @@
+# Static files folder
+
+Place your static files (JavaScript, CSS, images, etc.) in this folder. Then
+load them in your templates using the static template tag.
+
+```html
+{% raw %}
+{% load static %}
+{% endraw %}
+
+
+```
+
+See
+[Part 6 of the Django
tutorial](https://docs.djangoproject.com/en/2.2/intro/tutorial06/)
+for more information.
[airavata-cookiecutter-django-app] 05/16: user_storage module example code and links to docs
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 50ab1e0d872d93b431aef7488a0d8117f7385129
Author: Marcus Christie
AuthorDate: Fri May 28 15:26:27 2021 -0400
user_storage module example code and links to docs
---
.../{{cookiecutter.project_slug}}/views.py | 9 +
1 file changed, 9 insertions(+)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
index 45028b8..6e47202 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/views.py
@@ -2,10 +2,19 @@ from django.contrib.auth.decorators import login_required
from django.http import HttpResponse, HttpResponseNotFound
from django.shortcuts import render
+from airavata_django_portal_sdk import user_storage
+
# Create your views here.
@login_required
def home(request):
+
+# In your Django views, you can make calls to the user_storage module to
manage a user's files in the gateway
+# user_storage.listdir(request, "") # lists the user's home directory
+# user_storage.open_file(request, data_product_uri=...) # open's a file
for a given data_product_uri
+# user_storage.save(request, "path/in/user/storage", file) # save a file
to a path in the user's storage
+# For more information as well as other user_storage functions, see
https://airavata-django-portal-sdk.readthedocs.io/en/latest/
+
return render(request, "{{ cookiecutter.project_slug }}/home.html", {
'project_name': "{{ cookiecutter.project_name }}"
})
[airavata-cookiecutter-django-app] 03/16: Adding output_views directory
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit f6a9d22a5108ee15eca18a53885d6a53d561ab38
Author: Marcus Christie
AuthorDate: Fri May 28 15:25:47 2021 -0400
Adding output_views directory
---
.../{{cookiecutter.project_slug}}/output_views.py/__init__.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/output_views.py/__init__.py
b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/output_views.py/__init__.py
new file mode 100644
index 000..e69de29
[airavata-cookiecutter-django-app] 01/16: initial commit
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git
commit 3f30491240dcc71f22db336473e584e75cc02cb2
Author: Marcus Christie
AuthorDate: Thu May 27 11:51:28 2021 -0400
initial commit
---
README.md | 0
cookiecutter.json | 10 ++
{{cookiecutter.project_slug}}/.gitignore | 7 +++
{{cookiecutter.project_slug}}/MANIFEST.in | 2 ++
{{cookiecutter.project_slug}}/README.md | 15 +++
{{cookiecutter.project_slug}}/pyproject.toml | 6 ++
{{cookiecutter.project_slug}}/setup.cfg | 15 +++
{{cookiecutter.project_slug}}/setup.py| 3 +++
.../{{cookiecutter.project_slug}}/__init__.py | 0
.../{{cookiecutter.project_slug}}/admin.py| 3 +++
.../{{cookiecutter.project_slug}}/apps.py | 7 +++
.../{{cookiecutter.project_slug}}/models.py | 3 +++
.../templates/{{cookiecutter.project_slug}}/home.html | 11 +++
.../{{cookiecutter.project_slug}}/tests.py| 3 +++
.../{{cookiecutter.project_slug}}/urls.py | 9 +
.../{{cookiecutter.project_slug}}/views.py| 11 +++
16 files changed, 105 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 000..e69de29
diff --git a/cookiecutter.json b/cookiecutter.json
new file mode 100644
index 000..b162761
--- /dev/null
+++ b/cookiecutter.json
@@ -0,0 +1,10 @@
+{
+ "project_name": "My Custom Django App",
+ "project_slug": "{{ cookiecutter.project_name | slugify(separator='_')}}",
+ "project_short_description": "Custom Django app with everything needed to be
installed in the airavata-django-portal",
+ "app_config_class_name": "{{ cookiecutter.project_name | title | replace('
', '') }}",
+ "version": "0.1.0",
+ "_copy_without_render": [
+ "*.html"
+ ]
+}
diff --git a/{{cookiecutter.project_slug}}/.gitignore
b/{{cookiecutter.project_slug}}/.gitignore
new file mode 100644
index 000..4f6cd5f
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -0,0 +1,7 @@
+venv
+*.egg-info
+*.pyc
+.vscode
+build
+dist
+*.egg
diff --git a/{{cookiecutter.project_slug}}/MANIFEST.in
b/{{cookiecutter.project_slug}}/MANIFEST.in
new file mode 100644
index 000..d402524
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/MANIFEST.in
@@ -0,0 +1,2 @@
+recursive-include {{ cookiecutter.project_slug }}/static *
+recursive-include {{ cookiecutter.project_slug }}/templates *
diff --git a/{{cookiecutter.project_slug}}/README.md
b/{{cookiecutter.project_slug}}/README.md
new file mode 100644
index 000..d82e62a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -0,0 +1,15 @@
+# {{ cookiecutter.project_name }}
+
+## Getting Started
+
+1. Follow the instructions for installing the
+ [Airavata Django Portal](https://github.com/apache/airavata-django-portal)
+2. With the Airavata Django Portal virtual environment activated, clone this
+ repo and install it into the portal's virtual environment
+
+ ```
+ cd {{ cookiecutter.project_slug }}
+ pip install -e .
+ ```
+
+3. Start (or restart) the Django Portal server.
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml
b/{{cookiecutter.project_slug}}/pyproject.toml
new file mode 100644
index 000..374b58c
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+"setuptools>=42",
+"wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/{{cookiecutter.project_slug}}/setup.cfg
b/{{cookiecutter.project_slug}}/setup.cfg
new file mode 100644
index 000..cbe2c59
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -0,0 +1,15 @@
+[metadata]
+name = {{ cookiecutter.project_slug }}
+version = {{ cookiecutter.version }}
+description = {{ cookiecutter.project_short_description }}
+
+[options]
+packages = find:
+# Include data files as specified in MANIFEST.in
+include_package_data = True
+install_requires =
+django >= 2.2
+
+[options.entry_points]
+airavata.djangoapp =
+{{ cookiecutter.project_slug }} = {{ cookiecutter.project_slug }}.apps:{{
cookiecutter.app_config_class_name }}
diff --git a/{{cookiecutter.project_slug}}/setup.py
b/{{cookiecutter.project_slug}}/setup.py
new file mode 100644
index 000..b908cbe
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/setup.py
@@ -0,0 +1,3 @@
+import setuptools
+
+setuptools.setup()
diff --git
a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
b/{
[airavata-cookiecutter-django-app] branch main created (now 6339f70)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git at 6339f70 AIRAVATA-3649 Adding documentation link This branch includes the following new commits: new 3f30491 initial commit new 16a98a8 Updating README with usage instructions new f6a9d22 Adding output_views directory new 061cfff AppConfig class name to end in "Config" new 50ab1e0 user_storage module example code and links to docs new 5a38df0 Adding Airavata API client example call new 8a72803 Adding JavaScript SDK sample code new e9ce781 Fixing output_views module new 947efa7 Add missing 'load static' new e1c4ce9 Add README for static folder new 4e8f608 Add documentation on how to configure settings in AppConfig class new aedc492 Updating "gateways tutorial" -> "custom ui tutorial" new 215d573 version upgrade new 6de79ba Handle hyphens in project name when creating class name new 3d256c5 Adding queue_settings_calculators.py boilerplate new 6339f70 AIRAVATA-3649 Adding documentation link The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[airavata-cookiecutter-django-app] 02/16: Updating README with usage instructions
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cookiecutter-django-app.git commit 16a98a855e7d1a9e5af1f1ac67d2fa939f95989b Author: Marcus Christie AuthorDate: Thu May 27 11:56:36 2021 -0400 Updating README with usage instructions --- README.md | 15 +++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index e69de29..e484125 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,15 @@ +# Custom Airavata Django App Cookiecutter + +## Quickstart + +Install the latest Cookiecutter if you haven't installed it yet: + +pip install --user -U cookiecutter + +Generate a custom Django app that works with the +[Airavata Django Portal](https://github.com/apache/airavata-django-portal) + +cookiecutter https://github.com/machristie/cookiecutter-airavata-django-app.git + +Then see the README.md in the generated project folder for instructions on how +to install your custom Django app into an Airavata Django Portal instance.
[airavata-django-portal] 01/02: Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 13e2d6f6be0115a88b532bfc580ad9243ecb6f9f
Merge: f1fb9f19 186a8c18
Author: Marcus Christie
AuthorDate: Tue Sep 26 10:22:09 2023 -0400
Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11
.github/workflows/build-and-test.yaml | 2 +-
.readthedocs.yaml | 8 +-
README.md | 3 +
django_airavata/apps/auth/package.json | 9 +-
django_airavata/apps/auth/yarn.lock| 501 -
.../commands/fix_page_revision_content_type.py | 23 +
.../base/management/commands/load_cms_data.py | 5 +-
.../management/commands/load_cybergateway_data.py | 25 -
.../management/commands/load_default_gateway.py| 25 -
.../management/commands/load_hpcgateway_data.py| 25 -
.../commands/load_nanoconfinement_data.py | 25 -
.../base/management/commands/load_osu_data.py | 25 -
.../base/management/commands/load_phasta_data.py | 25 -
.../base/management/commands/load_seagrid_data.py | 25 -
.../management/commands/load_searching_sra_data.py | 25 -
.../base/management/commands/load_simccs_data.py | 25 -
.../management/commands/load_simvascular_data.py | 25 -
.../base/management/commands/load_siu_data.py | 25 -
.../management/commands/load_south_dakota_data.py | 25 -
.../base/management/commands/set_wagtail_site.py | 6 +-
20 files changed, 539 insertions(+), 318 deletions(-)
diff --cc .github/workflows/build-and-test.yaml
index 468cc19e,9e3cc4e3..999c05d7
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@@ -19,10 -19,10 +19,10 @@@
#
name: Build and Test
- on: [push]
+ on: [push, pull_request]
jobs:
build-js:
-runs-on: ubuntu-20.04
+runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Use Node.js as specified in .nvmrc
diff --cc
django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
index ,5cd2d926..3a47aafb
mode 00,100644..100644
---
a/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
+++
b/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
@@@ -1,0 -1,23 +1,23 @@@
+
+ import json
+
+ from django.core.management.base import BaseCommand
-from wagtail.core.models import PageRevision
++from wagtail.models import PageRevision
+
+
+ class Command(BaseCommand):
+ help = "Fix the content_type id in the page revisions content_type which
may be correct due to being imported from a different Django instance"
+
+ def handle(self, **options):
+ fixed_count = 0
+ for pr in PageRevision.objects.all():
+ content_json = json.loads(pr.content_json)
+ if content_json['content_type'] != pr.page.content_type.id:
+ content_json['content_type'] = pr.page.content_type.id
+ pr.content_json = json.dumps(content_json)
+ pr.save()
+ fixed_count = fixed_count + 1
+ if fixed_count > 0:
+ self.stdout.write(
+ self.style.SUCCESS(f"Successfully fixed the content type of
{fixed_count} page revisions")
+ )
[airavata-django-portal] branch AIRAVATA-3698--Add-support-for-Python-3.11 updated (f1fb9f19 -> e88ae808)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from f1fb9f19 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 add e456c6fe Run build and test GA on PRs add bd0c4d0c README Change. Added Windows command note. add 4c111089 Added webpack 5.0.0 dependency needed for webpack-bundle-tracker add e7685cfb Reverting changes that were not needed. Add Windows note to REDME add 57d5ceef retrigger checks add 42828901 Merge pull request #185 from jcford2213/master add 18cd1ab1 Adding build.os to .readthedocs.yaml add dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json add 75ff2835 Merge pull request #186 from apache/AIRAVATA-3698-fix-page-revision-content-type add 186a8c18 Merge branch 'master' into develop new 13e2d6f6 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 new e88ae808 AIRAVATA-3698 Fix new default theme page revisions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build-and-test.yaml |2 +- .readthedocs.yaml |8 +- README.md |3 + django_airavata/apps/auth/package.json |9 +- django_airavata/apps/auth/yarn.lock| 501 +- .../base/fixtures/new_default_theme.json | 6549 ++-- .../commands/fix_page_revision_content_type.py | 18 + .../base/management/commands/load_cms_data.py |5 +- .../management/commands/load_cybergateway_data.py | 25 - .../management/commands/load_default_gateway.py| 25 - .../management/commands/load_hpcgateway_data.py| 25 - .../commands/load_nanoconfinement_data.py | 25 - .../base/management/commands/load_osu_data.py | 25 - .../base/management/commands/load_phasta_data.py | 25 - .../base/management/commands/load_seagrid_data.py | 25 - .../management/commands/load_searching_sra_data.py | 25 - .../base/management/commands/load_simccs_data.py | 25 - .../management/commands/load_simvascular_data.py | 25 - .../base/management/commands/load_siu_data.py | 25 - .../management/commands/load_south_dakota_data.py | 25 - .../base/management/commands/set_wagtail_site.py |6 +- 21 files changed, 6614 insertions(+), 787 deletions(-) create mode 100644 django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_default_gateway.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_osu_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_phasta_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simccs_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_siu_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py
[airavata-django-portal] 01/01: Merge branch 'master' into develop
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git commit 186a8c18da3480ffbcc4dd7a9811c58d82caa8ce Merge: 17d744dd 75ff2835 Author: Marcus Christie AuthorDate: Tue Sep 26 10:11:06 2023 -0400 Merge branch 'master' into develop .github/workflows/build-and-test.yaml | 2 +- .readthedocs.yaml | 8 +- README.md | 3 + django_airavata/apps/auth/package.json | 9 +- django_airavata/apps/auth/yarn.lock| 501 - .../commands/fix_page_revision_content_type.py | 23 + .../base/management/commands/load_cms_data.py | 5 +- .../management/commands/load_cybergateway_data.py | 25 - .../management/commands/load_default_gateway.py| 25 - .../management/commands/load_hpcgateway_data.py| 25 - .../commands/load_nanoconfinement_data.py | 25 - .../base/management/commands/load_osu_data.py | 25 - .../base/management/commands/load_phasta_data.py | 25 - .../base/management/commands/load_seagrid_data.py | 25 - .../management/commands/load_searching_sra_data.py | 25 - .../base/management/commands/load_simccs_data.py | 25 - .../management/commands/load_simvascular_data.py | 25 - .../base/management/commands/load_siu_data.py | 25 - .../management/commands/load_south_dakota_data.py | 25 - .../base/management/commands/set_wagtail_site.py | 6 +- requirements-dev.txt | Bin 237 -> 506 bytes 21 files changed, 539 insertions(+), 318 deletions(-)
[airavata-django-portal] branch develop updated (17d744dd -> 186a8c18)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from 17d744dd Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop add e456c6fe Run build and test GA on PRs add bd0c4d0c README Change. Added Windows command note. add 4c111089 Added webpack 5.0.0 dependency needed for webpack-bundle-tracker add e7685cfb Reverting changes that were not needed. Add Windows note to REDME add 57d5ceef retrigger checks add 42828901 Merge pull request #185 from jcford2213/master add 18cd1ab1 Adding build.os to .readthedocs.yaml add dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json add 75ff2835 Merge pull request #186 from apache/AIRAVATA-3698-fix-page-revision-content-type new 186a8c18 Merge branch 'master' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/build-and-test.yaml | 2 +- .readthedocs.yaml | 8 +- README.md | 3 + django_airavata/apps/auth/package.json | 9 +- django_airavata/apps/auth/yarn.lock| 501 - .../commands/fix_page_revision_content_type.py | 23 + .../base/management/commands/load_cms_data.py | 5 +- .../management/commands/load_cybergateway_data.py | 25 - .../management/commands/load_default_gateway.py| 25 - .../management/commands/load_hpcgateway_data.py| 25 - .../commands/load_nanoconfinement_data.py | 25 - .../base/management/commands/load_osu_data.py | 25 - .../base/management/commands/load_phasta_data.py | 25 - .../base/management/commands/load_seagrid_data.py | 25 - .../management/commands/load_searching_sra_data.py | 25 - .../base/management/commands/load_simccs_data.py | 25 - .../management/commands/load_simvascular_data.py | 25 - .../base/management/commands/load_siu_data.py | 25 - .../management/commands/load_south_dakota_data.py | 25 - .../base/management/commands/set_wagtail_site.py | 6 +- requirements-dev.txt | Bin 237 -> 506 bytes 21 files changed, 539 insertions(+), 318 deletions(-) create mode 100644 django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_default_gateway.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_osu_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_phasta_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simccs_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_siu_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py
[airavata-django-portal] branch AIRAVATA-3698-fix-page-revision-content-type deleted (was dd41406b)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3698-fix-page-revision-content-type in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git was dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[airavata-django-portal] branch master updated (18cd1ab1 -> 75ff2835)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from 18cd1ab1 Adding build.os to .readthedocs.yaml add dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json new 75ff2835 Merge pull request #186 from apache/AIRAVATA-3698-fix-page-revision-content-type The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../commands/fix_page_revision_content_type.py | 23 .../base/management/commands/load_cms_data.py | 5 - .../management/commands/load_cybergateway_data.py | 25 -- .../management/commands/load_default_gateway.py| 25 -- .../management/commands/load_hpcgateway_data.py| 25 -- .../commands/load_nanoconfinement_data.py | 25 -- .../base/management/commands/load_osu_data.py | 25 -- .../base/management/commands/load_phasta_data.py | 25 -- .../base/management/commands/load_seagrid_data.py | 25 -- .../management/commands/load_searching_sra_data.py | 25 -- .../base/management/commands/load_simccs_data.py | 25 -- .../management/commands/load_simvascular_data.py | 25 -- .../base/management/commands/load_siu_data.py | 25 -- .../management/commands/load_south_dakota_data.py | 25 -- .../base/management/commands/set_wagtail_site.py | 6 +++--- 15 files changed, 30 insertions(+), 304 deletions(-) create mode 100644 django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_default_gateway.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_osu_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_phasta_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simccs_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_siu_data.py delete mode 100644 django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py
[airavata-django-portal] 01/01: Merge pull request #186 from apache/AIRAVATA-3698-fix-page-revision-content-type
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git commit 75ff2835a078a515991dc48082fc19fdd9a72ae5 Merge: 18cd1ab1 dd41406b Author: Marcus Christie AuthorDate: Mon Sep 25 16:13:45 2023 -0400 Merge pull request #186 from apache/AIRAVATA-3698-fix-page-revision-content-type AIRAVATA-3698 management command to fix up the content type id in page revision json .../commands/fix_page_revision_content_type.py | 23 .../base/management/commands/load_cms_data.py | 5 - .../management/commands/load_cybergateway_data.py | 25 -- .../management/commands/load_default_gateway.py| 25 -- .../management/commands/load_hpcgateway_data.py| 25 -- .../commands/load_nanoconfinement_data.py | 25 -- .../base/management/commands/load_osu_data.py | 25 -- .../base/management/commands/load_phasta_data.py | 25 -- .../base/management/commands/load_seagrid_data.py | 25 -- .../management/commands/load_searching_sra_data.py | 25 -- .../base/management/commands/load_simccs_data.py | 25 -- .../management/commands/load_simvascular_data.py | 25 -- .../base/management/commands/load_siu_data.py | 25 -- .../management/commands/load_south_dakota_data.py | 25 -- .../base/management/commands/set_wagtail_site.py | 6 +++--- 15 files changed, 30 insertions(+), 304 deletions(-)
[airavata-django-portal] 01/01: AIRAVATA-3698 management command to fix up the content type id in page revision json
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch
AIRAVATA-3698-fix-page-revision-content-type
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit dd41406b112c7a6d5d2af74901f6de291b733ade
Author: Marcus Christie
AuthorDate: Mon Sep 25 13:46:32 2023 -0400
AIRAVATA-3698 management command to fix up the content type id in page
revision json
---
.../commands/fix_page_revision_content_type.py | 23
.../base/management/commands/load_cms_data.py | 5 -
.../management/commands/load_cybergateway_data.py | 25 --
.../management/commands/load_default_gateway.py| 25 --
.../management/commands/load_hpcgateway_data.py| 25 --
.../commands/load_nanoconfinement_data.py | 25 --
.../base/management/commands/load_osu_data.py | 25 --
.../base/management/commands/load_phasta_data.py | 25 --
.../base/management/commands/load_seagrid_data.py | 25 --
.../management/commands/load_searching_sra_data.py | 25 --
.../base/management/commands/load_simccs_data.py | 25 --
.../management/commands/load_simvascular_data.py | 25 --
.../base/management/commands/load_siu_data.py | 25 --
.../management/commands/load_south_dakota_data.py | 25 --
.../base/management/commands/set_wagtail_site.py | 6 +++---
15 files changed, 30 insertions(+), 304 deletions(-)
diff --git
a/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
b/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
new file mode 100644
index ..5cd2d926
--- /dev/null
+++
b/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py
@@ -0,0 +1,23 @@
+
+import json
+
+from django.core.management.base import BaseCommand
+from wagtail.core.models import PageRevision
+
+
+class Command(BaseCommand):
+help = "Fix the content_type id in the page revisions content_type which
may be correct due to being imported from a different Django instance"
+
+def handle(self, **options):
+fixed_count = 0
+for pr in PageRevision.objects.all():
+content_json = json.loads(pr.content_json)
+if content_json['content_type'] != pr.page.content_type.id:
+content_json['content_type'] = pr.page.content_type.id
+pr.content_json = json.dumps(content_json)
+pr.save()
+fixed_count = fixed_count + 1
+if fixed_count > 0:
+self.stdout.write(
+self.style.SUCCESS(f"Successfully fixed the content type of
{fixed_count} page revisions")
+)
diff --git
a/django_airavata/wagtailapps/base/management/commands/load_cms_data.py
b/django_airavata/wagtailapps/base/management/commands/load_cms_data.py
index fa8e1171..57c63fbc 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_cms_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_cms_data.py
@@ -35,5 +35,8 @@ class Command(BaseCommand):
call_command('loaddata', fixture_file, verbosity=0)
call_command('set_wagtail_site')
+call_command('fix_page_revision_content_type')
-print(f"{options['filename']} is loaded successfully!")
+self.stdout.write(
+self.style.SUCCESS(f"{options['filename']} is loaded
successfully!")
+)
diff --git
a/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
b/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
deleted file mode 100644
index bab1d3af..
---
a/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import os
-
-from django.conf import settings
-from django.core.management import call_command
-from django.core.management.base import BaseCommand
-from wagtail.core.models import Page, Site
-
-
-class Command(BaseCommand):
-def handle(self, **options):
-fixtures_dir = os.path.join(
-settings.BASE_DIR, 'django_airavata', 'wagtailapps', 'base',
'fixtures')
-fixture_file = os.path.join(fixtures_dir, 'cybergateway.json')
-
-# Wagtail creates default Site and Page instances during install, but
we already have
-# them in the data load. Remove the auto-generated ones.
-if Site.objects.filter(hostname='localhost').exists():
-Site.objects.get(hostname='localhost').delete()
-if Page.objects.filter(title='Welcome to your new Wagtail
site!').exists():
-Page.objects.get(
-title='Welcome to your new Wagta
[airavata-django-portal] branch AIRAVATA-3698-fix-page-revision-content-type created (now dd41406b)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3698-fix-page-revision-content-type in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git at dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json This branch includes the following new commits: new dd41406b AIRAVATA-3698 management command to fix up the content type id in page revision json The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[airavata] branch master updated (5a22abf9f3 -> b3d68364c3)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git from 5a22abf9f3 Removing unused code add 6fcefb2c47 AIRAVATA-3697 Switching to column level utf8 character set add 71bc7c3d30 AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess new b3d68364c3 Merge branch 'AIRAVATA-3697' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../simccs/files/django-ssl-vhost.conf.j2 | 12 ++-- .../host_vars/dreg/files/django-ssl-vhost.conf.j2 | 12 ++-- .../simccs/files/django-ssl-vhost.conf.j2 | 12 ++-- .../simccs/files/django-ssl-vhost.conf.j2 | 12 ++-- .../roles/django/templates/django-vhost.conf.j2| 12 ++-- .../init/05-replica-catalog-migrations.sql | 32 - .../src/main/resources/replicacatalog-mysql.sql| 22 +++ .../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +- 8 files changed, 86 insertions(+), 61 deletions(-)
[airavata] 01/01: Merge branch 'AIRAVATA-3697'
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git commit b3d68364c323bd03af0f435c54b6039a3743f148 Merge: 5a22abf9f3 71bc7c3d30 Author: Marcus Christie AuthorDate: Thu Sep 21 10:17:22 2023 -0400 Merge branch 'AIRAVATA-3697' .../simccs/files/django-ssl-vhost.conf.j2 | 12 ++-- .../host_vars/dreg/files/django-ssl-vhost.conf.j2 | 12 ++-- .../simccs/files/django-ssl-vhost.conf.j2 | 12 ++-- .../simccs/files/django-ssl-vhost.conf.j2 | 12 ++-- .../roles/django/templates/django-vhost.conf.j2| 12 ++-- .../init/05-replica-catalog-migrations.sql | 32 - .../src/main/resources/replicacatalog-mysql.sql| 22 +++ .../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +- 8 files changed, 86 insertions(+), 61 deletions(-)
[airavata] branch AIRAVATA-3697 updated: AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3697
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/AIRAVATA-3697 by this push:
new 71bc7c3d30 AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess
71bc7c3d30 is described below
commit 71bc7c3d30e34daef0b308de15092f00cfe821cb
Author: Marcus Christie
AuthorDate: Tue Sep 19 09:54:06 2023 -0400
AIRAVATA-3697 Set lang and locale on WSGIDaemonProcess
Copying this change over from the template to the per gateway override
files.
---
.../develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 12 ++--
.../production/host_vars/dreg/files/django-ssl-vhost.conf.j2 | 12 ++--
.../host_vars/simccs/files/django-ssl-vhost.conf.j2 | 12 ++--
.../staging/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 12 ++--
.../ansible/roles/django/templates/django-vhost.conf.j2 | 12 ++--
5 files changed, 50 insertions(+), 10 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 2e482d25b2..da87e8c448 100644
---
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -43,7 +43,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver;
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver;
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -68,7 +68,15 @@
{% endfor %}
-WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
+WSGIDaemonProcess {{ vhost_servername }} \
+display-name=%{GROUP} \
+python-home={{ doc_root_dir }}/venv \
+python-path={{ doc_root_dir }}/airavata-django-portal \
+processes={{ django_wsgi_processes }} \
+user={{ user }} \
+group={{ group }} \
+lang=en_US.UTF-8 \
+locale=en_US.UTF-8
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
index 60606670c7..343f74686b 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
@@ -29,7 +29,7 @@
ServerName {{ vhost_servername }}
-
+
## Redirect all http traffic to https
RewriteEngine On
RewriteCond %{HTTPS} off
@@ -66,7 +66,15 @@
{% endfor %}
-WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
+WSGIDaemonProcess {{ vhost_servername }} \
+display-name=%{GROUP} \
+python-home={{ doc_root_dir }}/venv \
+python-path={{ doc_root_dir }}/airavata-django-portal \
+processes={{ django_wsgi_processes }} \
+user={{ user }} \
+group={{ group }} \
+lang=en_US.UTF-8 \
+locale=en_US.UTF-8
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 6090cd119f..0c4a8614a7 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -43,7 +43,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver;
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver;
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -60,7 +60,15 @@
Require all granted
-WSGIDaemonProcess {{ vhost_servername }} display-name=%
[airavata] 01/01: Merge branch 'master' into develop
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git commit d996abb88edbc03ca1f8432b39db9341ea7b19fa Merge: 643f984bac 5a22abf9f3 Author: Marcus Christie AuthorDate: Tue Sep 12 16:53:54 2023 -0400 Merge branch 'master' into develop .../host_vars/molecular-dynamics/vars.yml | 7 +- .../production/host_vars/pace-gatech/vars.yml | 2 + .../scigap/production/host_vars/simccs/vars.yml| 3 +- .../scigap/production/host_vars/smiles/vars.yml| 7 +- .../django/templates/django-ssl-vhost.conf.j2 | 4 +- .../impl/ssh/SSHCredentialGenerator.java | 101 - 6 files changed, 12 insertions(+), 112 deletions(-)
[airavata] branch develop updated (643f984bac -> d996abb88e)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git from 643f984bac Merge pull request #431 from SauravKumarJhaNITW/develop add 1caad3ecc2 Ansible: add gzip/cache support for svg add fbc9e7cc7b Ansible: switch to manual install/update of smiles django app add 56ece454e5 Ansible: load cilogon userinfo and display to admins add 1d9710d8bd Ansible: enable tus and increase upload limit in md.cybershuttle.org add ee036e22cf Adding Carbonate to the SimCCS maptool as default resource and Jun Wang new PI to get notification add 5a22abf9f3 Removing unused code new d996abb88e Merge branch 'master' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../host_vars/molecular-dynamics/vars.yml | 7 +- .../production/host_vars/pace-gatech/vars.yml | 2 + .../scigap/production/host_vars/simccs/vars.yml| 3 +- .../scigap/production/host_vars/smiles/vars.yml| 7 +- .../django/templates/django-ssl-vhost.conf.j2 | 4 +- .../impl/ssh/SSHCredentialGenerator.java | 101 - 6 files changed, 12 insertions(+), 112 deletions(-) delete mode 100644 modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialGenerator.java
[airavata] branch master updated: Removing unused code
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 5a22abf9f3 Removing unused code
5a22abf9f3 is described below
commit 5a22abf9f3a3a12e7cf79970df6b6f0715a61319
Author: Marcus Christie
AuthorDate: Tue Sep 12 16:52:32 2023 -0400
Removing unused code
---
.../impl/ssh/SSHCredentialGenerator.java | 101 -
1 file changed, 101 deletions(-)
diff --git
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialGenerator.java
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialGenerator.java
deleted file mode 100644
index fde079529b..00
---
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialGenerator.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.airavata.credential.store.credential.impl.ssh;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.apache.airavata.credential.store.store.CredentialStoreException;
-import org.apache.airavata.credential.store.store.impl.SSHCredentialWriter;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.KeyPair;
-
-/**
- * A class which generates an SSH credential
- */
-public class SSHCredentialGenerator {
-
- private static Logger logger =
LoggerFactory.getLogger(SSHCredentialWriter.class);
-
- /**
-*
-* @return a SSH Credential generated and encrypted using a randomly
generated password
-* @throws CredentialStoreException
-*/
- public SSHCredential generateCredential(String tokenId) throws
CredentialStoreException {
-JSch jsch=new JSch();
-try {
-KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA);
-File file;
-
- file = File.createTempFile("id_rsa", "");
-
-String fileName = file.getAbsolutePath();
-
-String password = generateRandomString();
-// We are encrypting the private key with the hash of
(tokenId+password).
-// Any client which wants to use this private key will also
generate a hash and then use it to decrypt the key.
-kpair.writePrivateKey(fileName,password.getBytes());
-kpair.writePublicKey(fileName + ".pub" , "");
-kpair.dispose();
-byte[] priKey = FileUtils.readFileToByteArray(new File(fileName));
-byte[] pubKey = FileUtils.readFileToByteArray(new File(fileName +
".pub"));
-SSHCredential sshCredential = new SSHCredential();
-sshCredential.setPrivateKey(priKey);
-sshCredential.setPublicKey(pubKey);
-sshCredential.setPassphrase(password);
-return sshCredential;
- } catch (IOException e) {
- logger.error("IO Exception when creating SSH credential
",e);
- throw new CredentialStoreException("Unable to generate
SSH Credential", e);
- } catch (JSchException e) {
- logger.error("JSch SSH credential creation exception
",e);
- throw new CredentialStoreException("Unable to generate
SSH Credential. JSch exception ", e);
- }
- }
-
- private String generateHash(String tokenId, String password) {
-
[airavata-data-catalog] branch main updated: Adding Lahiru as a collaborator
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git The following commit(s) were added to refs/heads/main by this push: new e32f7b0 Adding Lahiru as a collaborator e32f7b0 is described below commit e32f7b02a1347a89c2d24e6564aa88c69697c88c Author: Marcus Christie AuthorDate: Tue Sep 5 15:37:21 2023 -0400 Adding Lahiru as a collaborator --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 23a7f53..17eb9c1 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -35,6 +35,8 @@ github: - metadata - schema - search + collaborators: +- lahirujayathilake features: wiki: false
[airavata-data-catalog] branch machristie/issue8 deleted (was eaf7692)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch machristie/issue8 in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git was eaf7692 Fix path to new changelog The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[airavata-data-catalog] branch main updated (ca3f26b -> 61ef2c5)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git from ca3f26b Merge pull request #41 from apache/executable-jar add 3432524 Integrate liquibase for creating the initial db schema #8 add f7eb2be Adding custos schema to liquibase migration script add 8e20b8c Change a couple columns to be not-nullable #8 add eaf7692 Fix path to new changelog new 61ef2c5 Merge pull request #42 from apache/machristie/issue8 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../api/model/MetadataSchemaFieldEntity.java | 1 + .../custos-sharing/src/main/resources/schema.sql | 24 - .../server/service/liquibase.properties| 13 + data-catalog-api/server/service/pom.xml| 4 + .../src/main/resources/application.properties | 9 +- .../2023/08/2023-08-31-init-changelog.xml | 644 + .../2023/08/2023-08-31-init-custos-changelog.xml | 184 ++ .../db/changelog/2023/09/2023-09-01-changelog.xml | 12 + .../resources/db/changelog/db.changelog-master.xml | 9 + .../sharing/simple/SimpleUserSharingEntity.java| 2 +- .../simple-sharing/src/main/resources/schema.sql | 80 --- docker-compose.yml | 2 + 12 files changed, 873 insertions(+), 111 deletions(-) delete mode 100644 data-catalog-api/server/custos-sharing/src/main/resources/schema.sql create mode 100644 data-catalog-api/server/service/liquibase.properties create mode 100644 data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-changelog.xml create mode 100644 data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-custos-changelog.xml create mode 100644 data-catalog-api/server/service/src/main/resources/db/changelog/2023/09/2023-09-01-changelog.xml create mode 100644 data-catalog-api/server/service/src/main/resources/db/changelog/db.changelog-master.xml delete mode 100644 data-catalog-api/server/simple-sharing/src/main/resources/schema.sql
[airavata-data-catalog] 01/01: Merge pull request #42 from apache/machristie/issue8
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git commit 61ef2c5a8f8cdfbc16a06cbdee6fe7994ef1c65d Merge: ca3f26b eaf7692 Author: Marcus Christie AuthorDate: Tue Sep 5 11:28:43 2023 -0400 Merge pull request #42 from apache/machristie/issue8 Integrate liquibase to run db init scripts and generate schema for JPA entities .../api/model/MetadataSchemaFieldEntity.java | 1 + .../custos-sharing/src/main/resources/schema.sql | 24 - .../server/service/liquibase.properties| 13 + data-catalog-api/server/service/pom.xml| 4 + .../src/main/resources/application.properties | 9 +- .../2023/08/2023-08-31-init-changelog.xml | 644 + .../2023/08/2023-08-31-init-custos-changelog.xml | 184 ++ .../db/changelog/2023/09/2023-09-01-changelog.xml | 12 + .../resources/db/changelog/db.changelog-master.xml | 9 + .../sharing/simple/SimpleUserSharingEntity.java| 2 +- .../simple-sharing/src/main/resources/schema.sql | 80 --- docker-compose.yml | 2 + 12 files changed, 873 insertions(+), 111 deletions(-)
[airavata-data-catalog] branch machristie/issue8 updated (8e20b8c -> eaf7692)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch machristie/issue8 in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git from 8e20b8c Change a couple columns to be not-nullable #8 add eaf7692 Fix path to new changelog No new revisions were added by this update. Summary of changes: .../main/resources/db/changelog/2023/09/2023-09-01-changelog.xml | 7 --- .../src/main/resources/db/changelog/db.changelog-master.xml| 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
[airavata-data-catalog] branch machristie/issue8 created (now 8e20b8c)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch machristie/issue8 in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git at 8e20b8c Change a couple columns to be not-nullable #8 This branch includes the following new commits: new 3432524 Integrate liquibase for creating the initial db schema #8 new f7eb2be Adding custos schema to liquibase migration script new 8e20b8c Change a couple columns to be not-nullable #8 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[airavata-data-catalog] 02/03: Adding custos schema to liquibase migration script
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch machristie/issue8
in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
commit f7eb2bef800fe4aee73281281180e9fd37df843e
Author: Marcus Christie
AuthorDate: Fri Sep 1 17:19:45 2023 -0400
Adding custos schema to liquibase migration script
---
.../custos-sharing/src/main/resources/schema.sql | 24 ---
.../server/service/liquibase.properties| 8 +
.../src/main/resources/application.properties | 5 -
.../2023/08/2023-08-31-init-custos-changelog.xml | 184 +
.../resources/db/changelog/db.changelog-master.xml | 1 +
5 files changed, 193 insertions(+), 29 deletions(-)
diff --git
a/data-catalog-api/server/custos-sharing/src/main/resources/schema.sql
b/data-catalog-api/server/custos-sharing/src/main/resources/schema.sql
deleted file mode 100644
index cfb1aa3..000
--- a/data-catalog-api/server/custos-sharing/src/main/resources/schema.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- TODO: get this into a database migration script
-CREATE
-OR REPLACE VIEW custos_data_product_sharing_view AS
-SELECT
-dp.data_product_id AS data_product_id,
-u.user_id AS user_id,
-CASE
-WHEN s.permission_type_id = concat('OWNER', '@', s.tenant_id) THEN 0
-WHEN s.permission_type_id = concat('READ', '@', s.tenant_id) THEN 1
-WHEN s.permission_type_id = concat('READ_METADATA', '@', s.tenant_id)
THEN 2
-WHEN s.permission_type_id = concat('WRITE', '@', s.tenant_id) THEN 3
-WHEN s.permission_type_id = concat('WRITE_METADATA', '@', s.tenant_id)
THEN 4
-WHEN s.permission_type_id = concat('MANAGE_SHARING', '@', s.tenant_id)
THEN 5
-ELSE NULL
-END AS permission_id
-FROM
-sharing s
-INNER JOIN tenant t ON t.external_id = s.tenant_id
-INNER JOIN user_table u ON u.external_id = s.associating_id
-AND u.tenant_id = t.tenant_id
-INNER JOIN data_product dp ON concat(dp.external_id, '@', t.external_id) =
s.entity_id
-WHERE
--- TODO: add group support
-s.associating_id_type = 'user';
diff --git a/data-catalog-api/server/service/liquibase.properties
b/data-catalog-api/server/service/liquibase.properties
new file mode 100644
index 000..1f72d49
--- /dev/null
+++ b/data-catalog-api/server/service/liquibase.properties
@@ -0,0 +1,8 @@
+# url: jdbc:postgresql://localhost:5432/data_catalog
+url: offline:postgresql?snapshot=snapshot.json
+username: postgres
+password: example
+# classpath: mysql-connector-java-8.0.27.jar
+referenceUrl: jdbc:postgresql://localhost:5432/data_catalog
+referenceUsername: postgres
+referencePassword: example
diff --git
a/data-catalog-api/server/service/src/main/resources/application.properties
b/data-catalog-api/server/service/src/main/resources/application.properties
index 8a73c4f..21051db 100644
--- a/data-catalog-api/server/service/src/main/resources/application.properties
+++ b/data-catalog-api/server/service/src/main/resources/application.properties
@@ -6,11 +6,6 @@ spring.jpa.hibernate.ddl-auto=validate
spring.jpa.show-sql=true
spring.liquibase.change-log=classpath:/db/changelog/db.changelog-master.xml
-# Run schema.sql after schema creation performed by Hibernate
-#
https://docs.spring.io/spring-boot/docs/current/reference/html/howto.html#howto.data-initialization.using-basic-sql-scripts
-# spring.jpa.defer-datasource-initialization=true
-# spring.sql.init.mode=always
-
# Sharing configuration
## Simple Sharing
diff --git
a/data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-custos-changelog.xml
b/data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-custos-changelog.xml
new file mode 100644
index 000..1e0c67a
--- /dev/null
+++
b/data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-custos-changelog.xml
@@ -0,0 +1,184 @@
+
+http://www.liquibase.org/xml/ns/dbchangelog;
+xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext;
+xmlns:pro="http://www.liquibase.org/xml/ns/pro;
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
http://www.liquibase.org/xml/ns/pro
http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd
http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/db
[airavata-data-catalog] 01/03: Integrate liquibase for creating the initial db schema #8
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch machristie/issue8 in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git commit 34325247e2170c06a99ab8d7a69bddf59fb7e7be Author: Marcus Christie AuthorDate: Fri Sep 1 17:19:00 2023 -0400 Integrate liquibase for creating the initial db schema #8 --- data-catalog-api/server/service/pom.xml| 4 + .../src/main/resources/application.properties | 8 +- .../2023/08/2023-08-31-init-changelog.xml | 644 + .../resources/db/changelog/db.changelog-master.xml | 7 + .../simple-sharing/src/main/resources/schema.sql | 80 --- docker-compose.yml | 2 + 6 files changed, 662 insertions(+), 83 deletions(-) diff --git a/data-catalog-api/server/service/pom.xml b/data-catalog-api/server/service/pom.xml index c08be08..e83a61c 100644 --- a/data-catalog-api/server/service/pom.xml +++ b/data-catalog-api/server/service/pom.xml @@ -58,6 +58,10 @@ + +org.liquibase +liquibase-core + diff --git a/data-catalog-api/server/service/src/main/resources/application.properties b/data-catalog-api/server/service/src/main/resources/application.properties index 9495cd5..8a73c4f 100644 --- a/data-catalog-api/server/service/src/main/resources/application.properties +++ b/data-catalog-api/server/service/src/main/resources/application.properties @@ -1,13 +1,15 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/data_catalog spring.datasource.username=postgres spring.datasource.password=example -spring.jpa.hibernate.ddl-auto=update +# spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=validate spring.jpa.show-sql=true +spring.liquibase.change-log=classpath:/db/changelog/db.changelog-master.xml # Run schema.sql after schema creation performed by Hibernate # https://docs.spring.io/spring-boot/docs/current/reference/html/howto.html#howto.data-initialization.using-basic-sql-scripts -spring.jpa.defer-datasource-initialization=true -spring.sql.init.mode=always +# spring.jpa.defer-datasource-initialization=true +# spring.sql.init.mode=always # Sharing configuration diff --git a/data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-changelog.xml b/data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-changelog.xml new file mode 100644 index 000..3bf24ef --- /dev/null +++ b/data-catalog-api/server/service/src/main/resources/db/changelog/2023/08/2023-08-31-init-changelog.xml @@ -0,0 +1,644 @@ + +http://www.liquibase.org/xml/ns/dbchangelog; +xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext; +xmlns:pro="http://www.liquibase.org/xml/ns/pro; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/db
[airavata-data-catalog] 03/03: Change a couple columns to be not-nullable #8
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch machristie/issue8
in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
commit 8e20b8ca146c8e0f0f6ebefb9bb5a5edd0cc6f99
Author: Marcus Christie
AuthorDate: Fri Sep 1 17:42:43 2023 -0400
Change a couple columns to be not-nullable #8
---
.../datacatalog/api/model/MetadataSchemaFieldEntity.java | 1 +
data-catalog-api/server/service/liquibase.properties | 11 ---
.../resources/db/changelog/2023/09/2023-09-01-changelog.xml | 11 +++
.../src/main/resources/db/changelog/db.changelog-master.xml | 1 +
.../api/model/sharing/simple/SimpleUserSharingEntity.java | 2 +-
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git
a/data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/model/MetadataSchemaFieldEntity.java
b/data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/model/MetadataSchemaFieldEntity.java
index 3238f80..6d44e63 100644
---
a/data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/model/MetadataSchemaFieldEntity.java
+++
b/data-catalog-api/server/core/src/main/java/org/apache/airavata/datacatalog/api/model/MetadataSchemaFieldEntity.java
@@ -36,6 +36,7 @@ public class MetadataSchemaFieldEntity {
private String jsonPath;
@Enumerated(EnumType.STRING)
+@Column(nullable = false)
private FieldValueType fieldValueType;
@ManyToOne(optional = false)
diff --git a/data-catalog-api/server/service/liquibase.properties
b/data-catalog-api/server/service/liquibase.properties
index 1f72d49..8bb4b30 100644
--- a/data-catalog-api/server/service/liquibase.properties
+++ b/data-catalog-api/server/service/liquibase.properties
@@ -1,8 +1,13 @@
-# url: jdbc:postgresql://localhost:5432/data_catalog
-url: offline:postgresql?snapshot=snapshot.json
+# Run the following to create a snapshot file
+# liquibase snapshot --output-file=snapshot.json
+# Then update the local database and run the following to create a diff with
the snapshot
+# liquibase diffChangeLog "--url=offline:postgresql?snapshot=snapshot.json"
--changelog-file=mydiff.xml
+url: jdbc:postgresql://localhost:5432/data_catalog
+# url: offline:postgresql?snapshot=snapshot.json
username: postgres
password: example
-# classpath: mysql-connector-java-8.0.27.jar
referenceUrl: jdbc:postgresql://localhost:5432/data_catalog
referenceUsername: postgres
referencePassword: example
+snapshotFormat: json
+# outputFile=snapshot.json
diff --git
a/data-catalog-api/server/service/src/main/resources/db/changelog/2023/09/2023-09-01-changelog.xml
b/data-catalog-api/server/service/src/main/resources/db/changelog/2023/09/2023-09-01-changelog.xml
new file mode 100644
index 000..c785fb9
--- /dev/null
+++
b/data-catalog-api/server/service/src/main/resources/db/changelog/2023/09/2023-09-01-changelog.xml
@@ -0,0 +1,11 @@
+
+http://www.liquibase.org/xml/ns/dbchangelog;
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext;
xmlns:pro="http://www.liquibase.org/xml/ns/pro;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
http://www.liquibase.org/xml/ns/pro
http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd
http://www.liquibase.org/xml/n [...]
+
+http://www.liquibase.org/xml/ns/dbchangelog;
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext;
xmlns:pro="http://www.liquibase.org/xml/ns/pro;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
http://www.liquibase.org/xml/ns/pro
http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd
http://www.liquibase.org/xml/n [...]
+
+
+
+
+
+
+
diff --git
a/data-catalog-api/server/service/src/main/resources/db/changelog/db.changelog-master.xml
b/data-catalog-api/server/service/src/main/resources/db/changelog/db.changelog-master.xml
index 50be033..372f172 100644
---
a/data-catalog-api/server/service/src/main/resources/db/changelog/db.changelog-master.xml
+++
b/data-catalog-api/server/service/src/main/resources/db/changelog/db.changelog-master.xml
@@ -5,4 +5,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
http://www.liquibase.org/xml/ns/pro
http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd
http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd;>
+
diff --git
a/data-catalog-api/server/simple-sharing/src/mai
[airavata] branch develop updated (c7238ad5f2 -> 643f984bac)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git from c7238ad5f2 Ansible: dev.amp ssh deploy key host alias new 8fe1f40d1b Update README.md new cfa0411064 Merge branch 'apache:develop' into develop new 643f984bac Merge pull request #431 from SauravKumarJhaNITW/develop The 10114 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: modules/ide-integration/README.md | 2 ++ 1 file changed, 2 insertions(+)
[airavata-django-portal] branch vue3-migration created (now 17d744dd)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch vue3-migration in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git at 17d744dd Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop No new revisions were added by this update.
[airavata-django-portal] branch master updated: Adding build.os to .readthedocs.yaml
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git The following commit(s) were added to refs/heads/master by this push: new 18cd1ab1 Adding build.os to .readthedocs.yaml 18cd1ab1 is described below commit 18cd1ab110fd25757d7b7c12778806ae2653235e Author: Marcus Christie AuthorDate: Wed Aug 16 17:56:42 2023 -0400 Adding build.os to .readthedocs.yaml --- .readthedocs.yaml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index b344c3c3..8045d85c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,10 +6,10 @@ version: 2 # Set the version of Python and other tools you might need -# build: -# os: ubuntu-22.04 -# tools: -# python: "3.10" +build: + os: ubuntu-22.04 + tools: +python: "3.10" mkdocs: configuration: mkdocs.yml
[airavata-django-portal-sdk] branch master updated: Update mkautodoc to work with RTD
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal-sdk.git The following commit(s) were added to refs/heads/master by this push: new cf4c478 Update mkautodoc to work with RTD cf4c478 is described below commit cf4c4789e851e42e7daaf4202e43732f0117669a Author: Marcus Christie AuthorDate: Wed Aug 16 17:53:29 2023 -0400 Update mkautodoc to work with RTD --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d54da6d..1cb2d1c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ flake8==3.8.4 flake8-isort==4.0.0 Markdown==3.3.4 ; python_version < "3.7" mkdocs==1.3.0 -mkautodoc==0.1.0 +mkautodoc==0.2.0 pycodestyle==2.6.0 Jinja2==3.0.3 pytest==7.0.1
[airavata-django-portal-sdk] branch master updated: Adding build.os to .readthedocs.yaml
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal-sdk.git The following commit(s) were added to refs/heads/master by this push: new 3bf4175 Adding build.os to .readthedocs.yaml 3bf4175 is described below commit 3bf41755f597edfee835b604362292f07394f65a Author: Marcus Christie AuthorDate: Wed Aug 16 17:34:14 2023 -0400 Adding build.os to .readthedocs.yaml --- .readthedocs.yaml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index fbe5c54..3444833 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,10 +6,10 @@ version: 2 # Set the version of Python and other tools you might need -# build: -# os: ubuntu-22.04 -# tools: -# python: "3.10" +build: + os: ubuntu-22.04 + tools: +python: "3.10" mkdocs: configuration: mkdocs.yml
[airavata-user-docs] branch main updated: Adding build.os to .readthedocs.yaml
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-user-docs.git The following commit(s) were added to refs/heads/main by this push: new f22fe1a Adding build.os to .readthedocs.yaml f22fe1a is described below commit f22fe1af938569f7783782d19e84c93b20fb422b Author: Marcus Christie AuthorDate: Wed Aug 16 17:31:59 2023 -0400 Adding build.os to .readthedocs.yaml --- .readthedocs.yaml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 946dd5a..d6d80eb 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,10 +6,10 @@ version: 2 # Set the version of Python and other tools you might need -# build: -# os: ubuntu-22.04 -# tools: -# python: "3.10" +build: + os: ubuntu-22.04 + tools: +python: "3.10" mkdocs: configuration: mkdocs.yml
[airavata-admin-user-docs] branch main updated: Adding build.os key to .readthedocs.yaml
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-admin-user-docs.git The following commit(s) were added to refs/heads/main by this push: new a55a603 Adding build.os key to .readthedocs.yaml a55a603 is described below commit a55a603e4e75fc0f1a2d022766fe0ba77f8748a0 Author: Marcus Christie AuthorDate: Wed Aug 16 17:29:33 2023 -0400 Adding build.os key to .readthedocs.yaml --- .readthedocs.yaml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 946dd5a..d6d80eb 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,10 +6,10 @@ version: 2 # Set the version of Python and other tools you might need -# build: -# os: ubuntu-22.04 -# tools: -# python: "3.10" +build: + os: ubuntu-22.04 + tools: +python: "3.10" mkdocs: configuration: mkdocs.yml
[airavata-django-portal] branch master updated (e456c6fe -> 42828901)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from e456c6fe Run build and test GA on PRs new bd0c4d0c README Change. Added Windows command note. new 4c111089 Added webpack 5.0.0 dependency needed for webpack-bundle-tracker new e7685cfb Reverting changes that were not needed. Add Windows note to REDME new 57d5ceef retrigger checks new 42828901 Merge pull request #185 from jcford2213/master The 2173 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 + django_airavata/apps/auth/package.json | 9 +- django_airavata/apps/auth/yarn.lock| 501 - requirements-dev.txt | Bin 237 -> 506 bytes 4 files changed, 504 insertions(+), 9 deletions(-)
[airavata-django-portal] branch master updated (335ee8a4 -> e456c6fe)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from 335ee8a4 AIRAVATA-3702 Update SDK for bug fix add e456c6fe Run build and test GA on PRs No new revisions were added by this update. Summary of changes: .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[airavata] branch develop updated (67e6e42a84 -> c7238ad5f2)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git from 67e6e42a84 Merge pull request #432 from isururanawaka/metaschedular add c7238ad5f2 Ansible: dev.amp ssh deploy key host alias No new revisions were added by this update. Summary of changes: dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[airavata-docs] branch master updated: Pin mkdocs dependency to 0.17.3
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-docs.git The following commit(s) were added to refs/heads/master by this push: new 1ea10be Pin mkdocs dependency to 0.17.3 1ea10be is described below commit 1ea10be89abd331e0ad77c221f4fd9f51d231afc Author: Marcus Christie AuthorDate: Wed Aug 2 11:57:04 2023 -0400 Pin mkdocs dependency to 0.17.3 --- .readthedocs.yaml | 6 +++--- requirements.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 0c7e331..816765a 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -15,6 +15,6 @@ mkdocs: configuration: mkdocs.yml # Optionally declare the Python requirements required to build your docs -# python: -#install: -#- requirements: requirements.txt +python: + install: + - requirements: requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..b0fa54b --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +mkdocs==0.17.3
[airavata] branch master updated: Ansible: enable tus and increase upload limit in md.cybershuttle.org
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 1d9710d8bd Ansible: enable tus and increase upload limit in
md.cybershuttle.org
1d9710d8bd is described below
commit 1d9710d8bde3cf35a24da2ba652885bc5d201b59
Author: Marcus Christie
AuthorDate: Fri Jul 21 16:56:12 2023 -0500
Ansible: enable tus and increase upload limit in md.cybershuttle.org
---
.../scigap/production/host_vars/molecular-dynamics/vars.yml| 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/molecular-dynamics/vars.yml
b/dev-tools/ansible/inventories/scigap/production/host_vars/molecular-dynamics/vars.yml
index f73862dafb..15771ab041 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/molecular-dynamics/vars.yml
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/molecular-dynamics/vars.yml
@@ -20,17 +20,14 @@
---
-# TODO: tus not setup yet
-tusd_vhost_servername:
-
vhost_servername: "md.cybershuttle.org"
vhost_ssl: True
ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/fullchain.pem"
ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/privkey.pem"
-# Increase max upload size to 200MB
-#django_file_upload_max_file_size_mb: 200
+# Increase max upload size to 640MB
+django_file_upload_max_file_size_mb: 640
## Keycloak related variables
tenant_domain: "molecular-dynamics"
[airavata] branch master updated: Ansible: load cilogon userinfo and display to admins
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 56ece454e5 Ansible: load cilogon userinfo and display to admins
56ece454e5 is described below
commit 56ece454e598608cba01453aae4228e6df091f4c
Author: Marcus Christie
AuthorDate: Wed Jul 19 16:43:59 2023 -0400
Ansible: load cilogon userinfo and display to admins
---
.../inventories/scigap/production/host_vars/pace-gatech/vars.yml| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/pace-gatech/vars.yml
b/dev-tools/ansible/inventories/scigap/production/host_vars/pace-gatech/vars.yml
index 093aea47e0..0e6f9c630d 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/pace-gatech/vars.yml
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/pace-gatech/vars.yml
@@ -41,6 +41,8 @@ auth_options:
- name: "Existing Institution Credentials"
idp_alias: "cilogon"
logo: "images/cilogon-logo-24x24-b.png"
+ idp_token_url: "{{ oauth_service_url }}/realms/{{ tenant_domain
}}/broker/cilogon/token"
+ userinfo_url: "{{ cilogon_userinfo_url }}"
gateway_id: "pace-gatech"
experiment_data_dir: "{{ user_data_dir }}/pace-gatech"
[airavata] 02/02: Ansible: switch to manual install/update of smiles django app
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit fbc9e7cc7b6ad070f85f4fc84e5352847c8e7bb7
Author: Marcus Christie
AuthorDate: Mon Jul 17 17:30:14 2023 -0400
Ansible: switch to manual install/update of smiles django app
---
.../inventories/scigap/production/host_vars/smiles/vars.yml| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
b/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
index 7fb44e451e..c6b4021acc 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
@@ -33,9 +33,10 @@ ssl_certificate_file: "/etc/letsencrypt/live/{{
vhost_servername }}/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/fullchain.pem"
ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/privkey.pem"
-airavata_django_extra_dependencies:
- - name:
"git+https://github.com/SciGaP/smiles-django-portal.git#egg=smiles-django-portal;
-editable: true
+# TODO: fix frontend build on install, for now install/update manually
+# airavata_django_extra_dependencies:
+# - name:
"git+https://github.com/SciGaP/smiles-django-portal.git#egg=smiles-django-portal;
+# editable: true
# Increase max upload size to 2GB
django_file_upload_max_file_size_mb: 2000
[airavata] 01/02: Ansible: add gzip/cache support for svg
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git commit 1caad3ecc2e5397d2b22143fa65bb3e38c5b4753 Author: Marcus Christie AuthorDate: Mon Jul 17 17:29:24 2023 -0400 Ansible: add gzip/cache support for svg --- dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 index 0764c34bd2..858ee83696 100644 --- a/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 +++ b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 @@ -61,14 +61,14 @@ Require all granted -AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript +AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript image/svg+xml # Force browser to revalidate cached static resources Header set Cache-Control "no-cache" # Workaround for ETag bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=45023#c22 RequestHeader edit "If-None-Match" '^"((.*)-gzip)"$' '"$1", "$2"' # If file has a content hash, cache for a year - + Header set Cache-Control "max-age=31536000, public"
[airavata] branch master updated (244a1fa235 -> fbc9e7cc7b)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git from 244a1fa235 Ansible: smiles django app config new 1caad3ecc2 Ansible: add gzip/cache support for svg new fbc9e7cc7b Ansible: switch to manual install/update of smiles django app The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../inventories/scigap/production/host_vars/smiles/vars.yml| 7 --- dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
[airavata-django-portal] branch master updated (8237e5b4 -> 335ee8a4)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from 8237e5b4 Add a copy to clipboard button for the access token add 335ee8a4 AIRAVATA-3702 Update SDK for bug fix No new revisions were added by this update. Summary of changes: requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[airavata-django-portal] branch AIRAVATA-3698--Add-support-for-Python-3.11 updated (d253b505 -> f1fb9f19)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from d253b505 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 add 99c4a1d7 Adding .readthedocs.yaml add 8237e5b4 Add a copy to clipboard button for the access token add 335ee8a4 AIRAVATA-3702 Update SDK for bug fix add 17d744dd Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop new f1fb9f19 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .readthedocs.yaml | 22 ++ .../login-desktop-success.html | 3 ++- requirements.txt | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .readthedocs.yaml
[airavata-django-portal] 01/01: Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git commit f1fb9f198e675cf6513de22a7b18757d8518a0ee Merge: d253b505 17d744dd Author: Marcus Christie AuthorDate: Mon Jul 17 11:29:43 2023 -0400 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 .readthedocs.yaml | 22 ++ .../login-desktop-success.html | 3 ++- requirements.txt | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --cc requirements.txt index cca7b2e2,32b17060..e70e2225 --- a/requirements.txt +++ b/requirements.txt @@@ -18,11 -19,13 +18,11 @@@ papermill==1.0. # gRPC libs google-api-python-client==1.12.8 -grpcio-tools==1.48.2 ; python_version < "3.7" -grpcio-tools==1.51.1 ; python_version >= "3.7" -grpcio==1.48.2 ; python_version < "3.7" -grpcio==1.51.1 ; python_version >= "3.7" +grpcio-tools==1.51.1 +grpcio==1.51.1 - airavata-django-portal-sdk==1.8.3 + airavata-django-portal-sdk==1.8.4 airavata-python-sdk==1.1.6 -airavata-django-portal-commons==1.0.0 +airavata-django-portal-commons==1.0.3 -e "."
[airavata-django-portal] branch develop updated (3912decc -> 17d744dd)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from 3912decc AIRAVATA-3700 Handle ENTER key submission of new project form add 99c4a1d7 Adding .readthedocs.yaml add 8237e5b4 Add a copy to clipboard button for the access token new 335ee8a4 AIRAVATA-3702 Update SDK for bug fix new 17d744dd Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .readthedocs.yaml | 22 ++ .../login-desktop-success.html | 3 ++- requirements.txt | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .readthedocs.yaml
[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git commit 17d744ddb8b0987e4124dbc37ea1638f35f9f957 Merge: 3912decc 335ee8a4 Author: Marcus Christie AuthorDate: Mon Jul 17 11:20:36 2023 -0400 Merge branch 'AIRAVATA-3702--User-input-files-renamed-with-random-extension-when-experiment-launched' into develop .readthedocs.yaml | 22 ++ .../login-desktop-success.html | 3 ++- requirements.txt | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-)
[airavata-django-portal] 01/02: AIRAVATA-3702 Update SDK for bug fix
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git commit 335ee8a488b7d64ebd85bbd02019df8d4916d587 Author: Marcus Christie AuthorDate: Mon Jul 17 11:20:27 2023 -0400 AIRAVATA-3702 Update SDK for bug fix --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2dfbf658..32b17060 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ grpcio-tools==1.51.1 ; python_version >= "3.7" grpcio==1.48.2 ; python_version < "3.7" grpcio==1.51.1 ; python_version >= "3.7" -airavata-django-portal-sdk==1.8.3 +airavata-django-portal-sdk==1.8.4 airavata-python-sdk==1.1.6 airavata-django-portal-commons==1.0.0
[airavata-django-portal-sdk] annotated tag v1.8.4 updated (0e0956a -> 605760e)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to annotated tag v1.8.4 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal-sdk.git *** WARNING: tag v1.8.4 was modified! *** from 0e0956a (commit) to 605760e (tag) tagging 0e0956af11e7d2ee8cc8ba0c547a4f7b79fa0a89 (commit) replaces v1.8.3 by Marcus Christie on Mon Jul 17 11:16:30 2023 -0400 - Log - v1.8.4 --- No new revisions were added by this update. Summary of changes:
[airavata-django-portal-sdk] branch master updated (7f57be6 -> 0e0956a)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal-sdk.git from 7f57be6 Adding .readthedocs.yaml add 3a6edf0 AIRAVATA-3702 Preserve original filename of input file when it has the same name add 0e0956a Bump version to 1.8.4 No new revisions were added by this update. Summary of changes: .../tests/test_user_storage.py | 33 ++ airavata_django_portal_sdk/user_storage/api.py | 2 +- setup.py | 2 +- 3 files changed, 35 insertions(+), 2 deletions(-)
[airavata-data-catalog] branch main updated (5fbd524 -> ca3f26b)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git from 5fbd524 Merge pull request #40 from apache/custos-integration add 2948b0e Build an executable data-catalog api service jar new ca3f26b Merge pull request #41 from apache/executable-jar The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: data-catalog-api/server/pom.xml | 2 +- data-catalog-api/server/service/pom.xml | 10 ++ 2 files changed, 11 insertions(+), 1 deletion(-)
[airavata-data-catalog] branch executable-jar deleted (was 2948b0e)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch executable-jar in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git was 2948b0e Build an executable data-catalog api service jar The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[airavata-data-catalog] 01/01: Merge pull request #41 from apache/executable-jar
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git commit ca3f26bc00330c3956f1bd3c560fb475eb75b130 Merge: 5fbd524 2948b0e Author: Marcus Christie AuthorDate: Mon Jul 3 16:33:59 2023 -0400 Merge pull request #41 from apache/executable-jar Build an executable data-catalog api service jar data-catalog-api/server/pom.xml | 2 +- data-catalog-api/server/service/pom.xml | 10 ++ 2 files changed, 11 insertions(+), 1 deletion(-)
[airavata-data-catalog] 01/01: Build an executable data-catalog api service jar
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch executable-jar
in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
commit 2948b0ed9c1decb3d3402766615e1eeb2edbf56c
Author: Marcus Christie
AuthorDate: Mon Jul 3 16:33:24 2023 -0400
Build an executable data-catalog api service jar
---
data-catalog-api/server/pom.xml | 2 +-
data-catalog-api/server/service/pom.xml | 10 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/data-catalog-api/server/pom.xml b/data-catalog-api/server/pom.xml
index a0710fd..48737ff 100644
--- a/data-catalog-api/server/pom.xml
+++ b/data-catalog-api/server/pom.xml
@@ -35,7 +35,7 @@ under the License.
org.springframework.boot
-spring-boot-starter-parent
+spring-boot-dependencies
${spring.boot.version}
pom
import
diff --git a/data-catalog-api/server/service/pom.xml
b/data-catalog-api/server/service/pom.xml
index cb18d92..c08be08 100644
--- a/data-catalog-api/server/service/pom.xml
+++ b/data-catalog-api/server/service/pom.xml
@@ -66,6 +66,16 @@
org.springframework.boot
spring-boot-maven-plugin
${spring.boot.version}
+
+
+
+repackage
+
+
+
+
+true
+
[airavata-data-catalog] branch executable-jar created (now 2948b0e)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch executable-jar in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git at 2948b0e Build an executable data-catalog api service jar This branch includes the following new commits: new 2948b0e Build an executable data-catalog api service jar The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[airavata] 01/01: Merge branch 'AIRAVATA-3697' into develop
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git commit 3a5b8358cf295ae33d151d59ceacc71279580aa4 Merge: 6184147388 6fcefb2c47 Author: Marcus Christie AuthorDate: Mon Jul 3 15:46:19 2023 -0400 Merge branch 'AIRAVATA-3697' into develop .../scigap/production/host_vars/simccs/vars.yml| 2 +- .../scigap/production/host_vars/smiles/vars.yml| 12 ++-- .../init/05-replica-catalog-migrations.sql | 32 - .../src/main/resources/replicacatalog-mysql.sql| 22 +++ .../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +- 5 files changed, 47 insertions(+), 54 deletions(-)
[airavata] branch develop updated (6184147388 -> 3a5b8358cf)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git from 6184147388 Merge branch 'AIRAVATA-3698--Add-support-for-Python-3.11' into develop add 7daac92d61 Ansible: updating google analytics tracking id to GA4 one add 244a1fa235 Ansible: smiles django app config add 6fcefb2c47 AIRAVATA-3697 Switching to column level utf8 character set new 3a5b8358cf Merge branch 'AIRAVATA-3697' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../scigap/production/host_vars/simccs/vars.yml| 2 +- .../scigap/production/host_vars/smiles/vars.yml| 12 ++-- .../init/05-replica-catalog-migrations.sql | 32 - .../src/main/resources/replicacatalog-mysql.sql| 22 +++ .../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +- 5 files changed, 47 insertions(+), 54 deletions(-)
[airavata] branch AIRAVATA-3697 updated (33300327fc -> 6fcefb2c47)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3697 in repository https://gitbox.apache.org/repos/asf/airavata.git from 33300327fc AIRAVATA-3697 Db migrations and changing PRODUCT_NAME, REPLICA_NAME to clobs add 6ee9a3f3b7 Commenting out shelving gateways add bd2efcf861 Commented shelving gateways, Mines and UNG. add 09e6aaf435 AIRAVATA-3694 Ansible: configure data archive max ages for scigap hosted gateways add 0bafa1eaa4 Commented gateways SMALTR to shelve. add 8a30c61ee5 Ansible: add ssl certificate generation and HAProxy for api server add 960086dcf6 Ansible fixes and configuring api server to NOT listen on TLS port add fe68cafe32 Removing unneeded task add 6f2116e3bf Merge pull request #423 from apache/ansible-haproxy add eec05021bc Ansible: switching dev.amp domain back add 9fd7b2e620 Merge branch 'master' into develop add f87b434db9 Ansible: cyberwater config for js2 add dba1280045 Ansible: remove interactwel app until install is fixed add 39a05612d2 Ansible: switching interactwel domain name back add e7fd8c2d90 Merge branch 'master' into develop add f347f1922c Merge branch 'master' into develop add ce941d765f Ansible: tusd for js2 dev web server add e1b7afb681 Merge branch 'master' into develop add 8567fd7e74 Merge branch 'master' into develop add f378e0c973 Ansible: dev delta on js2 add ad4757a98e Merge branch 'master' into develop add eb8cd037e2 AIRAVATA-3609 Enable legacy TLS security by disabling system properties add 4847c7f0b4 AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13 add a7747e6c26 Merge branch 'dev-scigap-org' into develop add d03a6e54cb Ansible: make develop-js2 inventory the new develop inventory add 3a580125f3 Ansible: Helix 0.9.10 has replaced 0.9.9 and 0.9.9 is no longer available for download add 0d3497eb62 Ansible: change dev api server domain address back to apidev.scigap.org add 51b5f58ad9 Switching the Django seagrid domain in the new JS2 VM add ea21942f33 Switching the Django simccs domain in the new JS2 VM add a1d1f50664 Switching the Django Cyberwater domain in the new JS2 VM add 9f0c6cd780 Ansible: fixing yaml syntax error add d8ab05e534 Merge branch 'master' into develop add a9e7edb468 Airavata Metascheduler Project Structure add 0deaad9937 Add new process status QUEUED, DEQUEUING, REQUEUED add c8e3b43036 support multiple computeResourceSchedulingEntities add 09e520416e implement default CR selection policy add f2f7f1419d intigrate Process Scheduler with Orchestrator add aa30d23606 fix import error add 13a8bcd324 Merge branch 'develop' of github.com:fengggli/airavata into develop add 586da2006f InsecureRequestWarning shall be suppressed inside requests add d0c22ce0d7 Merge pull request #297 from fengggli/develop add ddadc7326c Merge branch 'develop' of https://github.com/apache/airavata into metaschedular add b7e1c2a204 implement cluster live checking add d5ee89f284 fix ambigutity add 4594edb8d2 add COMPUTE_RESOURCE_SCHEDULING to expectacatalog add b0462bd84f Big fix add 00d2a920bf Big fix add dfae694159 Big fix add baf6cc3b9d Bug fix add d63cf86af5 remove association add 5831df890d remove association add 86af4910c8 Add CRP and GRP existance checking methods to stubs add 2ba55e54cc airavata-api/ add acf39e95f7 externalize monitoring service and implement daemon service to monitor CR add 4ca3297045 Add monitoring service startup code add a67235f307 Integrate queue statuc checking into metascheduler add d912b6cd3d Orchestrator server add 8edf3255cb support slurm default cases add e1ebd36414 update python sdk to create remote file folders add 0f47d334d7 Update settings.ini add ca70d2c566 conflict resolve add 29956f713d conflict resolve add 9bfa2ed3a6 upgrade python sdk add 21d8cbb7e8 increase sdk version add cd8d8afe32 Merge pull request #330 from isururanawaka/develop add 119233ee01 Ansible: re-enabled interactwel django app add e604a557e6 Minor logging improvements to ssh agent add 15a3a3833c Merge branch 'master' into develop add 9ac01f9cba Merge branch 'develop' of https://github.com/apache/airavata into metaschedular add 3fa679d7c4 bug fix add c7acf67554 Merge pull request #329 from isururanawaka/metaschedular add 8dca9578cc update server settings add b9d880b6b5 Merge pull request #331 from isururanawaka/metaschedular add 895a44bf93 Adding error logging add acdbb13d6f Merge pull request #332 from isururanawaka/metaschedular add 60e2fd9ef2 Add server stating status add a24f9bd1b4 Merge pull request #333 from isururanawaka/metaschedular add 618d3fea16 Adding debug logs add 61aff68bb3 Merge
[airavata] 01/01: AIRAVATA-3697 Switching to column level utf8 character set
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch AIRAVATA-3697 in repository https://gitbox.apache.org/repos/asf/airavata.git commit 6fcefb2c476fd73cc5070d378f0730713f5ac65f Author: Marcus Christie AuthorDate: Mon Jul 3 15:45:10 2023 -0400 AIRAVATA-3697 Switching to column level utf8 character set --- .../init/05-replica-catalog-migrations.sql | 32 - .../src/main/resources/replicacatalog-mysql.sql| 22 +++ .../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +- 3 files changed, 36 insertions(+), 51 deletions(-) diff --git a/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql b/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql index db5e878fb9..1c3b8d1c3f 100644 --- a/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql +++ b/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql @@ -1,35 +1,27 @@ USE replica_catalog; -- AIRAVATA-3697: Support file names that have UTF8 characters and that are long -SET - FOREIGN_KEY_CHECKS = 0; - -ALTER DATABASE replica_catalog CHARACTER SET = utf8 COLLATE = utf8_bin; - -ALTER TABLE - DATA_PRODUCT CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; - ALTER TABLE - DATA_REPLICA_LOCATION CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; - -ALTER TABLE - DATA_PRODUCT_METADATA CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; + DATA_PRODUCT +MODIFY + PRODUCT_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; ALTER TABLE - DATA_REPLICA_METADATA CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; + DATA_PRODUCT +MODIFY + PRODUCT_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; ALTER TABLE - CONFIGURATION CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; - -SET - FOREIGN_KEY_CHECKS = 1; + DATA_REPLICA_LOCATION +MODIFY + REPLICA_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; ALTER TABLE DATA_REPLICA_LOCATION MODIFY - REPLICA_NAME text; + REPLICA_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; ALTER TABLE - DATA_PRODUCT + DATA_REPLICA_LOCATION MODIFY - PRODUCT_NAME text; + FILE_PATH varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; diff --git a/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql index 7c8a0ee11d..99731e0a9c 100644 --- a/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql @@ -21,8 +21,8 @@ CREATE TABLE DATA_PRODUCT ( PRODUCT_URI VARCHAR (255), GATEWAY_ID VARCHAR (255), -PRODUCT_NAME TEXT, -PRODUCT_DESCRIPTION VARCHAR (255), +PRODUCT_NAME TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin, +PRODUCT_DESCRIPTION VARCHAR (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin, OWNER_NAME VARCHAR (255), PARENT_PRODUCT_URI VARCHAR (255), PRODUCT_SIZE INT, @@ -31,15 +31,15 @@ CREATE TABLE DATA_PRODUCT ( PRODUCT_TYPE VARCHAR(10), PRIMARY KEY (PRODUCT_URI), FOREIGN KEY (PARENT_PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI) ON DELETE CASCADE -) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin; +) ENGINE = InnoDB DEFAULT CHARSET = latin1; CREATE TABLE DATA_REPLICA_LOCATION ( REPLICA_ID VARCHAR (255), PRODUCT_URI VARCHAR (255) NOT NULL, -REPLICA_NAME TEXT, -REPLICA_DESCRIPTION VARCHAR (255), +REPLICA_NAME TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin, +REPLICA_DESCRIPTION VARCHAR (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin, STORAGE_RESOURCE_ID VARCHAR (255), -FILE_PATH VARCHAR (1024), +FILE_PATH VARCHAR (1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin, CREATION_TIME TIMESTAMP NULL DEFAULT '-00-00 00:00:00', LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, VALID_UNTIL_TIME TIMESTAMP NULL DEFAULT '-00-00 00:00:00', @@ -47,7 +47,7 @@ CREATE TABLE DATA_REPLICA_LOCATION ( REPLICA_PERSISTENT_TYPE VARCHAR(10), PRIMARY KEY (REPLICA_ID), FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE -) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin; +) ENGINE = InnoDB DEFAULT CHARSET = latin1; CREATE TABLE DATA_PRODUCT_METADATA ( PRODUCT_URI VARCHAR(255) NOT NULL, @@ -55,7 +55,7 @@ CREATE TABLE DATA_PRODUCT_METADATA ( METADATA_VALUE VARCHAR(255), PRIMARY KEY(PRODUCT_URI, METADATA_KEY), FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE -) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE
[airavata] branch master updated: Ansible: smiles django app config
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 244a1fa235 Ansible: smiles django app config
244a1fa235 is described below
commit 244a1fa23534956317dc39cabfae45543a1eec88
Author: Marcus Christie
AuthorDate: Thu Jun 29 13:23:20 2023 -0400
Ansible: smiles django app config
---
.../inventories/scigap/production/host_vars/smiles/vars.yml | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
b/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
index a36d4baa27..7fb44e451e 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
@@ -33,8 +33,16 @@ ssl_certificate_file: "/etc/letsencrypt/live/{{
vhost_servername }}/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/fullchain.pem"
ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/privkey.pem"
-# Increase max upload size to 200MB
-django_file_upload_max_file_size_mb: 200
+airavata_django_extra_dependencies:
+ - name:
"git+https://github.com/SciGaP/smiles-django-portal.git#egg=smiles-django-portal;
+editable: true
+
+# Increase max upload size to 2GB
+django_file_upload_max_file_size_mb: 2000
+
+django_extra_settings:
+ CELERY_BROKER_URL: "redis://localhost:6379"
+ CELERY_RESULT_BACKEND: "redis://localhost:6379"
## Keycloak related variables
tenant_domain: "smiles"
[airavata] branch develop updated (30259b0d11 -> 6184147388)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git from 30259b0d11 Merge pull request #429 from isururanawaka/metaschedular new bf41a6c435 Ansible: commenting out dev delta gateway add 0b1880f8b7 Merge pull request #428 from isururanawaka/metaschedular add e036cf70a0 AIRAVATA-3698 Switch Django deploy to Python 3.9 add 54c7adf1ab AIRAVATA-3698 Update mod_wsgi to work with Py 3.9 add e8a711a2fc AIRAVATA-3698 Referenc Django virtual env directory in vhost conf new 6184147388 Merge branch 'AIRAVATA-3698--Add-support-for-Python-3.11' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 2 +- .../scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++-- dev-tools/ansible/inventories/scigap/develop/hosts | 2 +- .../production/host_vars/dreg/files/django-ssl-vhost.conf.j2 | 4 ++-- .../production/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++-- dev-tools/ansible/roles/django/defaults/main.yml | 5 +++-- dev-tools/ansible/roles/django/tasks/main.yml | 4 ++-- dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 2 +- dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 4 ++-- dev-tools/ansible/roles/django_setup/defaults/main.yml | 7 --- .../ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml | 6 +++--- 11 files changed, 23 insertions(+), 21 deletions(-)
[airavata] 02/02: Merge branch 'AIRAVATA-3698--Add-support-for-Python-3.11' into develop
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git commit 61841473880e7b765f400c253161233681057366 Merge: bf41a6c435 e8a711a2fc Author: Marcus Christie AuthorDate: Wed Jun 28 12:14:25 2023 -0400 Merge branch 'AIRAVATA-3698--Add-support-for-Python-3.11' into develop .../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 2 +- .../scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++-- .../production/host_vars/dreg/files/django-ssl-vhost.conf.j2 | 4 ++-- .../production/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++-- dev-tools/ansible/roles/django/defaults/main.yml | 5 +++-- dev-tools/ansible/roles/django/tasks/main.yml | 4 ++-- dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 2 +- dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 4 ++-- dev-tools/ansible/roles/django_setup/defaults/main.yml | 7 --- .../ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml | 6 +++--- 10 files changed, 22 insertions(+), 20 deletions(-)
[airavata] 01/02: Ansible: commenting out dev delta gateway
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git commit bf41a6c435379a15bb1882dc56cbdfe87a18979d Author: Marcus Christie AuthorDate: Wed Jun 28 12:14:15 2023 -0400 Ansible: commenting out dev delta gateway --- dev-tools/ansible/inventories/scigap/develop/hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/ansible/inventories/scigap/develop/hosts b/dev-tools/ansible/inventories/scigap/develop/hosts index 28c480c966..8f9fd0e62e 100644 --- a/dev-tools/ansible/inventories/scigap/develop/hosts +++ b/dev-tools/ansible/inventories/scigap/develop/hosts @@ -35,7 +35,7 @@ cyberwater ansible_host=web.dev.scigap.org ; mines ansible_host=149.165.156.46 amp ansible_host=149.165.153.222 geo ansible_host=web.dev.scigap.org -delta ansible_host=149.165.153.181 +; delta ansible_host=149.165.153.181 ; custos-testdrive ansible_host=pgadev.scigap.org rnamake ansible_host=web.dev.scigap.org dev-ultrascan ansible_host=web.dev.scigap.org
[airavata-django-portal] branch AIRAVATA-3698--Add-support-for-Python-3.11 updated (7dfe2507 -> d253b505)
This is an automated email from the ASF dual-hosted git repository. machristie pushed a change to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git from 7dfe2507 AIRAVATA-3698 Pull in fixes for EntryPoint properties add 3912decc AIRAVATA-3700 Handle ENTER key submission of new project form new d253b505 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../js/components/project/ProjectButtonNew.vue | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-)
[airavata-django-portal] 01/01: Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git commit d253b505f52e8562af2d6f0fe26927b0498762bb Merge: 7dfe2507 3912decc Author: Marcus Christie AuthorDate: Tue Jun 27 14:55:30 2023 -0400 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 .../js/components/project/ProjectButtonNew.vue | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-)
[airavata-django-portal] branch develop updated: AIRAVATA-3700 Handle ENTER key submission of new project form
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/develop by this push:
new 3912decc AIRAVATA-3700 Handle ENTER key submission of new project form
3912decc is described below
commit 3912deccf734595537cf657ec5c04f6827c8ae67
Author: Marcus Christie
AuthorDate: Tue Jun 27 14:54:37 2023 -0400
AIRAVATA-3700 Handle ENTER key submission of new project form
---
.../js/components/project/ProjectButtonNew.vue | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectButtonNew.vue
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectButtonNew.vue
index 5d839362..94f67d5d 100644
---
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectButtonNew.vue
+++
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectButtonNew.vue
@@ -7,7 +7,7 @@
id="modal-new-project"
ref="modalNewProject"
title="Create New Project"
- v-on:ok="onCreateProject"
+ v-on:ok="onOkClicked"
v-bind:ok-disabled="okDisabled"
@cancel="onCancelNewProject"
>
@@ -40,9 +40,10 @@ export default {
ProjectEditor,
},
methods: {
-onCreateProject: function (event) {
- // Prevent hiding modal, hide it programmatically when project gets
created
- event.preventDefault();
+onCreateProject: function () {
+ if (!this.valid) {
+return;
+ }
services.ProjectService.create({ data: this.newProject }).then(
(result) => {
this.$refs.modalNewProject.hide();
@@ -53,6 +54,11 @@ export default {
}
);
},
+onOkClicked(event) {
+ // Prevent hiding modal, hide it programmatically when project gets
created
+ event.preventDefault();
+ this.onCreateProject();
+},
onCancelNewProject() {
this.newProject = new models.Project();
this.$refs.projectEditor.reset();
[airavata] branch AIRAVATA-3698--Add-support-for-Python-3.11 updated: AIRAVATA-3698 Referenc Django virtual env directory in vhost conf
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to
refs/heads/AIRAVATA-3698--Add-support-for-Python-3.11 by this push:
new e8a711a2fc AIRAVATA-3698 Referenc Django virtual env directory in
vhost conf
e8a711a2fc is described below
commit e8a711a2fcd673f03d80428965b6824a4cdec08a
Author: Marcus Christie
AuthorDate: Tue Jun 27 11:11:04 2023 -0400
AIRAVATA-3698 Referenc Django virtual env directory in vhost conf
---
.../scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2| 4 ++--
.../scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2 | 4 ++--
.../scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 4 ++--
dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 2 +-
dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 2e482d25b2..bc0426fcd6 100644
---
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -43,7 +43,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver;
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver;
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -68,7 +68,7 @@
{% endfor %}
-WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
+WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ django_venv_dir }} python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
index 60606670c7..b8d95b425c 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
@@ -29,7 +29,7 @@
ServerName {{ vhost_servername }}
-
+
## Redirect all http traffic to https
RewriteEngine On
RewriteCond %{HTTPS} off
@@ -66,7 +66,7 @@
{% endfor %}
-WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
+WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ django_venv_dir }} python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
WSGIProcessGroup {{ vhost_servername }}
WSGIScriptAlias / {{ doc_root_dir
}}/airavata-django-portal/django_airavata/wsgi.py
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 6090cd119f..9f63307c97 100644
---
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -43,7 +43,7 @@
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver;
ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver;
-
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
@@ -60,7 +60,7 @@
Require all granted
-WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ doc_root_dir }}/venv python-path={{ doc_root_dir
}}/airavata-django-portal processes={{ django_wsgi_processes }} user={{ user }}
group={{ group }}
+WSGIDaemonProcess {{ vhost_servername }} display-name=%{GROUP}
python-home={{ django_venv_dir }} python-path={{ doc_root_dir
}}/airavata-dja
[airavata] branch master updated: Ansible: updating google analytics tracking id to GA4 one
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 7daac92d61 Ansible: updating google analytics tracking id to GA4 one
7daac92d61 is described below
commit 7daac92d614f396fdb54cc906f0212bc83c0a682
Author: Marcus Christie
AuthorDate: Mon Jun 26 16:55:09 2023 -0400
Ansible: updating google analytics tracking id to GA4 one
---
.../ansible/inventories/scigap/production/host_vars/simccs/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
index 86232af615..a94d7ccb3b 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
@@ -74,5 +74,5 @@ gateway_data_store_ssh_public_key: "ssh-rsa
B3NzaC1yc2EDAQABAAABAQDEuA1i
admin_emails: "[('SGRC', 'sgrc-iu-gr...@iu.edu'), ('Kevin Ellett',
'kmell...@indiana.edu'),('Ashley Douds', 'ado...@iu.edu')]"
portal_title: "SimCCS Portal"
-django_google_analytics_tracking_id: "UA-130065143-1"
+django_google_analytics_tracking_id: "G-WM162V9Q9X"
...
