Increase python version for integration test to 3.10 (#580)

skyplane-project · Sep 23, 2022 · e08242b · e08242b
1 parent ca02ac9
commit e08242b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 80 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -30,31 +30,24 @@ jobs:
           - azure:westus aws:us-west-1
           - gcp:us-west2-a azure:westus
           - azure:westus gcp:us-west2-a
-    timeout-minutes: 20
+    timeout-minutes: 40
     env:
       STRATEGY_UUID: itest-${{ github.run_id }}-${{ github.run_attempt }}-${{ strategy.job-index }}
     steps:
       - uses: actions/checkout@v1
-      - name: Set up Python 3.8
+      - name: Install poetry
+        run: pipx install poetry
+      - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}
-          restore-keys: |
-            poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}
+          python-version: "3.10"
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false
           poetry config virtualenvs.path ~/.virtualenvs
       - name: Install Dependencies
-        run: poetry install -E gateway -E solver -E aws -E azure -E gcp
+        run: poetry install -E aws -E azure -E gcp
         if: steps.cache.outputs.cache-hit != 'true'
       - id: 'auth'
         uses: 'google-github-actions/auth@v0'
@@ -83,20 +76,13 @@ jobs:
       STRATEGY_UUID: itest-d-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - uses: actions/checkout@v1
-      - name: Set up Python 3.8
+      - name: Install poetry
+        run: pipx install poetry
+      - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}
-          restore-keys: |
-            poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}
+          python-version: "3.10"
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -5,20 +5,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Install poetry
+        run: pipx install poetry
       - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
           python-version: "3.10"
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: poetry-lint-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
-          restore-keys: |
-            poetry-lint-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false
@@ -37,20 +30,13 @@ jobs:
         python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Install poetry
+        run: pipx install poetry
+      - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: poetry-unit-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-${{ matrix.python-version }}
-          restore-keys: |
-            poetry-unit-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-${{ matrix.python-version }}
+          python-version: "3.10"
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false
@@ -67,20 +53,13 @@ jobs:
     needs: test-unit
     steps:
       - uses: actions/checkout@v1
+      - name: Install poetry
+        run: pipx install poetry
       - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
           python-version: "3.10"
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: aws-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
-          restore-keys: |
-            aws-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false
@@ -101,22 +80,13 @@ jobs:
     needs: test-unit
     steps:
       - uses: actions/checkout@v1
+      - name: Install poetry
+        run: pipx install poetry
       - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
           python-version: "3.10"
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: |
-            ~/.virtualenvs
-            /var/cache/apt/archives
-          key: azure-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
-          restore-keys: |
-            azure-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false
@@ -140,20 +110,13 @@ jobs:
       STRATEGY_UUID: pytest-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - uses: actions/checkout@v1
+      - name: Install poetry
+        run: pipx install poetry
       - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
           python-version: "3.10"
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python3 - --version 1.2.1
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: gcp-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
-          restore-keys: |
-            gcp-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('pyproject.toml') }}-3.10
+          cache: "poetry"
       - name: Set Poetry config
         run: |
           poetry config virtualenvs.in-project false