Merge pull request #1082 from golemfactory/ld/1081-integration-tests-…

…fail Bump poetry version for github workflows to 1.2.2
golemfactory · Jan 11, 2023 · 82b7049 · 82b7049
2 parents 39882e0 + bae941a
commit 82b7049
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml
@@ -14,9 +14,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: Gr1N/setup-poetry@v4
+      - uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.4
+          poetry-version: 1.2.2
       - run: poetry install
       - run: poetry run poe test
       - run: poetry run poe typecheck
@@ -33,9 +33,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: Gr1N/setup-poetry@v4
+      - uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.4
+          poetry-version: 1.2.2
       - name: Get git release tag
         run: echo "::set-output name=git-release-tag::yapapi $(git describe --tags)"
         id: git_describe
@@ -66,9 +66,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: Gr1N/setup-poetry@v4
+      - uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.4
+          poetry-version: 1.2.2
       - name: Retrieve the built package
         uses: actions/download-artifact@v2
         with:
@@ -90,9 +90,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: Gr1N/setup-poetry@v4
+      - uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.4
+          poetry-version: 1.2.2
       - name: Retrieve the built package
         uses: actions/download-artifact@v2
         with:

diff --git a/.github/workflows/goth-nightly.yml b/.github/workflows/goth-nightly.yml
@@ -49,9 +49,9 @@ jobs:
           python-version: '3.8.0'
 
       - name: Configure poetry
-        uses: Gr1N/setup-poetry@v4
+        uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.6
+          poetry-version: 1.2.2
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/goth.yml b/.github/workflows/goth.yml
@@ -25,9 +25,9 @@ jobs:
           python-version: '3.8.0'
 
       - name: Configure poetry
-        uses: Gr1N/setup-poetry@v4
+        uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.6
+          poetry-version: 1.2.2
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -32,9 +32,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: Gr1N/setup-poetry@v7
+      - uses: Gr1N/setup-poetry@v8
         with:
-          poetry-version: 1.1.13
+          poetry-version: 1.2.2
 
       - run: echo "::set-output name=ENABLE::1"
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -46,6 +46,7 @@ jobs:
         id: extended-checks-sphinx
 
       - run: poetry install
+        if: ${{ !steps.extended-checks-sphinx.outputs.ENABLE }}
       - run: poetry install -E docs
         if: ${{ steps.extended-checks-sphinx.outputs.ENABLE }}
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,9 +20,13 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.6.2"
+setuptools = [
+  { version = "*", python = ">=3.7" },
+  { version = "^59.0.0", python = ">=3.6.2, <3.7" },
+]
 aiohttp = "^3.6"
 aiohttp-sse-client = "^0.1.7"
-dataclasses = { version = "^0.8", python = ">=3.6, <3.7"}
+dataclasses = { version = "^0.8", python = ">=3.6, <3.7" }
 more-itertools = "^8.6.0"
 urllib3 = "^1.25.9"
 typing_extensions = "^3.10.0"
@@ -50,18 +54,22 @@ Deprecated = "^1.2.12"
 python-statemachine = "^0.8.0"
 
 # goth tests
-pexpect = {version = "^4.8.0", optional = true}
+pexpect = { version = "^4.8.0", optional = true }
 
 # Docs
 sphinx = { version = "^4.0.1", optional = true }
 sphinx-autodoc-typehints = { version = "^1.12.0", optional = true }
-sphinx-rtd-theme = { version = "^1.0.0", optional = true}
+sphinx-rtd-theme = { version = "^1.0.0", optional = true }
 
 [tool.poetry.extras]
 integration-tests = ['goth', 'pytest', 'pytest-asyncio', 'pexpect']
 docs = ['sphinx', 'sphinx-autodoc-typehints', 'sphinx-rtd-theme']
 
 [tool.poetry.dev-dependencies]
+pip = [
+  { version = "*", python = ">=3.7" },
+  { version = "^21.0.0", python = ">=3.6.2, <3.7" },
+]
 black = "^21.7b0"
 factory-boy = "^3.2.0"
 isort = "^5.10.1"