diff options
| author | Lena Voytek <lena.voytek@canonical.com> | 2023-08-03 15:12:12 -0700 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2023-08-04 15:16:09 +0000 |
| commit | 115bd608600b6a9697877e2bb46dbfbc547e9d26 (patch) | |
| tree | d8452d8e0b25a0287ead801b74ee9a7664a287c5 | |
| parent | 7b3b5c0064103208f73759e985a43b5a289dd2a6 (diff) | |
| parent | 2aab36468207aea5543f110995f613aadd153a1d (diff) | |
1.5.8-1.1ubuntu1 (patches applied)applied/1.5.8-1.1ubuntu1applied/ubuntu/oracular-develapplied/ubuntu/oracularapplied/ubuntu/noble-proposedapplied/ubuntu/noble-develapplied/ubuntu/nobleapplied/ubuntu/mantic-proposedapplied/ubuntu/mantic-develapplied/ubuntu/manticapplied/ubuntu/devel
Imported using git-ubuntu import.
| -rw-r--r-- | ara/server/settings.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/use-tzlocal-name-api.patch | 32 | ||||
| -rw-r--r-- | setup.cfg | 2 |
6 files changed, 44 insertions, 3 deletions
diff --git a/ara/server/settings.py b/ara/server/settings.py index be65f17..b024c2a 100644 --- a/ara/server/settings.py +++ b/ara/server/settings.py @@ -213,7 +213,7 @@ AUTH_PASSWORD_VALIDATORS = [ ] USE_TZ = True -LOCAL_TIME_ZONE = tzlocal.get_localzone().zone +LOCAL_TIME_ZONE = tzlocal.get_localzone_name() TIME_ZONE = settings.get("TIME_ZONE", LOCAL_TIME_ZONE) # We do not currently support internationalization and localization, turn these diff --git a/debian/changelog b/debian/changelog index d70a78b..a623a3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-ara (1.5.8-1.1ubuntu1) mantic; urgency=medium + + * d/p/use-tzlocal-name-api.patch: Make ara compliant with the tzlocal 4.0 api + to make it compatible with Django 4.2 (LP: #2022089) + + -- Lena Voytek <lena.voytek@canonical.com> Thu, 03 Aug 2023 15:12:12 -0700 + python-ara (1.5.8-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 322a45f..a3d6f15 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: python-ara Section: python Priority: optional -Maintainer: Debian OpenStack <team+openstack@tracker.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org> Uploaders: Michal Arbet <michal.arbet@ultimum.io>, Build-Depends: diff --git a/debian/patches/series b/debian/patches/series index 9de7a20..2c04fbf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ install-missing-files.patch fix-non-dev-option-in-settings.patch +use-tzlocal-name-api.patch diff --git a/debian/patches/use-tzlocal-name-api.patch b/debian/patches/use-tzlocal-name-api.patch new file mode 100644 index 0000000..6222c39 --- /dev/null +++ b/debian/patches/use-tzlocal-name-api.patch @@ -0,0 +1,32 @@ +Description: Use the tzlocal 4.0+ api for getting the local timezone name + To make ara compatible with Django 4.2, tzlocal 4 must also be used. This + requires a single change where the call to tzlocal.get_localzone().zone is + replaced with the new function call tzlocal.get_localzone_name(). +Author: David Moreau Simard <moi@dmsimard.com> +Origin: upstream, https://github.com/ansible-community/ara/commit/07e7cd153896a6ae2266f9ce47adedc7541f047b +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-ara/+bug/2022089 +Last-Update: 2023-08-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/ara/server/settings.py ++++ b/ara/server/settings.py +@@ -199,7 +199,7 @@ def get_secret_key(): + ] + + USE_TZ = True +-LOCAL_TIME_ZONE = tzlocal.get_localzone().zone ++LOCAL_TIME_ZONE = tzlocal.get_localzone_name() + TIME_ZONE = settings.get("TIME_ZONE", LOCAL_TIME_ZONE) + + # We do not currently support internationalization and localization, turn these +--- a/setup.cfg ++++ b/setup.cfg +@@ -69,7 +69,7 @@ server= + # dynaconf dropped support for py35 at version 3.0.0: https://github.com/ansible-community/ara/issues/370 + dynaconf[yaml]>=3.0.0,!=3.1.3,<4.0.0;python_version>='3.6' + dynaconf[yaml]<3.0.0;python_version<'3.6' +- tzlocal<3.0 ++ tzlocal>=4.0 + whitenoise + pygments + postgresql= @@ -70,7 +70,7 @@ server= # dynaconf dropped support for py35 at version 3.0.0: https://github.com/ansible-community/ara/issues/370 dynaconf[yaml]>=3.0.0,!=3.1.3,<4.0.0;python_version>='3.6' dynaconf[yaml]<3.0.0;python_version<'3.6' - tzlocal<3.0 + tzlocal>=4.0 whitenoise pygments postgresql= |