Merge branch 'django:master' into master

Author: skdishansachin

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -26,11 +26,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.9'
           architecture: x64
       - name: Install tox
         run: |
@@ -39,36 +39,19 @@ jobs:
       - name: Run prospector linting
         run: tox -e prospector
 
-  test_python_36:
-    runs-on: ubuntu-20.04
-    name: Python 3.6
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.6
-          architecture: x64
-      - name: Install tox
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade tox tox-py
-      - name: Run tests
-        run: tox --py 36
-
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-          - 3.7
-          - 3.8
-          - 3.9
+          - '3.8'
+          - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
     name: Python ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

CONTRIBUTING.rst

@@ -37,19 +37,19 @@ the ``-l`` option::
     $ tox -l
     docs
     ...
-    py36-master
+    py311-master
 
 You can run each environment with the ``-e`` option::
 
-    $ tox -e py36-1.11  # runs the tests only on Python 3.6 and Django 1.11.x
+    $ tox -e py311-4.2  # runs the tests only on Python 3.11 and Django 4.2.x
 
 Optionally you can also specify a country whose tests you want to run::
 
     $ COUNTRY=us tox
 
 And combine both options::
 
-    $ COUNTRY=us tox -e py36-1.11
+    $ COUNTRY=us tox -e py311-4.2
 
 __ https://github.com/django/django-localflavor/issues
 __ https://tox.readthedocs.io/en/latest/install.html

docs/authors.rst

@@ -2,6 +2,7 @@ Authors
 =======
 
 * Aaron Boman
+* Abdellah El Youssfi Alaoui
 * Adam Taylor
 * Adnane Belmadiaf
 * Adonys Alea Boffill
@@ -98,6 +99,7 @@ Authors
 * Nishit Shah
 * Olivier Sels
 * Olle Vidner
+* Paolo Melchiorre
 * Paul Cunnane
 * Paul Donohue
 * Paulo Poiati

docs/changelog.rst

@@ -11,7 +11,7 @@ New flavors:
 
 New fields for existing flavors:
 
-- None
+- Added CIN Number field in Morocco flavor (`gh-705 <https://github.com/django/django-localflavor/pull/507>`_).
 
 Modifications to existing flavors:
 
@@ -20,7 +20,10 @@ Modifications to existing flavors:
 
 Other changes:
 
-- None
+- Dropped support for Python 3.6 and 3.7.
+- Dropped support for Django 4.0.
+- Added support for Python 3.12.
+- Added support for Django 5.0.
 
 
 4.0   (2023-04-22)

localflavor/ma/forms.py

@@ -74,3 +74,26 @@ class MARegionField(CharField):
     def __init__(self, **kwargs):
         kwargs.setdefault('label', _('Select Region'))
         super().__init__(**kwargs)
+
+
+class MACinNumberField(RegexField):
+    """
+        CIN number: (Numéro de la Carte D'Identité Nationale) The CIN represents the ID of a Moroccan citizen.
+
+         - It is an 8-max-length string that starts with one or two Latin letters followed by digits,
+           with the first digit not being zero.
+
+         - as implemented in the official government site "https://www.cnie.ma/"
+        .. versionadded:: 4.1
+    """
+
+    default_error_messages = {
+        'invalid': _('Enter a valid Moroccan CIN number.'),
+    }
+    cin_pattern = r'^[A-Za-z]{1,2}[1-9][0-9]{0,6}$'
+
+    def __init__(self, **kwargs):
+        kwargs.setdefault('label', _('CIN Number'))
+        kwargs['max_length'] = 8
+        kwargs['min_length'] = 2
+        super().__init__(self.cin_pattern, **kwargs)

setup.py

@@ -127,20 +127,19 @@ def find_package_data(where='.', package='',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.1',
         'Framework :: Django :: 4.2',
+        'Framework :: Django :: 5.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Internet :: WWW/HTTP',
     ],
     zip_safe=False,

tests/test_by/tests.py

@@ -53,7 +53,7 @@ def test_form_fields(self):
     def test_BYRegions_select(self):
         """Test that BYRegionField has valid choices"""
         choices = self.form.fields.get('region').choices
-        self.assertEqual(tuple(choices[1:]), forms.BY_REGIONS_CHOICES)
+        self.assertEqual(tuple(choices)[1:], forms.BY_REGIONS_CHOICES)
 
     def test_BYRegionSelect(self):
         self.maxDiff = None

tests/test_ma.py

@@ -1,6 +1,7 @@
 from django.test import SimpleTestCase
 
-from localflavor.ma.forms import MAPostalCodeField, MAProvinceField, MAProvinceSelect, MARegionField, MARegionSelect
+from localflavor.ma.forms import MAPostalCodeField, MAProvinceField, MAProvinceSelect, MARegionField, MARegionSelect, \
+    MACinNumberField
 
 PROVINCE_SELECT_OUTPUT = '''
     <select name="province">
@@ -99,6 +100,7 @@
     </select>
 '''
 
+
 class MALocalFlavorTests(SimpleTestCase):
     def test_MAPostalCodeField(self):
         error_format = ['Enter a postal code in the format XXXXX.']
@@ -128,3 +130,32 @@ def test_MAProvinceSelect(self):
     def test_MARegionSelect(self):
         f = MARegionSelect()
         self.assertHTMLEqual(f.render('region', '04'), REGION_SELECT_OUTPUT)
+
+    def test_MACinNumberField(self):
+        error_format = ['Enter a valid Moroccan CIN number.']
+        valid = {
+            'D1': 'D1',
+            'DZ1': 'DZ1',
+            'D23': 'D23',
+            'DR23': 'DR23',
+            'D345': 'D345',
+            'DR345': 'DR345',
+            'D3454': 'D3454',
+            'DT3454': 'DT3454',
+            'D34546': 'D34546',
+            'DG34546': 'DG34546',
+            'D345467': 'D345467',
+            'DH345467': 'DH345467',
+            'D3454673': 'D3454673',
+
+        }
+        invalid = {
+            '9': ['Ensure this value has at least 2 characters (it has 1).'] + error_format,
+            'T': ['Ensure this value has at least 2 characters (it has 1).'] + error_format,
+            '903': error_format,
+            'D034': error_format,
+            'DR034': error_format,
+            'RER45': error_format,
+            'T23456786': ['Ensure this value has at most 8 characters (it has 9).'] + error_format,
+        }
+        self.assertFieldOutput(MACinNumberField, valid, invalid)

tox.ini

@@ -2,20 +2,19 @@
 args_are_paths = false
 envlist =
     docs,prospector
-    {py36,py37,py38,py39,py310,pypy39}-django-3.2
-    {py38,py39,py310,pypy39}-django-4.0
+    {py38,py39,py310,pypy39}-django-3.2
     {py38,py39,py310,py311,pypy39}-django-4.1
     {py38,py39,py310,py311,pypy39}-django-4.2
-    {py310,py311}-django-main
+    {py310,py311,py312}-django-5.0
+    {py310,py311,py312}-django-main
 
 [testenv]
 basepython =
-    py36: python3.6
-    py37: python3.7
     py38: python3.8
     py39: python3.9
     py310: python3.10
     py311: python3.11
+    py312: python3.12
     pypy39: pypy3.9
 usedevelop = true
 pip_pre = true
@@ -25,9 +24,9 @@ commands =
     invoke test {posargs}
 deps =
     django-3.2: Django>=3.2,<3.3
-    django-4.0: Django>=4.0,<4.1
     django-4.1: Django>=4.1,<4.2
-    django-4.2: Django>=4.2b1,<4.3
+    django-4.2: Django>=4.2,<4.3
+    django-5.0: Django>=5.0rc1,<5.1
     django-main: https://github.com/django/django/archive/main.tar.gz
     -r{toxinidir}/tests/requirements.txt
 
@@ -44,5 +43,5 @@ deps =
     prospector==1.3.0
     pylint>=2.5.2,<2.6.0
     -r{toxinidir}/tests/requirements.txt
-basepython = python3.11
+basepython = python3.9
 commands = prospector --profile .prospector.yaml {toxinidir}