upstream/v2026.1.0 #12

Merged
simon merged 241 commits from upstream/v2026.1.0 into master 2026-02-03 21:56:32 +00:00
2 changed files with 5 additions and 3 deletions
Showing only changes of commit cc5693017e - Show all commits

View File

@@ -39,7 +39,7 @@ dependencies = [
"Django[argon2]==4.2.*,>=4.2.26",
"django-bootstrap3==25.2",
"django-compressor==4.5.1",
"django-countries==7.6.*",
"django-countries==8.2.*",
"django-filter==25.1",
"django-formset-js-improved==0.5.0.4",
"django-formtools==2.5.1",

View File

@@ -40,6 +40,10 @@ class CachedCountries(Countries):
django-countries performs a unicode-aware sorting based on pyuca which is incredibly
slow.
"""
# Starting in django-countries 8.1, django-countries implemented a similar caching, but only on object level.
# We keep our caching for now for the added caching to the cache store. Unfortunately we can't really avoid
# the double-caching on object level if we want the caches od be used in a sensible order. We could re-evaluate
# and drop this in the future if it ever causes bugs or memory issues.
cache_key = "countries:all:{}".format(get_language_without_region())
if self.cache_subkey:
cache_key += ":" + self.cache_subkey
@@ -84,8 +88,6 @@ class FastCountryField(CountryField):
*self._check_backend_specific_checks(**kwargs),
*self._check_validators(),
*self._check_deprecation_details(),
*self._check_multiple(),
*self._check_max_length_attribute(**kwargs),
]