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/08/18 14:16:44 UTC

[airavata] 04/04: Merge branch 'airavata-3302' 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 af0b722f8556cd25f047fecc749cd83d205f1fac
Merge: 8878d9c b800474
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 18 10:07:13 2021 -0400

    Merge branch 'airavata-3302' into develop

 .../api/server/handler/AiravataServerHandler.java  |  86 +++++++++++++++---
 .../airavata-python-sdk/setup.py                   |   2 +-
 .../core/repositories/AbstractRepository.java      |  15 ++++
 .../expcatalog/ExperimentSummaryRepository.java    | 100 +++++++++++++++++----
 .../ExperimentSummaryRepositoryTest.java           |  62 ++++++++++---
 5 files changed, 225 insertions(+), 40 deletions(-)

diff --cc airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py
index f57883c,e5af942..c0762d7
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py
@@@ -10,9 -10,9 +10,9 @@@ def read(fname)
  
  setup(
      name='airavata-python-sdk',
-     version='1.0.0',
+     version='1.0.1',
      packages=find_packages(),
 -    package_data={'transport': ['*.ini'], 'sample': ['*.pem']},
 +    package_data={'airavata_sdk.transport': ['*.ini'], 'airavata_sdk.samples.resources': ['*.pem']},
      url='http://airavata.com',
      license='Apache License 2.0',
      author='Airavata Developers',