Support 202311 (#95)

* Clarifying the Network Type field #1357

Only indicate availability of DC voltage for facilities #1341

changelog

linting

* fix migrations hierarchy

* Modernize (#96)

* update deps, run pre-commit

* add py38 back, adjust tox

---------

Co-authored-by: 20C <[email protected]>
Co-authored-by: Matt Griswold <[email protected]>

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install virtualenv from poetry
         uses: 20c/workflows/poetry@v1
       - name: Run linters
@@ -22,11 +22,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest", "macos-latest" ]
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install virtualenv from poetry
         uses: 20c/workflows/poetry@v1
         with:

.pre-commit-config.yaml

@@ -5,10 +5,19 @@ exclude: |
     )$
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.5.0
     hooks:
       - id: check-yaml
       - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.1.11
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
   - repo: local
     hooks:
       - id: system
@@ -20,7 +29,7 @@ repos:
     hooks:
     -   id: pyupgrade
         name: pyupgrade
-        entry: poetry run pyupgrade --py36-plus
+        entry: poetry run pyupgrade --py38-plus
         language: python
         types: [python]
         pass_filenames: true

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 
 ## Unreleased
+### Added
+- added `info_types` field to `Network` to support multi choice type selection
+### Changed
+- changed `available_voltage_services` in `Facility` to allow 48 VDC, 400 VAC and 480 VAC
 
 
 ## 3.2.0

CHANGELOG.yaml

@@ -1,7 +1,9 @@
 Unreleased:
-  added: []
+  added:
+  - added `info_types` field to `Network` to support multi choice type selection
   fixed: []
-  changed: []
+  changed:
+  - changed `available_voltage_services` in `Facility` to allow 48 VDC, 400 VAC and 480 VAC
   deprecated: []
   removed: []
   security: []

pyproject.toml

@@ -27,11 +27,11 @@ packages = [{ include = "django_peeringdb", from = "src" }]
 [tool.poetry.dependencies]
 python = "^3.8"
 django_countries = ">1"
-django_handleref = "^2"
-django_inet = "^1"
-asgiref = "^3"
+django_handleref = ">=2"
+django_inet = ">=1"
+asgiref = ">=3"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 # testing
 codecov = ">=2"
 coverage = ">=5"
@@ -41,29 +41,29 @@ pytest-cov = "*"
 tox = ">=3.24"
 
 # linting
-# bandit = ">=1.6.2"
 black = ">=20"
 isort = ">=5.7"
 flake8 = ">=3.8"
 mypy = ">=0.950"
 pre-commit = ">=2.13"
 pyupgrade = ">=2.19"
+ruff = "^0.1.11"
 
 # docs
 markdown = "*"
 markdown-include = ">=0.5,<1"
-mkdocs = "^1.2.3"
+mkdocs = ">=1.2.3"
 
 # ctl
 ctl = ">=1"
 jinja2 = ">=2"
 tmpl = ">=1"
-# v4 released 2022-03-31
-twine = "^3.3.0"
+twine = ">=3.3"
 
 [tool.poetry.plugins."markdown.extensions"]
 pymdgen = "pymdgen.md:Extension"
 
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"

src/django_peeringdb/const.py

@@ -99,9 +99,8 @@
     ("100+Tbps", _("100+Tbps")),
 )
 
-NET_TYPES = (
-    ("", _("Not Disclosed")),
-    ("Not Disclosed", _("Not Disclosed")),
+
+_NET_TYPES = (
     ("NSP", _("NSP")),
     ("Content", _("Content")),
     ("Cable/DSL/ISP", _("Cable/DSL/ISP")),
@@ -114,6 +113,13 @@
     ("Government", _("Government")),
 )
 
+NET_TYPES = (
+    ("", _("Not Disclosed")),
+    ("Not Disclosed", _("Not Disclosed")),
+) + _NET_TYPES
+
+NET_TYPES_MULTI_CHOICE = _NET_TYPES
+
 VISIBILITY = (
     ("Private", _("Private")),
     #                   ('Peers', _('Peers')),
@@ -164,9 +170,7 @@
 
 AVAILABLE_VOLTAGE = (
     ("48 VDC", _("48 VDC")),
-    ("120 VAC", _("120 VAC")),
-    ("208 VAC", _("208 VAC")),
-    ("240 VAC", _("240 VAC")),
+    ("400 VAC", _("400 VAC")),
     ("480 VAC", _("480 VAC")),
 )
 

src/django_peeringdb/migrations/0007_add_verbose_names.py

@@ -1,11 +1,6 @@
 # Generated by Django 2.2.12 on 2020-05-01 16:17
 
-import django.db.models.deletion
-import django_countries.fields
-import django_inet.models
-from django.db import migrations, models
-
-import django_peeringdb.models.abstract
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

src/django_peeringdb/migrations/0010_ix_ixf_fields.py

@@ -1,12 +1,7 @@
 # Generated by Django 2.2.12 on 2020-07-10 13:33
 
-import django.db.models.deletion
-import django_countries.fields
-import django_inet.models
 from django.db import migrations, models
 
-import django_peeringdb.models.abstract
-
 
 class Migration(migrations.Migration):
     dependencies = [

src/django_peeringdb/migrations/0011_ixlan_ixf_fields.py

@@ -1,12 +1,7 @@
 # Generated by Django 2.2.12 on 2020-07-13 07:00
 
-import django.db.models.deletion
-import django_countries.fields
-import django_inet.models
 from django.db import migrations, models
 
-import django_peeringdb.models.abstract
-
 
 class Migration(migrations.Migration):
     dependencies = [

src/django_peeringdb/migrations/0012_change_network_prefixes_and_info_type.py

@@ -1,12 +1,7 @@
 # Generated by Django 3.1.2 on 2020-10-06 17:37
 
-import django.db.models.deletion
-import django_countries.fields
-import django_inet.models
 from django.db import migrations, models
 
-import django_peeringdb.models.abstract
-
 
 class Migration(migrations.Migration):
     dependencies = [

src/django_peeringdb/migrations/0017_facility_fields.py

@@ -1,9 +1,5 @@
 # Generated by Django 3.2.7 on 2021-09-07 13:34
 
-import django.core.validators
-import django.db.models.deletion
-import django_countries.fields
-import django_inet.models
 from django.db import migrations, models
 
 import django_peeringdb.fields

src/django_peeringdb/migrations/0018_add_region_continent_field.py

@@ -1,7 +1,5 @@
 # Generated by Django 3.2.7 on 2021-09-21 15:50
 
-import django.core.validators
-import django_inet.models
 from django.db import migrations, models
 
 

src/django_peeringdb/migrations/0019_ix_add_sales_phone_email.py

@@ -1,7 +1,5 @@
 # Generated by Django 3.2.7 on 2021-10-02 00:54
 
-import django.core.validators
-import django_inet.models
 from django.db import migrations, models
 
 

src/django_peeringdb/migrations/0020_status_dashboard.py

@@ -1,8 +1,6 @@
 # Generated by Django 3.2.9 on 2022-02-02 13:59
 
-import django.core.validators
-import django_inet.models
-from django.db import migrations, models
+from django.db import migrations
 
 import django_peeringdb.models.abstract
 

src/django_peeringdb/migrations/0028_auto_20240109_1157.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.7 on 2024-01-09 11:57
+
+from django.db import migrations
+
+import django_peeringdb.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("django_peeringdb", "0027_auto_20230804_1414"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="network",
+            name="info_types",
+            field=django_peeringdb.fields.MultipleChoiceField(
+                blank=True,
+                choices=[
+                    ("NSP", "NSP"),
+                    ("Content", "Content"),
+                    ("Cable/DSL/ISP", "Cable/DSL/ISP"),
+                    ("Enterprise", "Enterprise"),
+                    ("Educational/Research", "Educational/Research"),
+                    ("Non-Profit", "Non-Profit"),
+                    ("Route Server", "Route Server"),
+                    ("Network Services", "Network Services"),
+                    ("Route Collector", "Route Collector"),
+                    ("Government", "Government"),
+                ],
+                max_length=255,
+                verbose_name="Network Types",
+            ),
+        ),
+    ]

src/django_peeringdb/migrations/0029_auto_20240109_1246.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.2.7 on 2024-01-09 12:46
+
+from django.db import migrations
+
+import django_peeringdb.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("django_peeringdb", "0028_auto_20240109_1157"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="facility",
+            name="available_voltage_services",
+            field=django_peeringdb.fields.MultipleChoiceField(
+                blank=True,
+                choices=[
+                    ("48 VDC", "48 VDC"),
+                    ("400 VAC", "400 VAC"),
+                    ("480 VAC", "480 VAC"),
+                ],
+                help_text="The alternating current voltage available to users of the facility either directly from the landlord or delivered by the utility separately.",
+                max_length=255,
+                null=True,
+                verbose_name="Available Voltage Services",
+            ),
+        ),
+    ]

src/django_peeringdb/models/abstract.py

@@ -227,13 +227,14 @@ class NetworkBase(HandleRefModel):
         choices=const.SCOPES,
         default="Not Disclosed",
     )
-    info_type = models.CharField(
-        _("Network Type"),
-        max_length=60,
+
+    info_types = MultipleChoiceField(
+        _("Network Types"),
         blank=True,
-        choices=const.NET_TYPES,
-        default="Not Disclosed",
+        max_length=255,
+        choices=const.NET_TYPES_MULTI_CHOICE,
     )
+
     info_prefixes4 = models.PositiveIntegerField(
         _("IPv4 Prefixes"),
         null=True,

src/django_peeringdb/models/concrete.py

@@ -2,6 +2,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from django_peeringdb import const
 from django_peeringdb.models import (
     CampusBase,
     CarrierBase,
@@ -80,6 +81,17 @@ class Network(NetworkBase):
         on_delete=models.CASCADE,
     )
 
+    # keep legacy info type field on the concrete
+    # models so its still queryable and syncable via
+    # peeringdb-py
+    info_type = models.CharField(
+        _("Network Type"),
+        max_length=60,
+        blank=True,
+        choices=const.NET_TYPES,
+        default="Not Disclosed",
+    )
+
 
 @expose_model
 class InternetExchange(InternetExchangeBase):

tox.ini

@@ -1,6 +1,7 @@
 [tox]
 envlist =
     py{38,39,310,311}-django{31,32,40,42}
+    py312-django{40,42}
 isolated_build = True
 
 [gh-actions]
@@ -9,11 +10,12 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv]
 setenv =
-		PYTHONDONTWRITEBYTECODE=1
-		PYTHONWARNINGS=once
+    PYTHONDONTWRITEBYTECODE=1
+    PYTHONWARNINGS=once
 deps =
     django31: Django>=3.1,<3.2
     django32: Django>=3.2,<3.3