From f779097c6b834ca1a5e6e44284f4baaabe2ae021 Mon Sep 17 00:00:00 2001 From: Tessa Alexander <1619343+asset-web@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:00:44 +0100 Subject: [PATCH] Update selenium; Update python packaging tools (#231) --- deploy/Dockerfile | 4 ++-- deploy/fabfile.py | 4 ++-- requirements/dev.txt | 7 ++++--- requirements/test.in | 4 ++-- requirements/test.txt | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 256c1dff..194c4148 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -2,8 +2,8 @@ FROM python:3.8.18-slim ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 -ENV PIP_VERSION='23.2.1' -ENV SETUPTOOLS_VERSION='68.1.2' +ENV PIP_VERSION='23.3' +ENV SETUPTOOLS_VERSION='68.2.2' ENV PIP_TOOLS_VERSION='7.3.0' # As per Centos installation ENV VE_VERSION='20.13.0' diff --git a/deploy/fabfile.py b/deploy/fabfile.py index e514f719..ee4ed054 100644 --- a/deploy/fabfile.py +++ b/deploy/fabfile.py @@ -21,8 +21,8 @@ # Tools not handled by pip-tools and/or requirements installs using pip # Also update tests/run-django-tests.sh -PIP_VERSION = '23.2.1' -SETUPTOOLS_VERSION = '68.1.2' +PIP_VERSION = '23.3' +SETUPTOOLS_VERSION = '68.2.2' PIP_TOOLS_VERSION = '7.3.0' diff --git a/requirements/dev.txt b/requirements/dev.txt index 752a13cc..f8140273 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -734,9 +734,9 @@ rq==1.14.1 \ # via # -r requirements/test.txt # django-rq -selenium==4.9.1 \ - --hash=sha256:3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e \ - --hash=sha256:82aedaa85d55bc861f4c89ff9609e82f6c958e2e1e3da3ffcc36703f21d3ee16 +selenium==4.14.0 \ + --hash=sha256:0d14b0d9842366f38fb5f8f842cf7c042bcfa062affc6a0a86e4d634bdd0fe54 \ + --hash=sha256:be9824a9354a7fe288e3fad9ceb6a9c65ddc7c44545d23ad0ebf4ce202b19893 # via -r requirements/test.txt six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ @@ -811,6 +811,7 @@ urllib3[socks]==1.26.18 \ # -r requirements/test.txt # requests # selenium + # urllib3 wcwidth==0.2.8 \ --hash=sha256:77f719e01648ed600dfa5402c347481c0992263b81a027344f3e1ba25493a704 \ --hash=sha256:8705c569999ffbb4f6a87c6d1b80f324bd6db952f5eb0b95bc07517f4c1813d4 diff --git a/requirements/test.in b/requirements/test.in index e7ef2566..fae3bfb9 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -5,5 +5,5 @@ csvvalidator>=1.2 pyscreenshot>=3.0 pyvirtualdisplay>=3.0 requests>=2.31.0 -selenium>=4.8.2,<4.10.0 -urllib3<=2.0 # https://github.com/urllib3/urllib3/issues/2168 \ No newline at end of file +selenium>=4.14.0 +urllib3<2.0 # https://github.com/urllib3/urllib3/issues/2168 \ No newline at end of file diff --git a/requirements/test.txt b/requirements/test.txt index 61cb2e3d..a403385c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -649,9 +649,9 @@ rq==1.14.1 \ # via # -r requirements/requirements.txt # django-rq -selenium==4.9.1 \ - --hash=sha256:3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e \ - --hash=sha256:82aedaa85d55bc861f4c89ff9609e82f6c958e2e1e3da3ffcc36703f21d3ee16 +selenium==4.14.0 \ + --hash=sha256:0d14b0d9842366f38fb5f8f842cf7c042bcfa062affc6a0a86e4d634bdd0fe54 \ + --hash=sha256:be9824a9354a7fe288e3fad9ceb6a9c65ddc7c44545d23ad0ebf4ce202b19893 # via -r requirements/test.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \