chore: Added support for Django 5, switched to ruff.

Reformatted using ruff defaults, so single quotes were replaced with double quotes.

Dropped Python 3.7, 3.8, and Django 2 from tox tests.

Author: cordery

.github/workflows/tox.yml

@@ -10,11 +10,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10' ]
-        django-version: [ ">=2.2,<3", ">=3,<4", ">=4,<5" ]
-        exclude:
-          - python-version: 3.7
-            django-version: ">=4,<5"
+        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        django-version: [ ">=3,<4", ">=4,<5", ">=5,<6" ]
 
     steps:
       #----------------------------------------------

.python-version

@@ -1,4 +1,4 @@
-3.7.12
-3.8.10
-3.9.6
-3.10.1
+3.9
+3.10
+3.11
+3.12

.travis.yml

@@ -1,105 +1,165 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.2.0]
+
+### Added
+
+- Added support for Django 5
+
+### Changed
+
+- Dropped Python 3.7, 3.8, and Django 2 from tox tests. They should still work however.
+
 ## [2.1.0]
+
 ### Added
+
 - Added search_fields to CountryAdmin, thanks DanyPM
+
 ## [2.0.1]
+
 ### Fixed
+
 - Replaced deprecated ugettext with gettext, supported in Django 2.2, 3, & 4, thanks to @niSeRdiSeR
 - Updated tox config
 - Django 4, python 3.10 test added to matrix
 
 ## [2.0.0]
+
 ### Changed
+
 - Dropped support for Python 2 and Django 1
 
 ## [1.3.2]
+
 ### Fixed
+
 - Fixed update_countries_plus, thanks to @jeyeong and @buff0k
 
 ## [1.3.1]
+
 ### Fixed
+
 - Restored support for Django 1.11+
 
 ## [1.3.0] - 2020-01-20
+
 ### Changed
+
 - Updated to use poetry & pytest
 - Added tests for Django 3
 - Dropped explicit support for Django <=1.10, may still work fine though.
 
 ## [1.2.1] - 2017-12-13
+
 ### Fixed
+
 - Fixtures dir is now properly included in pip package
 
 ## [1.2.0] - 2017-12-13
+
 ### Added
+
 - Cleaned up project & improved documentation
 
 ### Changed
+
 - Added tests for Django 2.0
 - Dropped tested support for Django versions < 1.11
 
 ## [1.1.0] - 2016-03-14
+
 ### Fixed
+
 - Fixed Geonames.org file format error
 
 ## [1.0.1] - 2015-06-16
+
 ### Added
+
 - Improved test coverage.
 
 ### Changed
-- The Country model has had all fields with undefined lengths (ex: name) expanded to max_length=255.  Defined length fields (ex: Iso, Iso3) are unchanged.
-- Two countries (Dominican Republic and Puerto Rico) have two phone number prefixes instead of 1.  These prefixes are now comma separated.
-- The Country model will now validate on save and reject values of the wrong length.  The test suite has been expanded to test this.
+
+- The Country model has had all fields with undefined lengths (ex: name) expanded to max_length=255. Defined length
+  fields (ex: Iso, Iso3) are unchanged.
+- Two countries (Dominican Republic and Puerto Rico) have two phone number prefixes instead of 1. These prefixes are now
+  comma separated.
+- The Country model will now validate on save and reject values of the wrong length. The test suite has been expanded to
+  test this.
 
 ### Fixed
+
 - Fixed update_countries_plus command for python 3
 
 ## [1.0.0] - 2015-06-11
+
 ### Added
-- Added feature to update data from geonames.org.  
+
+- Added feature to update data from geonames.org.
 - Test coverage has been substantially improved.
 
 ### Changed
+
 - The data migration has been removed in favour of the new management command and manually loading the fixture.
 - The fixture is no longer named initial_data and so must be loaded manually, if desired.
-- In order to provide better compatibility with the way Django loads apps the Country model is no longer importable directly from countries_plus.
-- The get_country_by_request utility function has been moved into the Country model, and is available as Country.get_by_request(request)
+- In order to provide better compatibility with the way Django loads apps the Country model is no longer importable
+  directly from countries_plus.
+- The get_country_by_request utility function has been moved into the Country model, and is available as
+  Country.get_by_request(request)
+
+### Fixed
 
-### Fixed 
 - General code cleanup & improved test coverage.
 
 ### Note
-- If you have been running an earlier version you should run python manage.py update_countries_plus to update your data tables as they may contain incorrect data.
+
+- If you have been running an earlier version you should run python manage.py update_countries_plus to update your data
+  tables as they may contain incorrect data.
 
 ## [0.3.3] - 2015-01-27
+
 ### Changed
+
 - Now uses Django 1.7 data migration pattern
 
 ## [0.3.2] - 2015-01-10
+
 ### Fixed
+
 - Corrected version number on setup.py
 
 ## [0.3.1] - 2015-01-09
+
 ### Added
+
 - Now compatible with Python 3 thanks to luiscberrocal
 
 ## [0.3.0] - 2014-09-08
+
 ### Added
+
 - Now compatible with Django 1.7 thanks to mrben
 
 ## [0.2.0] - 2014-02-13
+
 ### Added
+
 - Added middleware that adds the request country to the request object.
 
 ## [0.1.5] - 2013-06-14
+
 ### Fixed
+
 - Corrected model max_length attributes to properly match data.
 
 ## [0.1.0] - 2013-05-22
+
 ### Added
+
 - Initial release.

CHANGELOG.md

@@ -74,11 +74,11 @@ Ready to contribute? Here's how to set up `django-countries-plus` for local deve
 
    Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass flake8 and the
-   tests, including testing other Python versions with tox::
+5. When you're done making changes, check that your changes are lint free, formatted, and pass the tests,
+   including testing other Python versions with tox::
 
-        $ flake8 countries_plus tests
-        $ python setup.py test
+        $ ruff check .
+        # ruff format
         $ tox
 
    To get flake8 and tox, just pip install them into your virtualenv.
@@ -100,13 +100,6 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check
-   https://travis-ci.org/cordery/django-countries-plus/pull_requests
-   and make sure that the tests pass for all supported Python versions.
-
-Tips
-----
-
-To run a subset of tests::
-
-    $ python -m unittest tests.test_countries_plus
+3. The pull request should work for the Python & Django versions specified in
+   tox.ini. Run tox and make sure that the tests pass for all supported Python
+   versions.

CONTRIBUTING.rst

@@ -5,17 +5,9 @@ Django Countries Plus
 .. image:: https://badge.fury.io/py/django-countries-plus.svg
     :target: https://badge.fury.io/py/django-countries-plus
 
-.. image:: https://travis-ci.org/cordery/django-countries-plus.svg
-    :target: https://travis-ci.org/cordery/django-countries-plus
+.. image:: https://github.com/cordery/django-countries-plus/actions/workflows/tox.yml/badge.svg
+    :target: https://github.com/cordery/django-countries-plus/actions/workflows/tox.yml
 
-.. image:: https://codecov.io/github/cordery/django-countries-plus/coverage.svg
-    :target: https://codecov.io/github/cordery/django-countries-plus
-
-.. image:: https://requires.io/github/cordery/django-countries-plus/requirements.svg?branch=master
-    :target: https://requires.io/github/cordery/django-countries-plus/requirements/?branch=master
-
-.. image:: https://www.codacy.com/project/badge/c74f1b1041f44940b58e0e1587b10453?style=flat-square
-    :target: https://www.codacy.com/app/cordery/django-countries-plus
 
 django-countries-plus provides a model and fixture containing all top level country data from Geonames.org (http://download.geonames.org/export/dump/countryInfo.txt)
 

README.rst

@@ -1,7 +1,7 @@
 import django
 
-APP_NAME = 'countries_plus'
-__version__ = '2.1.0'
+APP_NAME = "countries_plus"
+__version__ = "2.1.0"
 
 if django.VERSION[0] == 2:
-    default_app_config = 'countries_plus.apps.DefaultConfig'
+    default_app_config = "countries_plus.apps.DefaultConfig"

countries_plus/__init__.py

@@ -4,11 +4,11 @@
 
 
 class CountryAdmin(admin.ModelAdmin):
-    list_display = ('continent', 'name', 'iso', 'iso3', 'languages', 'currency_name')
-    list_display_links = ('name',)
-    search_fields = ('name', 'iso', 'iso3')
+    list_display = ("continent", "name", "iso", "iso3", "languages", "currency_name")
+    list_display_links = ("name",)
+    search_fields = ("name", "iso", "iso3")
     """Provided so that other ModelAdmins that have """
-    list_filter = ('continent',)
+    list_filter = ("continent",)
 
 
 admin.site.register(Country, CountryAdmin)

countries_plus/admin.py

@@ -2,5 +2,5 @@
 
 
 class DefaultConfig(AppConfig):
-    name = 'countries_plus'
+    name = "countries_plus"
     verbose_name = "Countries Plus"

countries_plus/apps.py

@@ -1,3 +1,3 @@
 def add_request_country(request):
     """Add 'country' to the request context.  Requires countries_plus middleware."""
-    return {'country': getattr(request, 'country', None)}
+    return {"country": getattr(request, "country", None)}

countries_plus/context_processors.py

@@ -4,7 +4,7 @@
 
 
 class Command(BaseCommand):
-    help = 'Updates the Countries Plus database from geonames.org'
+    help = "Updates the Countries Plus database from geonames.org"
 
     def handle(self, *args, **options):
         num_updated, num_created = update_geonames_data()

countries_plus/management/commands/update_countries_plus.py

@@ -15,6 +15,6 @@ def __call__(self, request):
             request.country = country
         else:
             logger.warning(
-                'countries_plus:  Could not retrieve country, not adding to request.'
+                "countries_plus:  Could not retrieve country, not adding to request."
             )
         return self.get_response(request)

countries_plus/middleware.py

@@ -10,9 +10,9 @@
 
 class Country(models.Model):
     class Meta:
-        verbose_name = _('Country')
-        verbose_name_plural = _('Countries')
-        ordering = ['name']
+        verbose_name = _("Country")
+        verbose_name_plural = _("Countries")
+        ordering = ["name"]
 
     iso = models.CharField(max_length=2, primary_key=True)
     iso3 = models.CharField(max_length=3, unique=True)
@@ -36,7 +36,7 @@ class Meta:
     equivalent_fips_code = models.CharField(max_length=4, blank=True, null=True)
 
     @staticmethod
-    def get_by_request(request) -> 'Country':
+    def get_by_request(request) -> "Country":
         """Get a Country object from `request`, via the COUNTRIES_PLUS_COUNTRY_HEADER"""
 
         country = None
@@ -61,7 +61,7 @@ def get_by_request(request) -> 'Country':
         except AttributeError:
             pass
 
-        geoip_request_iso = request.META.get(header_name, '')
+        geoip_request_iso = request.META.get(header_name, "")
         if geoip_request_iso:
             try:
                 country = Country.objects.get(iso=geoip_request_iso.upper())