Revert "Upgrade to fixed pixetl"

This reverts commit 5f6f58b.

.github/workflows/terraform_build.yaml

@@ -21,7 +21,6 @@ jobs:
         project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
         coverage-reports: tests/cobertura.xml, tests_v2/cobertura.xml
 
-
     - name: Run CodeCOV action
       uses: codecov/codecov-action@v1
       with:
@@ -32,9 +31,8 @@ jobs:
         fail_ci_if_error: false
         verbose: false
 
-
     - name: Deploy production
-      if: success() && github.ref == 'refs/heads/master'
+      if: success() && (github.ref_name == 'master')
       env:
         ENV: production
         AWS_ACCESS_KEY_ID: ${{ secrets.aws_key_production }}
@@ -45,7 +43,7 @@ jobs:
         ./scripts/infra apply
 
     - name: Deploy staging
-      if: success() && github.ref == 'refs/heads/develop'
+      if: success() && (github.ref_name == 'develop')
       env:
         ENV: staging
         AWS_ACCESS_KEY_ID: ${{ secrets.aws_key_staging }}
@@ -56,7 +54,7 @@ jobs:
         ./scripts/infra apply
 
     - name: Deploy dev
-      if: success() && (! github.ref == 'refs/heads/master' && github.ref == 'refs/heads/develop')
+      if: success() && (github.ref_name != 'develop') && (github.ref_name != 'master')
       env:
         ENV: dev
         AWS_ACCESS_KEY_ID: ${{ secrets.aws_key_dev }}

.github/workflows/terraform_destroy_on_delete.yaml

@@ -4,7 +4,7 @@ on: [delete]
 
 jobs:
   build:
-    if: contains(github.event.ref_type, 'branch') &&  (! github.event.ref == 'master') && (! github.event.ref == 'develop')
+    if: contains(github.event.ref_type, 'branch') &&  (! contains(github.event.ref, 'master')) && (! contains(github.event.ref, 'develop'))
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1

.github/workflows/terraform_plan.yaml

@@ -9,16 +9,15 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Plan production
-      if: success() && github.base_ref == 'master'
+      if: success() && contains(github.base_ref, 'master')
       env:
         ENV: production
         AWS_ACCESS_KEY_ID: ${{ secrets.aws_key_production }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_production }}
         AWS_REGION: ${{ secrets.aws_region_production }}
       run: ./scripts/infra plan -w ${{ github.base_ref }}
-
     - name: Plan staging
-      if: success() && github.base_ref == 'develop'
+      if: success() && contains(github.base_ref, 'develop')
       env:
         ENV: staging
         AWS_ACCESS_KEY_ID: ${{ secrets.aws_key_staging }}

.gitignore

@@ -21,14 +21,7 @@ tests/cobertura.xml
 tests_v2/cobertura.xml
 
 # Terraform stuff
-**/.terraform/*
-
-# .tfstate files
-*.tfstate
-*.tfstate.*
-
-# .tfplan files
-*.tfplan
+terraform/*
 
 # Virtual Environments
 .venv*

.isort.cfg

@@ -2,4 +2,4 @@
 line_length = 88
 multi_line_output = 3
 include_trailing_comma = True
-known_third_party = _pytest,aenum,affine,aiohttp,alembic,async_lru,asyncpg,aws_utils,boto3,botocore,click,docker,errors,fastapi,fiona,gdal_utils,geoalchemy2,geojson,gfw_pixetl,gino,gino_starlette,google,httpx,httpx_auth,logger,logging_utils,moto,numpy,orjson,osgeo,pandas,pendulum,pglast,psutil,psycopg2,pydantic,pyproj,pytest,pytest_asyncio,rasterio,shapely,sqlalchemy,sqlalchemy_utils,starlette,tileputty,typer
+known_third_party = _pytest,aenum,affine,aiohttp,alembic,async_lru,asyncpg,aws_utils,boto3,botocore,click,docker,errors,fastapi,fiona,gdal_utils,geoalchemy2,geojson,gfw_pixetl,gino,gino_starlette,google,httpx,httpx_auth,logger,logging_utils,moto,numpy,orjson,osgeo,pandas,pendulum,pglast,psutil,psycopg2,pydantic,pyproj,pytest,pytest_asyncio,rasterio,retrying,shapely,sqlalchemy,sqlalchemy_utils,starlette,tileputty,typer

Pipfile

@@ -8,20 +8,18 @@ black = "*"
 detect-secrets = "*"
 docker = "*"
 flake8 = "*"
-geopandas = "*"  # Needed by pixetl in batch script test
 # Pixetl is already installed in the pixetl image that's run in Batch, this
 # is to enable tests to run in the test container:
 gfw_pixetl = {git = "https://github.com/wri/gfw_pixetl.git", ref = "develop"}
-moto = {version = "<5", extras = ["awslambda", "batch", "ec2", "s3", "secretsmanager"]}
+moto = {version = "*", extras = ["awslambda", "batch", "ec2", "s3"]}
 openapi_spec_validator = "*"
 pre-commit = "*"
 pytest = "*"
-pytest-asyncio = "<0.19"
+pytest-asyncio = "==0.18.3"
 pytest-cov = "*"
 pytest-timeout = "*"
 rasterio = "*"
-responses = "<0.16"
-retrying = "*"  # Needed by pixetl in batch script test
+responses = "~=0.15.0"
 
 [packages]
 aenum = "*"
@@ -30,7 +28,7 @@ aiohttp = "*"
 alembic = "*"
 arq = "*"
 async-lru = "*"
-asyncpg = "*"
+asyncpg = "<0.26"
 boto3 = "*"
 botocore = "*"
 email-validator = "*"
@@ -46,17 +44,18 @@ httpx-auth = "*"
 numpy = "*"
 orjson = "*"
 packaging = "*"
-pendulum = "<3"
+pendulum = "*"
 pglast = "<2"
 psutil = "*"
 psycopg2 = "*"
-pydantic = "<2"
 pyproj = "*"
 python-multipart = "*"
+retrying = "*"
 shapely = "*"
 sqlalchemy = "<1.4"
 sqlalchemy-utils = "*"
 starlette = "<0.15"
+pydantic = "~=1.9"
 typer = "*"
 uvicorn = {version = "*", extras = ["standard"]}