Merge pull request #19 from NHSDigital/mm-mesh-1478-mesh-code-splitting

mesh-1478: use poetry 1.5.1

Author: matt-mercer

.github/workflows/merge-develop.yml

@@ -20,8 +20,14 @@ jobs:
         with:
           python-version: "3.8"
 
-      - name: install poetry
-        run: make install-poetry
+      - name: setup poetry
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: 1.5.1
+
+      - name: add poetry plugins
+        run: |
+          poetry self add "poetry-dynamic-versioning[plugin]"
 
       - name: cache virtualenv
         uses: actions/cache@v3
@@ -51,14 +57,14 @@ jobs:
           thresholdAll: 0.54
 
       - name: setup java
-        if: success() || failure()
+        if: github.actor!= 'dependabot[bot]' && (success() || failure())
         uses: actions/setup-java@v3
         with:
           distribution: "corretto"
           java-version: "17"
 
       - name: provision sonar-scanner
-        if: success() || failure()
+        if: github.actor!= 'dependabot[bot]' && (success() || failure())
         run: |
           export SONAR_VERSION="4.7.0.2747"
           wget -q "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}.zip" -O sonar-scanner.zip
@@ -67,7 +73,7 @@ jobs:
           scripts/sonar_tests.py
 
       - name: run sonar scan
-        if: success() || failure()
+        if: github.actor!= 'dependabot[bot]' && (success() || failure())
         run: |
           PATH="$PWD/sonar-scanner/bin:$PATH"
           sonar-scanner
@@ -89,7 +95,7 @@ jobs:
 
   publish:
     runs-on: ubuntu-latest
-    if: github.repository == 'NHSDigital/nhs-aws-helpers' && !contains(github.event.head_commit.message, 'tag release version:')
+    if: github.repository == 'NHSDigital/nhs-aws-helpers' && github.actor!= 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -106,8 +112,14 @@ jobs:
         with:
           python-version: "3.8"
 
-      - name: install poetry
-        run: make install-poetry
+      - name: setup poetry
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: 1.5.1
+
+      - name: add poetry plugins
+        run: |
+          poetry self add "poetry-dynamic-versioning[plugin]"
 
       - name: poetry build
         run: |

.github/workflows/pull-request.yml

@@ -97,8 +97,14 @@ jobs:
         with:
           python-version: "3.8"
 
-      - name: install poetry
-        run: make install-poetry
+      - name: setup poetry
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: 1.5.1
+
+      - name: add poetry plugins
+        run: |
+          poetry self add "poetry-dynamic-versioning[plugin]"
 
       - name: cache virtualenv
         uses: actions/cache@v3
@@ -131,14 +137,14 @@ jobs:
           thresholdAll: 0.54
 
       - name: setup java
-        if: success() || failure()
+        if: github.actor!= 'dependabot[bot]' && (success() || failure())
         uses: actions/setup-java@v3
         with:
           distribution: "corretto"
           java-version: "17"
 
       - name: provision sonar-scanner
-        if: success() || failure()
+        if: github.actor!= 'dependabot[bot]' && (success() || failure())
         run: |
           export SONAR_VERSION="4.7.0.2747"
           wget -q "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_VERSION}.zip" -O sonar-scanner.zip
@@ -147,7 +153,7 @@ jobs:
           scripts/sonar_tests.py
 
       # - name: run sonar scan
-      #   if: success() || failure()
+      #   if: github.actor!= 'dependabot[bot]' && (success() || failure())
       #   run: |
       #     PATH="$PWD/sonar-scanner/bin:$PATH"
       #     if [[ "${{ github.event_name }}" == "pull_request" ]]; then
@@ -162,7 +168,7 @@ jobs:
 
 
       - name: archive reports
-        if: success() || failure()
+        if: github.actor!= 'dependabot[bot]' && (success() || failure())
         uses: actions/upload-artifact@v3
         with:
           name: reports
@@ -209,8 +215,14 @@ jobs:
         with:
           python-version: "3.8"
 
-      - name: install poetry
-        run: make install-poetry
+      - name: setup poetry
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: 1.5.1
+
+      - name: add poetry plugins
+        run: |
+          poetry self add "poetry-dynamic-versioning[plugin]"
 
       - name: cache virtualenv
         uses: actions/cache@v3

.tool-versions

@@ -1,2 +1,2 @@
-poetry 1.3.2
+poetry 1.5.1
 python 3.8.12 3.9.12 3.10.12

Makefile

@@ -47,11 +47,6 @@ install:
 install-ci:
 	poetry install --without local --sync
 
-install-poetry:
-	python3 -m pip install --user --upgrade pip && \
-	python3 -m pip install --user poetry==1.3.2 && \
-	poetry self add "poetry-dynamic-versioning[plugin]"
-
 update:
 	poetry update