* [gentoo-commits] repo/gentoo:master commit in: dev-python/django-configurations/, dev-python/django-configurations/files/
@ 2022-06-13 8:17 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-06-13 8:17 UTC (permalink / raw
To: gentoo-commits
commit: dff7b951811dde55af59852b78639b458e0539db
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 07:58:56 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 08:17:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff7b951
dev-python/django-configurations: Fix failing tests
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../django-configurations-2.3.2.ebuild | 4 ++
.../files/django-configurations-2.3.2-test.patch | 45 ++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/dev-python/django-configurations/django-configurations-2.3.2.ebuild b/dev-python/django-configurations/django-configurations-2.3.2.ebuild
index b8bbfbdabaea..00b555a25889 100644
--- a/dev-python/django-configurations/django-configurations-2.3.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.3.2.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+PATCHES=(
+ "${FILESDIR}"/${P}-test.patch
+)
+
python_test() {
local -x DJANGO_SETTINGS_MODULE=tests.settings.main
local -x DJANGO_CONFIGURATION=Test
diff --git a/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch b/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch
new file mode 100644
index 000000000000..19787102920a
--- /dev/null
+++ b/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch
@@ -0,0 +1,45 @@
+diff --git a/tests/test_values.py b/tests/test_values.py
+index 2547e50..2f1170b 100644
+--- a/tests/test_values.py
++++ b/tests/test_values.py
+@@ -2,6 +2,7 @@ import decimal
+ import os
+ from contextlib import contextmanager
+
++from django import VERSION as DJANGO_VERSION
+ from django.test import TestCase
+ from django.core.exceptions import ImproperlyConfigured
+
+@@ -411,6 +412,7 @@ class ValueTests(TestCase):
+ 'EMAIL_HOST_PASSWORD': 'password',
+ 'EMAIL_HOST_USER': 'user@domain.com',
+ 'EMAIL_PORT': 587,
++ 'EMAIL_TIMEOUT': None,
+ 'EMAIL_USE_SSL': False,
+ 'EMAIL_USE_TLS': True})
+ with env(EMAIL_URL='console://'):
+@@ -421,6 +423,7 @@ class ValueTests(TestCase):
+ 'EMAIL_HOST_PASSWORD': None,
+ 'EMAIL_HOST_USER': None,
+ 'EMAIL_PORT': None,
++ 'EMAIL_TIMEOUT': None,
+ 'EMAIL_USE_SSL': False,
+ 'EMAIL_USE_TLS': False})
+ with env(EMAIL_URL='smtps://user@domain.com:password@smtp.example.com:wrong'): # noqa: E501
+@@ -429,7 +432,7 @@ class ValueTests(TestCase):
+ def test_cache_url_value(self):
+ cache_setting = {
+ 'default': {
+- 'BACKEND': 'django_redis.cache.RedisCache',
++ 'BACKEND': 'django_redis.cache.RedisCache' if DJANGO_VERSION[0] < 4 else 'django.core.cache.backends.redis.RedisCache',
+ 'LOCATION': 'redis://host:6379/1',
+ }
+ }
+@@ -503,6 +506,7 @@ class ValueTests(TestCase):
+ 'EMAIL_HOST_PASSWORD': 'password',
+ 'EMAIL_HOST_USER': 'user@domain.com',
+ 'EMAIL_PORT': 587,
++ 'EMAIL_TIMEOUT': None,
+ 'EMAIL_USE_SSL': False,
+ 'EMAIL_USE_TLS': True
+ })
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/django-configurations/, dev-python/django-configurations/files/
@ 2022-10-03 6:43 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2022-10-03 6:43 UTC (permalink / raw
To: gentoo-commits
commit: 0f180297460aae8e4dfd53c5714be7543aecf454
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 06:43:13 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 06:43:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f180297
dev-python/django-configurations: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/django-configurations/Manifest | 1 -
.../django-configurations-2.3.2.ebuild | 51 ----------------------
.../files/django-configurations-2.3.2-test.patch | 45 -------------------
3 files changed, 97 deletions(-)
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index 1fee3c094acf..290a53ddecff 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,2 +1 @@
-DIST django-configurations-2.3.2.gh.tar.gz 38475 BLAKE2B 2b3c583e665a08a46bc0ca0c52ae4326fbdfb794d102deecbd13f953e8b6f3fd39b3b747c591fc9717c6a0792258cdb9041de53e71db2034de1a31ddf5bfc0ea SHA512 4cb5a7b284a0025ba93b32e158fb65b57e66230938181b921a1b1264848113b697eb45ac6ad2fc4f26f3bc29ea5f77acbfd5307b20ef2d385e29c2c1746295b3
DIST django-configurations-2.4.gh.tar.gz 38563 BLAKE2B a454cc492354c1b969a1b0389ccb21088e99af17b5056ae514b36b5c2fd7391368437093d1a075814dfb8e15ec8ce3ec3c5269d5c867b4a03a5269a533826a31 SHA512 de9793c5fce869ef77e4396dd5ea45fc57728d702383885599d3a08b16e37e0e425258aacd671ac78592df813c8fa3a08b33ad9410843f7d7976589da33592ca
diff --git a/dev-python/django-configurations/django-configurations-2.3.2.ebuild b/dev-python/django-configurations/django-configurations-2.3.2.ebuild
deleted file mode 100644
index 65cfca8e9dc9..000000000000
--- a/dev-python/django-configurations/django-configurations-2.3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A helper for organizing Django settings"
-HOMEPAGE="
- https://pypi.org/project/django-configurations/
- https://github.com/jazzband/django-configurations/
- https://django-configurations.readthedocs.io/
-"
-SRC_URI="
- https://github.com/jazzband/django-configurations/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/django[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/django-cache-url[${PYTHON_USEDEP}]
- dev-python/dj-database-url[${PYTHON_USEDEP}]
- dev-python/dj-email-url[${PYTHON_USEDEP}]
- dev-python/dj-search-url[${PYTHON_USEDEP}]
- )
-"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-PATCHES=(
- "${FILESDIR}"/${P}-test.patch
-)
-
-python_test() {
- local -x DJANGO_SETTINGS_MODULE=tests.settings.main
- local -x DJANGO_CONFIGURATION=Test
- PYTHONPATH=. django-cadmin test -v2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch b/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch
deleted file mode 100644
index 19787102920a..000000000000
--- a/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/tests/test_values.py b/tests/test_values.py
-index 2547e50..2f1170b 100644
---- a/tests/test_values.py
-+++ b/tests/test_values.py
-@@ -2,6 +2,7 @@ import decimal
- import os
- from contextlib import contextmanager
-
-+from django import VERSION as DJANGO_VERSION
- from django.test import TestCase
- from django.core.exceptions import ImproperlyConfigured
-
-@@ -411,6 +412,7 @@ class ValueTests(TestCase):
- 'EMAIL_HOST_PASSWORD': 'password',
- 'EMAIL_HOST_USER': 'user@domain.com',
- 'EMAIL_PORT': 587,
-+ 'EMAIL_TIMEOUT': None,
- 'EMAIL_USE_SSL': False,
- 'EMAIL_USE_TLS': True})
- with env(EMAIL_URL='console://'):
-@@ -421,6 +423,7 @@ class ValueTests(TestCase):
- 'EMAIL_HOST_PASSWORD': None,
- 'EMAIL_HOST_USER': None,
- 'EMAIL_PORT': None,
-+ 'EMAIL_TIMEOUT': None,
- 'EMAIL_USE_SSL': False,
- 'EMAIL_USE_TLS': False})
- with env(EMAIL_URL='smtps://user@domain.com:password@smtp.example.com:wrong'): # noqa: E501
-@@ -429,7 +432,7 @@ class ValueTests(TestCase):
- def test_cache_url_value(self):
- cache_setting = {
- 'default': {
-- 'BACKEND': 'django_redis.cache.RedisCache',
-+ 'BACKEND': 'django_redis.cache.RedisCache' if DJANGO_VERSION[0] < 4 else 'django.core.cache.backends.redis.RedisCache',
- 'LOCATION': 'redis://host:6379/1',
- }
- }
-@@ -503,6 +506,7 @@ class ValueTests(TestCase):
- 'EMAIL_HOST_PASSWORD': 'password',
- 'EMAIL_HOST_USER': 'user@domain.com',
- 'EMAIL_PORT': 587,
-+ 'EMAIL_TIMEOUT': None,
- 'EMAIL_USE_SSL': False,
- 'EMAIL_USE_TLS': True
- })
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/django-configurations/, dev-python/django-configurations/files/
@ 2024-06-19 17:21 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-06-19 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 84f1bd8c629d9ed7be04d69425d1c83d0f3c132c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 16:55:08 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 17:21:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f1bd8c
dev-python/django-configurations: Fix tests
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../django-configurations/django-configurations-2.5.1.ebuild | 6 ++++++
.../files/django-configurations-2.5.1-test.patch | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/dev-python/django-configurations/django-configurations-2.5.1.ebuild b/dev-python/django-configurations/django-configurations-2.5.1.ebuild
index 86eac772cff2..f04a60f99ea5 100644
--- a/dev-python/django-configurations/django-configurations-2.5.1.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.5.1.ebuild
@@ -37,6 +37,12 @@ BDEPEND="
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+PATCHES=(
+ # Update for dj-database-url == 2.2.0
+ # https://github.com/jazzband/django-configurations/issues/387
+ "${FILESDIR}/${P}-test.patch"
+)
+
python_test() {
local -x DJANGO_SETTINGS_MODULE=tests.settings.main
local -x DJANGO_CONFIGURATION=Test
diff --git a/dev-python/django-configurations/files/django-configurations-2.5.1-test.patch b/dev-python/django-configurations/files/django-configurations-2.5.1-test.patch
new file mode 100644
index 000000000000..c32586f7c3e8
--- /dev/null
+++ b/dev-python/django-configurations/files/django-configurations-2.5.1-test.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/test_values.py b/tests/test_values.py
+index 55478e6..0b37907 100644
+--- a/tests/test_values.py
++++ b/tests/test_values.py
+@@ -377,6 +377,7 @@ class ValueTests(TestCase):
+ 'default': {
+ 'CONN_HEALTH_CHECKS': False,
+ 'CONN_MAX_AGE': 0,
++ 'DISABLE_SERVER_SIDE_CURSORS': False,
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'HOST': '',
+ 'NAME': ':memory:',
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-19 17:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-13 8:17 [gentoo-commits] repo/gentoo:master commit in: dev-python/django-configurations/, dev-python/django-configurations/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 6:43 Michał Górny
2024-06-19 17:21 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox