From f6a5d5073d2e69d0cd2589183128bb7c556c6dc4 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 29 Apr 2025 13:38:35 +0200 Subject: [PATCH] MT#62714 Latest Django release from 3.2 series > https://docs.djangoproject.com/en/3.2/releases/3.2.25/ > https://docs.djangoproject.com/en/3.2/releases/3.2.24/ > https://docs.djangoproject.com/en/3.2/releases/3.2.23/ > https://docs.djangoproject.com/en/3.2/releases/3.2.22/ > https://docs.djangoproject.com/en/3.2/releases/3.2.21/ > https://docs.djangoproject.com/en/3.2/releases/3.2.20/ > https://docs.djangoproject.com/en/3.2/releases/3.2.19/ * django-import-export: lock version to lower than 4.0 or we get an error > https://github.com/django-import-export/django-import-export/commit/745039381cc7c9f61281f4dc76df9f3b48e35df7 > value = datetime.datetime(2022, 6, 2, 10, 19, 28, tzinfo=) > datetime_format = '%Y-%m-%d %H:%M:%S' > > def format_datetime(value, datetime_format): > # handle correct formatting of dates > # see https://code.djangoproject.com/ticket/32738 > > format_ = django.utils.formats.sanitize_strftime_format(datetime_format) > E AttributeError: module 'django.utils.formats' has no attribute 'sanitize_strftime_format' > > /usr/local/lib/python3.11/dist-packages/import_export/widgets.py:25: AttributeError * t/Dockerfile: add missing iproute2 Some Makefile dev rules are using ``ip`` command Change-Id: I67463cae05dfbad763013319c0d28df3133e36a6 --- requirements/common.txt | 4 ++-- t/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/common.txt b/requirements/common.txt index 8ebdce0..2cd151f 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -1,5 +1,5 @@ celery -Django==3.2.18 +Django==3.2.25 django-admin-list-filters django-appconf django-assets @@ -8,7 +8,7 @@ django-celery-results django-crispy-forms==2.* django-extensions django-filter -django-import-export>=3.0 +django-import-export>=3.0,<4.0 django-jsonify django-structlog>=6.0 django-timezone-field diff --git a/t/Dockerfile b/t/Dockerfile index 692a665..2812afb 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -5,12 +5,12 @@ FROM docker.mgm.sipwise.com/sipwise-bookworm:latest # is updated with the current date. It will force refresh of all # of the base images and things like `apt-get update` won't be using # old cached versions when the Dockerfile is built. -ENV REFRESHED_AT 2024-03-11 +ENV REFRESHED_AT 2025-04-29 RUN apt-get update && apt-get install --assume-yes python3 python3-dev \ python3-pytest python3-pytest-pep8 \ python3-pytest-pylint python3-pytest-cov python3-junitxml \ - python3-pip python3-venv sqlite3 git tmux \ + python3-pip python3-venv sqlite3 git tmux iproute2 \ && apt-get clean # Get pip to download and install requirements: