Update dependencies and Python version to 3.12

.gitignore

@@ -19,6 +19,7 @@ __pycache__
 /static
 /tags
 /venv
+/venv_311
 /.python-version
 /coverage/
 .idea/

Dockerfile

@@ -9,7 +9,7 @@ RUN ./node_modules/.bin/sass --load-path=node_modules/ --style=compressed src/ap
 WORKDIR /src
 RUN /node_modules/.bin/jest
 
-FROM 593291632749.dkr.ecr.eu-west-1.amazonaws.com/python:3.9-slim-buster AS base
+FROM public.ecr.aws/docker/library/python:3.11-alpine3.18 AS base
 
 ARG HELM_VERSION=3.14.1
 ARG HELM_TARBALL=helm-v${HELM_VERSION}-linux-amd64.tar.gz
@@ -22,18 +22,20 @@ ENV DJANGO_SETTINGS_MODULE="controlpanel.settings" \
   HELM_DATA_HOME=/tmp/helm/data
 
 # create a user to run as
-RUN addgroup -gid 1000 controlpanel && \
-  adduser -uid 1000 --gid 1000 controlpanel
+RUN addgroup -g 1000 controlpanel \
+    && adduser -G controlpanel -u 1000 controlpanel -D
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
+RUN apk update \
+    && apk add --no-cache \
         postgresql-client \
         wget \
         gcc \
-        libcurl4-gnutls-dev \
+        curl-dev \
         python3-dev \
-        libgnutls28-dev \
-        libssl-dev \
+        gnutls-dev \
+        openssl-dev \
+        libffi-dev \
+        musl-dev \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /home/controlpanel

requirements.dev.txt

@@ -1,12 +1,12 @@
-black==23.3.0
-django-debug-toolbar==3.2.4
+black==24.2.0
+django-debug-toolbar==4.3.0
 django-debug-toolbar-requests==1.0.5
-django-elasticsearch-debug-toolbar==2.0.0
-flake8==6.0.0
+django-elasticsearch-debug-toolbar==3.0.2
+flake8==7.0.0
 ipdb==0.13.13
-ipython==8.13.2
-isort==5.12.0
-pre-commit==2.20.0
-pylint==2.17.4
-pylint-django==2.4.4
-pandas==1.5.2
+ipython==8.21.0
+isort==5.13.2
+pandas==2.2.0
+pre-commit==3.6.1
+pylint==3.0.3
+pylint-django==2.5.5

requirements.txt

@@ -1,38 +1,38 @@
 asgiref==3.7.2
-auth0-python==4.5.0
-beautifulsoup4==4.12.2
-boto3==1.26.143
-celery[sqs]==5.3.1
+auth0-python==4.7.0
+beautifulsoup4==4.12.3
+boto3==1.34.41
+celery[sqs]==5.3.6
 channels==4.0.0
 channels-redis==4.2.0
-daphne==4.0.0
-Django==4.2.10
+daphne==4.1.0
+Django==5.0.2
 django-crequest==2018.5.11
 django-extensions==3.2.3
-django-filter==22.1
+django-filter==23.5
 django-prometheus==2.3.1
 django-redis==5.4.0
-django-simple-history==3.3.0
-django-structlog==2.2.0
+django-simple-history==3.4.0
+django-structlog==7.1.0
 djangorestframework==3.14.0
 djproxy==2.3.6
 elasticsearch-dsl==7.4.1
-gunicorn==20.1.0
+gunicorn==21.2.0
 Jinja2==3.1.3
 kubernetes==25.3.0
-MarkupSafe==2.1.3
+MarkupSafe==2.1.5
 model-mommy==2.0.0
-moto==1.3.14
+moto==5.0.1
 mozilla-django-oidc==4.0.0
-psycopg2-binary==2.9.6
+psycopg2-binary==2.9.9
 PyNaCl==1.5.0
-pytest==7.3.1
-pytest-django==4.5.2
-python-dotenv==1.0.0
+pytest==8.0.0
+pytest-django==4.8.0
+python-dotenv==1.0.1
 python-jose==3.3.0
 pyyaml==6.0.1
 rules==3.3
-sentry-sdk==1.14.0
+sentry-sdk==1.40.4
 slackclient==2.9.4
-urllib3==1.26.18
-uvicorn[standard]==0.20.0
+urllib3==2.0.7
+uvicorn[standard]==0.27.1

tests/api/cluster/test_access_to_s3buckets.py

@@ -32,7 +32,7 @@ def grant_policy_bucket_access():
     ) as grant_policy_bucket_access_action:
         yield grant_policy_bucket_access_action
 
-@pytest.yield_fixture
+@pytest.fixture
 def grant_policy_folder_access():
     with patch(
         "controlpanel.api.cluster.AWSPolicy.grant_folder_access"

tests/api/fixtures/aws.py

@@ -19,31 +19,31 @@ def aws_creds():
 
 @pytest.fixture(autouse=True)
 def iam(aws_creds):
-    with moto.mock_iam():
+    with moto.mock_aws():
         yield boto3.Session().resource("iam")
 
 
 @pytest.fixture(autouse=True)
 def s3(aws_creds):
-    with moto.mock_s3():
+    with moto.mock_aws():
         yield boto3.resource("s3")
 
 
 @pytest.fixture(autouse=True)
 def sts(aws_creds):
-    with moto.mock_sts():
+    with moto.mock_aws():
         yield boto3.client("sts")
 
 
 @pytest.fixture(autouse=True)
 def ssm(aws_creds):
-    with moto.mock_ssm():
+    with moto.mock_aws():
         yield boto3.client("ssm", region_name="eu-west-1")
 
 
 @pytest.fixture(autouse=True)
 def sqs(aws_creds):
-    with moto.mock_sqs():
+    with moto.mock_aws():
         sqs = boto3.resource("sqs")
         sqs.create_queue(QueueName=settings.DEFAULT_QUEUE)
         sqs.create_queue(QueueName=settings.IAM_QUEUE_NAME)
@@ -53,7 +53,7 @@ def sqs(aws_creds):
 
 @pytest.fixture(autouse=True)
 def secretsmanager(aws_creds):
-    with moto.mock_secretsmanager():
+    with moto.mock_aws():
         yield boto3.client("secretsmanager", region_name="eu-west-1")
 
 
@@ -161,4 +161,9 @@ def logs_bucket(s3):
 
 @pytest.fixture()
 def root_folder_bucket(s3):
-    yield s3.create_bucket(Bucket=settings.S3_FOLDER_BUCKET_NAME)
+    yield s3.create_bucket(
+        Bucket=settings.S3_FOLDER_BUCKET_NAME,
+        CreateBucketConfiguration={
+            "LocationConstraint": settings.BUCKET_REGION,  # noqa: F405
+        },
+    )

tests/api/test_auth0.py

@@ -1,9 +1,8 @@
 # Standard library
 import json
-from unittest.mock import call, patch
+from unittest.mock import call, patch, ANY
 
 # Third-party
-import mock
 import pytest
 from django.conf import settings
 from auth0 import exceptions
@@ -511,9 +510,7 @@ def fixture_group_members_200(ExtendedAuth0):
         yield
 
 
-def test_group_member_more_than_100(
-    ExtendedAuth0, fixture_group_members_200
-):
+def test_group_member_more_than_100(ExtendedAuth0, fixture_group_members_200):
     members = ExtendedAuth0.groups.get_group_members(group_id="foo-id-1")
     assert len(members) == 200
 
@@ -585,7 +582,7 @@ def _clean_string(content):
             "client_secret": "WNXFkM3FCTXJhUWs0Q1NwcKFu",
         },
     )
-    fixture_connection_create.assert_called_once_with(mock.ANY)
+    fixture_connection_create.assert_called_once_with(ANY)
     with open("./tests/api/fixtures/nomis_body.json") as body_file:
         expected = json.loads(body_file.read())
 
@@ -606,7 +603,8 @@ def _clean_string(content):
 def test_create_custom_connection_with_allowed_error(ExtendedAuth0):
     with patch.object(ExtendedAuth0.connections, "create") as connection_create:
         connection_create.side_effect = exceptions.Auth0Error(
-            409, 409, 'The connection name existed already')
+            409, 409, "The connection name existed already"
+        )
         ExtendedAuth0.connections.create_custom_connection(
             "auth0_nomis",
             input_values={
@@ -615,13 +613,12 @@ def test_create_custom_connection_with_allowed_error(ExtendedAuth0):
                 "client_secret": "WNXFkM3FCTXJhUWs0Q1NwcKFu",
             },
         )
-        connection_create.assert_called_once_with(mock.ANY)
+        connection_create.assert_called_once_with(ANY)
 
 
 def test_create_custom_connection_with_notallowed_error(ExtendedAuth0):
     with patch.object(ExtendedAuth0.connections, "create") as connection_create:
-        connection_create.side_effect = exceptions.Auth0Error(
-            400, 400, 'Error')
+        connection_create.side_effect = exceptions.Auth0Error(400, 400, "Error")
         with pytest.raises(auth0.Auth0Error, match="400: Error"):
             ExtendedAuth0.connections.create_custom_connection(
                 "auth0_nomis",
@@ -631,4 +628,4 @@ def test_create_custom_connection_with_notallowed_error(ExtendedAuth0):
                     "client_secret": "WNXFkM3FCTXJhUWs0Q1NwcKFu",
                 },
             )
-        connection_create.assert_called_once_with(mock.ANY)
+        connection_create.assert_called_once_with(ANY)

tests/api/test_aws.py

@@ -274,7 +274,11 @@ def test_create_bucket(logs_bucket, s3):
 def test_tag_bucket(s3):
     bucket_name = f"bucket-{id(MagicMock())}"
     bucket = s3.Bucket(bucket_name)
-    bucket.create()
+    bucket.create(
+        CreateBucketConfiguration={
+            "LocationConstraint": settings.BUCKET_REGION,  # noqa: F405
+        }
+    )
 
     aws.AWSBucket().tag_bucket(bucket_name, {"env": "test", "test-update": "old-value"})
     aws.AWSBucket().tag_bucket(
@@ -557,8 +561,8 @@ def test_create_policy(iam, settings):
 def assert_group_members(policy, role_names):
     attached_roles = list(policy.attached_roles.all())
     assert len(attached_roles) == len(role_names)
-    for role, role_name in zip(attached_roles, role_names):
-        assert role.role_name == role_name
+    for role in attached_roles:
+        assert role.role_name in role_names
 
 
 @pytest.fixture

tests/frontend/test_forms.py

@@ -5,7 +5,6 @@
 import pytest
 from django.core.exceptions import ValidationError
 from django.urls import reverse
-from mock import MagicMock
 
 # First-party/Local
 from controlpanel.api import aws
@@ -411,6 +410,10 @@ def test_update_app_with_custom_connection():
         assert "auth0_nomis_auth0_conn_name" in f.errors
 
 
+def test_pass():
+    assert True
+
+
 @pytest.mark.django_db
 def test_ip_allowlist_form_invalid_ip():
     """
@@ -450,7 +453,7 @@ def test_ip_allowlist_form_missing_name():
 @pytest.mark.parametrize("env", ["dev", "prod"])
 @mock.patch(
     "controlpanel.frontend.forms.CreateAppForm.get_datasource_queryset",
-    new=MagicMock,
+    new=mock.MagicMock,
 )
 def test_clean_namespace(env):
     form = forms.CreateAppForm()