Merge pull request #170 from cloud-gov/fix-boto3-version

updated to latest boto3
cloud-gov · Feb 14, 2024 · 90e42c4 · 90e42c4
2 parents cf542c5 + c7b67b1
commit 90e42c4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 35 deletions.
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -92,7 +92,7 @@ jobs:
       text: |
         :x: FAILED to deploy external-domain-broker-migrator on development
         <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|View build details>
-      channel: ((slack-channel))
+      channel: ((slack-failure-channel))
       username: ((slack-username))
       icon_url: ((slack-icon-url))
   on_success:
@@ -101,7 +101,7 @@ jobs:
       text: |
         :white_check_mark: Successfully deployed external-domain-broker-migrator on development
         <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|View build details>
-      channel: ((slack-channel))
+      channel: ((slack-success-channel))
       username: ((slack-username))
       icon_url: ((slack-icon-url))
 
@@ -149,7 +149,7 @@ jobs:
       text: |
         :x: FAILED to deploy external-domain-broker-migrator on staging
         <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|View build details>
-      channel: ((slack-channel))
+      channel: ((slack-failure-channel))
       username: ((slack-username))
       icon_url: ((slack-icon-url))
   on_success:
@@ -158,7 +158,7 @@ jobs:
       text: |
         :white_check_mark: Successfully deployed external-domain-broker-migrator on staging
         <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|View build details>
-      channel: ((slack-channel))
+      channel: ((slack-success-channel))
       username: ((slack-username))
       icon_url: ((slack-icon-url))
 
@@ -207,7 +207,7 @@ jobs:
       text: |
         :x: FAILED to deploy external-domain-broker-migrator on production
         <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|View build details>
-      channel: ((slack-channel))
+      channel: ((slack-failure-channel))
       username: ((slack-username))
       icon_url: ((slack-icon-url))
   on_success:
@@ -216,7 +216,7 @@ jobs:
       text: |
         :white_check_mark: Successfully deployed external-domain-broker-migrator on production
         <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|View build details>
-      channel: ((slack-channel))
+      channel: ((slack-success-channel))
       username: ((slack-username))
       icon_url: ((slack-icon-url))
 

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM python:3.8-slim as base
+FROM python:3.9-slim as base
 
 # When building locally, these should be set to your UID/GID.  That way, any
 # files written to the $PWD mount will be owned by you.  This is not
@@ -59,8 +59,11 @@ RUN mkdir -p "$PGDATA" \
 
 ENV POSTGRES_HOST_AUTH_METHOD=trust
 
+RUN echo "Installing latest piptools" && \
+pip install --upgrade pip && \
+pip install pip-tools
+
 # Install local python packages
-RUN pip install --upgrade pip
 COPY pip-tools/dev-requirements.txt ./pip-tools/
 RUN pip install -r pip-tools/dev-requirements.txt
 

diff --git a/docker/update-requirements-txt b/docker/update-requirements-txt
@@ -4,13 +4,13 @@ set -euo pipefail
 
 export CUSTOM_COMPILE_COMMAND="./dev update-requirements"
 echo "Compiling requirements.txt"
-pip-compile \
+python -m piptools compile \
   --quiet \
   --output-file=requirements.txt \
   pip-tools/requirements.in
 
 echo "Compiling dev-requirements.txt"
-pip-compile \
+python -m piptools compile \
   --quiet \
   --output-file=pip-tools/dev-requirements.txt \
   pip-tools/dev-requirements.in
diff --git a/pip-tools/dev-requirements.txt b/pip-tools/dev-requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    ./dev update-requirements
 #
@@ -21,13 +21,15 @@ attrs==21.2.0
     #   pytest
 black==21.7b0
     # via -r pip-tools/dev-requirements.in
-boto3==1.18.23
+boto3==1.34.39
     # via -r pip-tools/../requirements.txt
-botocore==1.21.23
+botocore==1.34.39
     # via
     #   -r pip-tools/../requirements.txt
     #   boto3
     #   s3transfer
+build==1.0.3
+    # via pip-tools
 certifi==2021.5.30
     # via
     #   -r pip-tools/../requirements.txt
@@ -70,7 +72,7 @@ furl==2.1.2
     #   cfenv
 gprof2dot==2021.2.21
     # via pytest-profiling
-greenlet==1.1.1
+greenlet==3.0.3
     # via
     #   -r pip-tools/../requirements.txt
     #   sqlalchemy
@@ -79,6 +81,8 @@ idna==3.2
     #   -r pip-tools/../requirements.txt
     #   requests
     #   yarl
+importlib-metadata==7.0.1
+    # via build
 iniconfig==1.1.1
     # via pytest
 jmespath==0.10.0
@@ -108,20 +112,20 @@ orderedmultidict==1.0.1
     #   -r pip-tools/../requirements.txt
     #   furl
 packaging==21.0
-    # via pytest
+    # via
+    #   build
+    #   pytest
 pathspec==0.9.0
     # via black
-pep517==0.11.0
-    # via pip-tools
-pip-tools==6.2.0
+pip-tools==7.3.0
     # via -r pip-tools/dev-requirements.in
 pluggy==0.13.1
     # via pytest
 polling2==0.4.6
     # via
     #   -r pip-tools/../requirements.txt
     #   cloudfoundry-client
-protobuf==3.17.3
+protobuf==3.20.0
     # via
     #   -r pip-tools/../requirements.txt
     #   cloudfoundry-client
@@ -139,6 +143,8 @@ pyflakes==2.3.1
     # via flake8
 pyparsing==2.4.7
     # via packaging
+pyproject-hooks==1.0.0
+    # via build
 pytest==6.2.4
     # via
     #   -r pip-tools/dev-requirements.in
@@ -171,7 +177,7 @@ requests==2.26.0
     #   requests-mock
 requests-mock==1.9.3
     # via -r pip-tools/dev-requirements.in
-s3transfer==0.5.0
+s3transfer==0.10.0
     # via
     #   -r pip-tools/../requirements.txt
     #   boto3
@@ -182,7 +188,6 @@ six==1.16.0
     #   -r pip-tools/../requirements.txt
     #   furl
     #   orderedmultidict
-    #   protobuf
     #   pytest-profiling
     #   python-dateutil
     #   requests-mock
@@ -199,7 +204,9 @@ toml==0.10.2
 tomli==1.2.1
     # via
     #   black
-    #   pep517
+    #   build
+    #   pip-tools
+    #   pyproject-hooks
 typing-extensions==3.10.0.0
     # via
     #   -r pip-tools/../requirements.txt
@@ -217,10 +224,12 @@ websocket-client==0.54.0
     #   cloudfoundry-client
 wheel==0.37.0
     # via pip-tools
-yarl==1.6.3
+yarl==1.9.4
     # via
     #   -r pip-tools/../requirements.txt
     #   aiohttp
+zipp==3.17.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 88
-target-version = ['py36', 'py37', 'py38']
+target-version = ['py39']
 include = '\.pyi?$'
 exclude = '''
 /(

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    ./dev update-requirements
 #
@@ -10,9 +10,9 @@ async-timeout==3.0.1
     # via aiohttp
 attrs==21.2.0
     # via aiohttp
-boto3==1.18.23
+boto3==1.34.39
     # via -r pip-tools/requirements.in
-botocore==1.21.23
+botocore==1.34.39
     # via
     #   boto3
     #   s3transfer
@@ -36,7 +36,7 @@ environs==9.3.3
     # via -r pip-tools/requirements.in
 furl==2.1.2
     # via cfenv
-greenlet==1.1.1
+greenlet==3.0.3
     # via sqlalchemy
 idna==3.2
     # via
@@ -58,7 +58,7 @@ orderedmultidict==1.0.1
     # via furl
 polling2==0.4.6
     # via cloudfoundry-client
-protobuf==3.17.3
+protobuf==3.20.0
     # via cloudfoundry-client
 psycopg2==2.9.1
     # via -r pip-tools/requirements.in
@@ -74,15 +74,14 @@ requests==2.26.0
     # via
     #   cloudfoundry-client
     #   oauth2-client
-s3transfer==0.5.0
+s3transfer==0.10.0
     # via boto3
 schedule==1.1.0
     # via -r pip-tools/requirements.in
 six==1.16.0
     # via
     #   furl
     #   orderedmultidict
-    #   protobuf
     #   python-dateutil
     #   sqlalchemy-utils
     #   websocket-client
@@ -100,5 +99,5 @@ urllib3==1.26.6
     #   requests
 websocket-client==0.54.0
     # via cloudfoundry-client
-yarl==1.6.3
+yarl==1.9.4
     # via aiohttp
diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-3.8.x
+3.9.x