Modernize tox config and write MMDB files with a Python script

Author: blag

Makefile

@@ -14,8 +14,7 @@ check:
 		python -Wd example/manage.py check
 
 generate-mmdb-fixtures:
-	docker --context=default buildx build -f tests/Dockerfile --tag test-mmdb-maker tests
-	docker run --rm --volume $$(pwd)/tests:/data test-mmdb-maker
+	[ -e tests/test_city.mmdb ] || python3 generate_mmdb.py
 
 test: generate-mmdb-fixtures
 	DJANGO_SETTINGS_MODULE=tests.settings PYTHONPATH=. \

pyproject.toml

@@ -58,6 +58,7 @@ dev = [
     # Build
     "bumpversion",
     "twine",
+    "mmdb-writer",
 ]
 
 [tool.ruff]

tests/Dockerfile

@@ -0,0 +1,63 @@
+from netaddr import IPSet
+
+from mmdb_writer import MMDBWriter
+
+
+city_writer = MMDBWriter()
+
+city_writer.insert_network(
+    IPSet(["44.55.66.77/32"]),
+    {
+        "city": {
+            "names": {
+                "en": "San Diego",
+            },
+        },
+        "continent": {
+            "code": "NA",
+            "names": {
+                "en": "North America",
+            },
+        },
+        "country": {
+            "iso_code": "US",
+            "names": {
+                "en": "United States",
+            },
+        },
+        "is_in_european_union": False,
+        "location": {
+            "latitude": 37.751,
+            "longitude": -97.822,
+            "metro_code": "custom metro code",
+            "time_zone": "America/Los Angeles",
+        },
+        "postal": {
+            "code": "custom postal code",
+        },
+        "subdivisions": [
+            {
+                "iso_code": "ABC",
+                "names": {
+                    "en": 'Absolute Basic Class',
+                },
+            },
+        ],
+    },
+)
+
+city_writer.to_db_file("tests/test_city.mmdb")
+
+# country_writer = MMDBWriter(
+#     IPSet(["8.8.8.8/32"]),
+#     {
+#         "country": {
+#             "iso_code": "US",
+#             "names": {
+#                 "en": "United States",
+#             },
+#         },
+#     },
+# )
+
+# country_writer.to_db_file("tests/test_country.mmdb")

tests/generate_mmdb.pl

@@ -2,37 +2,37 @@
 ; Minimum version of Tox
 minversion = 1.8
 envlist =
-    ; https://docs.djangoproject.com/en/4.2/faq/install/#what-python-version-can-i-use-with-django
-    py{37}-dj32
-    py{38,39,310}-dj32
-    py{311,312}-dj{42,main}
+    ; https://docs.djangoproject.com/en/6.0/faq/install/#what-python-version-can-i-use-with-django
+    py3{10,11,12,13,14}-dj52
+    py3{12,13,14}-dj{60,main}
 
 [gh-actions]
 python =
-    3.8: py38
-    3.9: py39
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
+    3.14: py314
 
 [gh-actions:env]
 DJANGO =
-    3.2: dj32
-    4.2: dj42
+    5.2: dj52
+    6.0: dj60
     main: djmain
 
 [testenv]
 commands =
-    make generate-mmdb-fixtures
+    python3 tests/generate_mmdb.py
     coverage run {envbindir}/django-admin test -v 2 --pythonpath=./ --settings=tests.settings
     coverage report
     coverage xml
 deps =
     coverage
-    dj32: Django>=3.2,<4.0
-    dj42: Django>=4.2,<4.3
+    dj52: Django>=5.2,<6.0
+    dj60: Django>=6.0,<6.1
     djmain: https://github.com/django/django/archive/main.tar.gz
     geoip2
+    mmdb-writer
+    netaddr
 ignore_outcome =
     djmain: True
-allowlist_externals = make