diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9182457a0..99ba1f9ce 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.6, 3.7, 3.8] + python-version: [3.7, 3.8] services: redis: image: redis diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md index f7f6f36e9..fb47400f2 120000 --- a/docs/release-notes/index.md +++ b/docs/release-notes/index.md @@ -1 +1 @@ -version-2.11.md \ No newline at end of file +version-2.12.md \ No newline at end of file diff --git a/docs/release-notes/version-2.12.md b/docs/release-notes/version-2.12.md new file mode 100644 index 000000000..dcdbeb74a --- /dev/null +++ b/docs/release-notes/version-2.12.md @@ -0,0 +1,7 @@ +# NetBox v2.12 + +## v2.12-beta1 (FUTURE) + +### Other Changes + +* [#5532](https://github.com/netbox-community/netbox/issues/5532) - Drop support for Python 3.6 diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index a7af4d8fd..7f9c5e7cf 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -16,7 +16,7 @@ from django.core.validators import URLValidator # Environment setup # -VERSION = '2.11.1' +VERSION = '2.12-beta1' # Hostname HOSTNAME = platform.node() @@ -25,15 +25,9 @@ HOSTNAME = platform.node() BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Validate Python version -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." + raise RuntimeError( + f"NetBox requires Python 3.7 or higher (current: Python {platform.python_version()})" )