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:45 UTC

[airavata-django-portal] 01/02: Merge branch 'staging' 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 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 "."