diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 22a9bb63..38249aef 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -30,7 +30,7 @@ jobs: - name: testing run: | - docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.6.8 sh dev-test.sh + # docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.6.8 sh dev-test.sh docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.8 sh dev-test.sh docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.9 sh dev-test.sh diff --git a/.github/workflows/test_development.yaml b/.github/workflows/test_development.yaml index f4577327..8fae94da 100644 --- a/.github/workflows/test_development.yaml +++ b/.github/workflows/test_development.yaml @@ -39,6 +39,6 @@ jobs: - name: testing run: | - docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.6.8 sh dev-test.sh + # docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.6.8 sh dev-test.sh docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.8 sh dev-test.sh docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.9 sh dev-test.sh diff --git a/.github/workflows/test_master.yaml b/.github/workflows/test_master.yaml index d457d82a..6676f309 100644 --- a/.github/workflows/test_master.yaml +++ b/.github/workflows/test_master.yaml @@ -37,6 +37,6 @@ jobs: - name: testing run: | - docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.6.8 sh dev-test.sh + # docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.6.8 sh dev-test.sh docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.8 sh dev-test.sh docker run --rm -v $(pwd):$(pwd) -w=$(pwd) python:3.9 sh dev-test.sh diff --git a/requirements.txt b/requirements.txt index 98202e8e..8fb7371d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ boto3==1.17.16 urllib3==1.26.5 cfn-flip==1.2.3 gitdb2==2.0.5 -GitPython==3.1.11 +GitPython==3.1.27 pymongo==3.10.0 attrs==19.1.0 pytest==4.0.1 diff --git a/setup.py b/setup.py index 6d6671c2..8eeb7226 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='prancer-basic', # also update the version in processor.__init__.py file - version='2.1.46', + version='2.1.47', description='Prancer Basic, http://prancer.io/', long_description=LONG_DESCRIPTION, license = "BSD", diff --git a/src/processor/__init__.py b/src/processor/__init__.py index 046368cb..b7873ee4 100644 --- a/src/processor/__init__.py +++ b/src/processor/__init__.py @@ -1,3 +1,3 @@ # Prancer Basic -__version__ = '2.1.46' +__version__ = '2.1.47' diff --git a/src/processor/connector/snapshot_google.py b/src/processor/connector/snapshot_google.py index 8200bdc2..220c0aa5 100644 --- a/src/processor/connector/snapshot_google.py +++ b/src/processor/connector/snapshot_google.py @@ -660,7 +660,7 @@ def populate_google_snapshot(snapshot, container=None): snapshot_dir = make_snapshots_dir(container) if snapshot_dir: store_snapshot(snapshot_dir, data) - + if 'masterSnapshotId' in node: snapshot_data[node['snapshotId']] = node['masterSnapshotId'] else: