From 31e41f8f0230920404c772e9d40a00b89210b860 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 19 Jul 2021 10:43:52 -0400 Subject: [PATCH] Closes #6767: Add support for Python 3.9 --- .github/ISSUE_TEMPLATE/bug_report.yaml | 1 - .github/workflows/ci.yml | 2 +- docs/administration/netbox-shell.md | 2 +- docs/index.md | 2 +- docs/installation/3-netbox.md | 2 +- docs/installation/index.md | 5 +---- docs/installation/upgrading.md | 4 ++-- docs/plugins/development.md | 2 +- docs/release-notes/version-3.0.md | 1 + 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 97b55b285..bfaea7605 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -25,7 +25,6 @@ body: label: Python version description: What version of Python are you currently running? options: - - 3.6 - 3.7 - 3.8 - 3.9 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36d1f3350..40c32ce3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: [3.7, 3.8, 3.9] services: redis: image: redis diff --git a/docs/administration/netbox-shell.md b/docs/administration/netbox-shell.md index eb73776e1..1a10c5c3e 100644 --- a/docs/administration/netbox-shell.md +++ b/docs/administration/netbox-shell.md @@ -11,7 +11,7 @@ This will launch a lightly customized version of [the built-in Django shell](htt ``` $ ./manage.py nbshell ### NetBox interactive shell (localhost) -### Python 3.6.9 | Django 2.2.11 | NetBox 2.7.10 +### Python 3.7.10 | Django 3.2.5 | NetBox 3.0 ### lsmodels() will show available models. Use help() for more info. ``` diff --git a/docs/index.md b/docs/index.md index 5cdf871d9..0f47a6eb8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -55,7 +55,7 @@ NetBox is built on the [Django](https://djangoproject.com/) Python framework and ## Supported Python Versions -NetBox supports Python 3.6, 3.7, and 3.8 environments currently. (Support for Python 3.5 was removed in NetBox v2.8.) +NetBox supports Python 3.7, 3.8, and 3.9 environments currently. (Support for Python 3.6 was removed in NetBox v3.0.) ## Getting Started diff --git a/docs/installation/3-netbox.md b/docs/installation/3-netbox.md index 9ffa19e3a..5a4021a01 100644 --- a/docs/installation/3-netbox.md +++ b/docs/installation/3-netbox.md @@ -7,7 +7,7 @@ This section of the documentation discusses installing and configuring the NetBo Begin by installing all system packages required by NetBox and its dependencies. !!! note - NetBox v2.8.0 and later require Python 3.6, 3.7, or 3.8. + NetBox v3.0 and later require Python 3.7, 3.8, or 3.9. === "Ubuntu" diff --git a/docs/installation/index.md b/docs/installation/index.md index 1c2fcf567..db1e48620 100644 --- a/docs/installation/index.md +++ b/docs/installation/index.md @@ -19,13 +19,10 @@ The video below demonstrates the installation of NetBox v2.10.3 on Ubuntu 20.04 | Dependency | Minimum Version | |------------|-----------------| -| Python | 3.6 | +| Python | 3.7 | | PostgreSQL | 9.6 | | Redis | 4.0 | -!!! note - Python 3.7 or later will be required in NetBox v3.0. 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) diff --git a/docs/installation/upgrading.md b/docs/installation/upgrading.md index 0bf356ae4..a238c9908 100644 --- a/docs/installation/upgrading.md +++ b/docs/installation/upgrading.md @@ -6,11 +6,11 @@ Prior to upgrading your NetBox instance, be sure to carefully review all [releas ## Update Dependencies to Required Versions -NetBox v2.9.0 and later requires the following: +NetBox v3.0 and later requires the following: | Dependency | Minimum Version | |------------|-----------------| -| Python | 3.6 | +| Python | 3.7 | | PostgreSQL | 9.6 | | Redis | 4.0 | diff --git a/docs/plugins/development.md b/docs/plugins/development.md index ed81eb891..007d8434f 100644 --- a/docs/plugins/development.md +++ b/docs/plugins/development.md @@ -48,7 +48,7 @@ The plugin source directory contains all of the actual Python code and other res ### Create setup.py -`setup.py` is the [setup script](https://docs.python.org/3.6/distutils/setupscript.html) we'll use to install our plugin once it's finished. The primary function of this script is to call the setuptools library's `setup()` function to create a Python distribution package. We can pass a number of keyword arguments to inform the package creation as well as to provide metadata about the plugin. An example `setup.py` is below: +`setup.py` is the [setup script](https://docs.python.org/3.7/distutils/setupscript.html) we'll use to install our plugin once it's finished. The primary function of this script is to call the setuptools library's `setup()` function to create a Python distribution package. We can pass a number of keyword arguments to inform the package creation as well as to provide metadata about the plugin. An example `setup.py` is below: ```python from setuptools import find_packages, setup diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index d07ffae7a..2cf513c38 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -181,6 +181,7 @@ Note that NetBox's `rqworker` process will _not_ service custom queues by defaul * [#6338](https://github.com/netbox-community/netbox/issues/6338) - Decimal fields are no longer coerced to strings in REST API * [#6639](https://github.com/netbox-community/netbox/issues/6639) - Drop support for queryset caching (django-cacheops) * [#6713](https://github.com/netbox-community/netbox/issues/6713) - Checking for new releases is now done as part of the housekeeping routine +* [#6767](https://github.com/netbox-community/netbox/issues/6767) - Add support for Python 3.9 ### Configuration Changes