You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/07/13 14:31:44 UTC

[airavata-django-portal] branch develop updated (87985ca -> 5c8005f)

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 87985ca  AIRAVATA-3383 Remove Sharing API service settings from config
     add 2137d83  AIRAVATA-3322 Pull the airavata-python-sdk from PyPI
     add c4e1683  AIRAVATA-3383 Long term we don't need SHARING_API settings, but for now they are needed for the portal to start up
     new b68fdc7  Merge branch 'staging' into develop
     new 5c8005f  AIRAVATA-3383 Removing unnecessary SHARING API settings

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:
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[airavata-django-portal] 02/02: AIRAVATA-3383 Removing unnecessary SHARING API settings

Posted by ma...@apache.org.
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 5c8005fea95ab5b54f80d21f3830d578daba6b6d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jul 13 10:31:09 2021 -0400

    AIRAVATA-3383 Removing unnecessary SHARING API settings
---
 .../auth/templates/django_airavata_auth/settings_local.py.template   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/django_airavata/apps/auth/templates/django_airavata_auth/settings_local.py.template b/django_airavata/apps/auth/templates/django_airavata_auth/settings_local.py.template
index 3d55dee..cdda4ce 100644
--- a/django_airavata/apps/auth/templates/django_airavata_auth/settings_local.py.template
+++ b/django_airavata/apps/auth/templates/django_airavata_auth/settings_local.py.template
@@ -77,11 +77,6 @@ PROFILE_SERVICE_HOST = '{{ PROFILE_SERVICE_HOST }}'
 PROFILE_SERVICE_PORT = {{ PROFILE_SERVICE_PORT }}
 PROFILE_SERVICE_SECURE = {{ PROFILE_SERVICE_SECURE }}
 
-# Sharing API Configuration
-SHARING_API_HOST = AIRAVATA_API_HOST
-SHARING_API_PORT = 7878
-SHARING_API_SECURE = False
-
 # Portal settings
 PORTAL_TITLE = '{{ PORTAL_TITLE }}'
 

[airavata-django-portal] 01/02: Merge branch 'staging' into develop

Posted by ma...@apache.org.
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 b68fdc7404c962a50a6e16076614406a38199ec7
Merge: 87985ca c4e1683
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jul 13 10:30:37 2021 -0400

    Merge branch 'staging' into develop

 .../auth/templates/django_airavata_auth/settings_local.py.template   | 5 +++++
 requirements.txt                                                     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc requirements.txt
index 339af43,54f6957..423312e
--- a/requirements.txt
+++ b/requirements.txt
@@@ -19,6 -19,7 +19,7 @@@ google-api-python-client==1.12.
  grpcio-tools==1.34.1
  grpcio==1.34.1
  
 -airavata-django-portal-sdk==1.1.dev3
 +airavata-django-portal-sdk==1.1.dev4
- -e git+https://github.com/apache/airavata.git@develop#egg=airavata-python-sdk&subdirectory=airavata-api/airavata-client-sdks/airavata-python-sdk
+ airavata-python-sdk==1.0.0
+ 
  -e "."