Commit 402f1280 authored by Yunhua Koglin's avatar Yunhua Koglin
Browse files

Merge remote-tracking branch 'origin/kogliny' into aws-chunk

parents a4533607 8ff3fc60
Pipeline #62741 failed with stages
in 18 minutes and 13 seconds
......@@ -23,8 +23,6 @@ opencensus-ext-logging
dask[distributed]==2021.7.2
fsspec
python-ulid
boto3==1.17.106
botocore==1.20.106
s3fs==2021.8.0
--extra-index-url \
https://community.opengroup.org/api/v4/projects/465/packages/pypi/simple/
......@@ -37,5 +35,5 @@ osdu-data-ecosystem-search>=0.3.2, <0.4
osdu-core-lib-python-ibm~=1.2.0
osdu-core-lib-python-gcp~=1.1.0
osdu-core-lib-python-azure~=1.2.1
osdu-core-lib-python-aws>=0.0.2, <0.1
osdu-core-lib-python-aws>=0.0.3, <0.1
osdu-core-lib-python~=1.1.0
\ No newline at end of file
......@@ -8,7 +8,7 @@
adal==1.2.7
# via azure-datalake-store
adlfs==2021.8.2
adlfs==0.7.7
# via osdu-core-lib-python-azure
aiobotocore==1.4.1
# via s3fs
......@@ -22,9 +22,9 @@ aiohttp==3.7.4.post0
# osdu-core-lib-python-gcp
aioitertools==0.8.0
# via aiobotocore
aioredis==2.0.0
aioredis==1.3.1
# via osdu-core-lib-python
anyio==3.3.0
anyio==3.2.1
# via httpcore
asgiref==3.4.1
# via uvicorn
......@@ -41,7 +41,7 @@ azure-common==1.1.27
# azure-keyvault-certificates
# azure-keyvault-keys
# azure-keyvault-secrets
azure-core==1.17.0
azure-core==1.16.0
# via
# adlfs
# azure-identity
......@@ -51,7 +51,7 @@ azure-core==1.17.0
# azure-storage-blob
azure-datalake-store==0.0.52
# via adlfs
azure-identity==1.6.1
azure-identity==1.6.0
# via
# adlfs
# osdu-core-lib-python-azure
......@@ -70,12 +70,9 @@ azure-storage-blob==12.8.1
backoff==1.11.1
# via -r requirements.in
boto3==1.17.106
# via
# -r requirements.in
# osdu-core-lib-python-ibm
# via osdu-core-lib-python-ibm
botocore==1.20.106
# via
# -r requirements.in
# aiobotocore
# boto3
# osdu-core-lib-python-ibm
......@@ -95,10 +92,8 @@ cffi==1.14.6
# cryptography
chardet==4.0.0
# via aiohttp
charset-normalizer==2.0.4
# via
# httpx
# requests
charset-normalizer==2.0.3
# via requests
click==8.0.1
# via
# -r requirements.in
......@@ -108,7 +103,7 @@ cloudpickle==1.6.0
# via
# dask
# distributed
cryptography==3.4.8
cryptography==3.4.7
# via
# -r requirements.in
# adal
......@@ -144,29 +139,29 @@ fsspec==2021.7.0
# s3fs
gcsfs==2021.7.0
# via osdu-core-lib-python-gcp
google-api-core[grpc]==1.31.2
google-api-core[grpc]==1.31.0
# via
# google-cloud-core
# google-cloud-monitoring
# google-cloud-trace
# opencensus
google-auth==1.35.0
google-auth==1.33.0
# via
# gcsfs
# google-api-core
# google-auth-oauthlib
# google-cloud-core
google-auth-oauthlib==0.4.5
google-auth-oauthlib==0.4.4
# via gcsfs
google-cloud-core==1.7.2
google-cloud-core==1.7.1
# via google-cloud-trace
google-cloud-monitoring==2.4.2
google-cloud-monitoring==0.36.0
# via opencensus-ext-stackdriver
google-cloud-trace==0.24.0
# via opencensus-ext-stackdriver
googleapis-common-protos==1.53.0
# via google-api-core
grpcio==1.39.0
grpcio==1.38.1
# via
# google-api-core
# opencensus-ext-ocagent
......@@ -177,9 +172,11 @@ h11==0.12.0
# uvicorn
heapdict==1.0.1
# via zict
hiredis==2.0.0
# via aioredis
httpcore==0.13.6
# via httpx
httpx==0.19.0
httpx==0.18.2
# via
# osdu-data-ecosystem-search
# osdu-data-ecosystem-storage
......@@ -201,7 +198,7 @@ jsonpath-ng==1.5.3
# via -r requirements.in
locket==0.2.1
# via partd
msal==1.14.0
msal==1.12.0
# via
# azure-identity
# msal-extensions
......@@ -221,7 +218,7 @@ multidict==5.1.0
# yarl
natsort==7.1.1
# via -r requirements.in
numpy==1.21.2
numpy==1.21.1
# via
# pandas
# pyarrow
......@@ -242,13 +239,13 @@ opencensus-ext-logging==0.1.0
# via -r requirements.in
opencensus-ext-ocagent==0.7.1
# via -r requirements.in
opencensus-ext-stackdriver==0.8.0
opencensus-ext-stackdriver==0.7.4
# via -r requirements.in
opencensus-proto==0.1.0
# via opencensus-ext-ocagent
osdu-core-lib-python==1.1.0
# via -r requirements.in
osdu-core-lib-python-aws==0.0.2
osdu-core-lib-python-aws==0.0.3
# via -r requirements.in
osdu-core-lib-python-azure==1.2.1
# via -r requirements.in
......@@ -266,7 +263,6 @@ packaging==21.0
# via
# dask
# google-api-core
# google-cloud-monitoring
pandas==1.2.4
# via -r requirements.in
partd==1.2.0
......@@ -275,13 +271,10 @@ ply==3.11
# via jsonpath-ng
portalocker==1.7.1
# via msal-extensions
proto-plus==1.19.0
# via google-cloud-monitoring
protobuf==3.17.3
# via
# google-api-core
# googleapis-common-protos
# proto-plus
psutil==5.8.0
# via
# distributed
......@@ -388,7 +381,6 @@ tornado==6.1
typing-extensions==3.10.0.0
# via
# aiohttp
# aioredis
# osdu-data-ecosystem-search
# osdu-data-ecosystem-storage
# pydantic
......@@ -396,7 +388,7 @@ urllib3==1.26.6
# via
# botocore
# requests
uvicorn==0.15.0
uvicorn==0.14.0
# via -r requirements.in
wrapt==1.12.1
# via aiobotocore
......
......@@ -42,11 +42,8 @@ source env/bin/activate
python3 -m pip install -r ./aws-test/build-aws/requirements.txt
rm -rf test-reports/
mkdir test-reports
echo $(pwd)
echo 'cd to integration\n'
cd integration
echo $(pwd)
acl_domain='example.com'
legal_tag='opendes-sdmstestlegaltag'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment