Răsfoiți Sursa

Closes #5938: Deprecate support for Python 3.6

Jeremy Stretch 5 ani în urmă
părinte
comite
14bc3a3cf8

+ 3 - 3
docs/installation/index.md

@@ -23,6 +23,9 @@ The video below demonstrates the installation of NetBox v2.10.3 on Ubuntu 20.04
 | PostgreSQL | 9.6             |
 | Redis      | 4.0             |
 
+!!! note
+    Python 3.7 or later will be required in NetBox v2.12. Users are strongly encouraged to install NetBox using Python 3.7 or later for new deployments.
+
 Below is a simplified overview of the NetBox application stack for reference:
 
 ![NetBox UI as seen by a non-authenticated user](../media/installation/netbox_application_stack.png)
@@ -30,6 +33,3 @@ Below is a simplified overview of the NetBox application stack for reference:
 ## Upgrading
 
 If you are upgrading from an existing installation, please consult the [upgrading guide](upgrading.md).
-
-!!! note
-    Beginning with v2.5.9, the official documentation calls for systemd to be used for managing the WSGI workers in place of supervisord.  Please see the instructions for [migrating to systemd](migrating-to-systemd.md) if you are still using supervisord.

+ 3 - 0
docs/release-notes/version-2.11.md

@@ -4,6 +4,9 @@
 
 **WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.11 release will be provided from this beta, and users should assume that all data entered into the application will be lost.
 
+**Note:** NetBox v2.11 is the last major release that will support Python 3.6. Beginning with NetBox v2.12, Python 3.7 or
+later will be required.
+
 ### New Features
 
 #### Parent Interface Assignments ([#1519](https://github.com/netbox-community/netbox/issues/1519))

+ 7 - 1
netbox/netbox/settings.py

@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.10.6-dev'
+VERSION = '2.11-beta1'
 
 # Hostname
 HOSTNAME = platform.node()
@@ -29,6 +29,12 @@ if platform.python_version_tuple() < ('3', '6'):
     raise RuntimeError(
         "NetBox requires Python 3.6 or higher (current: Python {})".format(platform.python_version())
     )
+# TODO: Remove in NetBox v2.12
+if platform.python_version_tuple() < ('3', '7'):
+    warnings.warn(
+        "Support for Python 3.6 will be dropped in NetBox v2.12. Please upgrade to Python 3.7 or later at your "
+        "earliest convenience."
+    )
 
 
 #