#82: Remove setup.py and update poetry to 1.4.0 (#84)

* Removed setup.py
* Updated poetry to 1.4.0 and introduced composite action for it
* Pinned ITDE to version 1.6.0 

Co-authored-by: Christoph Pirkl <[email protected]>

.github/actions/prepare_poetry_env/action.yml

@@ -0,0 +1,19 @@
+name: 'Prepare Poetry environment'
+description: 'This composite actions checks out out the project, installs Poetry, and install the project in the Poetry environment'
+inputs:
+  python-version:
+    description: 'The Python version to use'
+    required: true
+    default: '3.8'
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-python@v2
+      with:
+        python-version: ${{ inputs.python-version }}
+    - uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: 1.4.0
+    - name: Poetry install
+      run: poetry install
+      shell: bash

.github/workflows/build.yaml

@@ -13,16 +13,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.2.0
-      - name: Install Poetry
-        run: poetry install
+
+      - name: Setup Python & Poetry Environment
+        uses: ./.github/actions/prepare_poetry_env
+
       - name: Build Poetry
         run: poetry build
+
       - name: Install project whl
         run: pip install dist/*.whl
 

.github/workflows/language_container.yaml

@@ -10,19 +10,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.2.0
+
+      - name: Setup Python & Poetry Environment
+        uses: ./.github/actions/prepare_poetry_env
+
       - name: Build language container
         run: ./build_language_container.sh
+
       - name: Archive language container
         uses: actions/upload-artifact@v2
         with:
           name: exasol_sagemaker_extension_container
           path: .build_output/cache/exports/*.tar.gz*
+
       - name: Archive language container build logs
         uses: actions/upload-artifact@v2
         with:

.github/workflows/release_droid_upload_github_release_assets.yml

@@ -17,16 +17,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - uses: abatilo/[email protected]
-        with:
-          poetry-version: 1.2.0
-      - name: Install Poetry
-        run: poetry install
+
+      - name: Setup Python & Poetry Environment
+        uses: ./.github/actions/prepare_poetry_env
+
       - name: Build Poetry
         run: poetry build
+
       - name: Install project whl
         run: pip install dist/*.whl
 

ci-isolation/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>ci-isolation-aws</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.1</version>
         </dependency>
     </dependencies>
 </project>

ci-isolation/src/main/java/com/exasol/adapter/document/files/ciisolation/CiIsolationApp.java

@@ -2,6 +2,7 @@
 
 import com.exasol.ciisolation.aws.PolicyReader;
 import com.exasol.ciisolation.aws.ciuser.CiUserStack;
+import com.exasol.ciisolation.aws.ciuser.CiUserStack.CiUserStackProps;
 
 import software.amazon.awscdk.App;
 
@@ -12,10 +13,11 @@ public class CiIsolationApp {
     public static void main(final String[] args) {
         final App app = new App();
         final PolicyReader policyReader = new PolicyReader();
-        new CiUserStack(app, CiUserStack.CiUserStackProps.builder().projectName("exasol-sagemaker-extension")
+        CiUserStackProps props = CiUserStack.CiUserStackProps.builder().projectName("exasol-sagemaker-extension")
                 .addRequiredPermissions(
                     policyReader.readPolicyFromResources("s3-access.json"),
-                    policyReader.readPolicyFromResources("sagemaker-access.json")).build());
+                    policyReader.readPolicyFromResources("sagemaker-access.json")).build();
+        new CiUserStack(app, props);
         app.synth();
     }
 }

githooks/pre-commit

@@ -7,7 +7,6 @@ REPO_DIR=$(git rev-parse --show-toplevel)
 GITHOOKS_PATH="$REPO_DIR/githooks"
 pushd "$REPO_DIR"
 bash "$GITHOOKS_PATH/prohibit_commit_to_main.sh"
-bash "$GITHOOKS_PATH/update_setup_py.sh"
 popd
 
 

pyproject.toml

@@ -22,7 +22,8 @@ include = ["lua", "resources", "deployment"]
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
 pandas = ">=1.4.2,<2.0.0"
-boto = "^2.49.0"
+boto3 = "1.26.163"
+botocore = "1.29.163"
 protobuf = ">=3.1,<=3.20.0"
 sagemaker = "^2.59.1"
 pyexasol = "^0.24.0"

scripts/setup_integration_test.sh

@@ -20,7 +20,7 @@ function install_localstack {
 function checkout_exasol_test_container {
   cnt_func=$((cnt_func+1))
   echo -e "${YEL} Step-$cnt_func: ${GRA} Checkout Exasol test container ${NC}"
-   git clone https://github.com/exasol/integration-test-docker-environment.git
+   git clone --branch 1.6.0 https://github.com/exasol/integration-test-docker-environment.git
 }
 
 function spawn_exasol_environment {