Explorar o código

Release v3.2-beta1

jeremystretch %!s(int64=4) %!d(string=hai) anos
pai
achega
1aa295dc84
Modificáronse 4 ficheiros con 18 adicións e 15 borrados
  1. 1 1
      base_requirements.txt
  2. 12 0
      docs/release-notes/index.md
  3. 2 11
      netbox/netbox/settings.py
  4. 3 3
      requirements.txt

+ 1 - 1
base_requirements.txt

@@ -1,6 +1,6 @@
 # The Python web framework on which NetBox is built
 # The Python web framework on which NetBox is built
 # https://github.com/django/django
 # https://github.com/django/django
-Django<4.0
+Django
 
 
 # Django middleware which permits cross-domain API requests
 # Django middleware which permits cross-domain API requests
 # https://github.com/OttoYiu/django-cors-headers
 # https://github.com/OttoYiu/django-cors-headers

+ 12 - 0
docs/release-notes/index.md

@@ -10,6 +10,18 @@ Minor releases are published in April, August, and December of each calendar yea
 
 
 This page contains a history of all major and minor releases since NetBox v2.0. For more detail on a specific patch release, please see the release notes page for that specific minor release.
 This page contains a history of all major and minor releases since NetBox v2.0. For more detail on a specific patch release, please see the release notes page for that specific minor release.
 
 
+#### [Version 3.2](./version-3.2.md) (Pending Release)
+
+* Plugins Framework Extensions ([#8333](https://github.com/netbox-community/netbox/issues/8333))
+* Modules & Module Types ([#7844](https://github.com/netbox-community/netbox/issues/7844))
+* Custom Object Fields ([#7006](https://github.com/netbox-community/netbox/issues/7006))
+* Custom Status Choices ([#8054](https://github.com/netbox-community/netbox/issues/8054))
+* Improved User Preferences ([#7759](https://github.com/netbox-community/netbox/issues/7759))
+* Inventory Item Roles ([#3087](https://github.com/netbox-community/netbox/issues/3087))
+* Inventory Item Templates ([#8118](https://github.com/netbox-community/netbox/issues/8118))
+* Service Templates ([#1591](https://github.com/netbox-community/netbox/issues/1591))
+* Automatic Provisioning of Next Available VLANs ([#2658](https://github.com/netbox-community/netbox/issues/2658))
+
 #### [Version 3.1](./version-3.1.md) (December 2021)
 #### [Version 3.1](./version-3.1.md) (December 2021)
 
 
 * Contact Objects ([#1344](https://github.com/netbox-community/netbox/issues/1344))
 * Contact Objects ([#1344](https://github.com/netbox-community/netbox/issues/1344))

+ 2 - 11
netbox/netbox/settings.py

@@ -19,7 +19,7 @@ from netbox.config import PARAMS
 # Environment setup
 # Environment setup
 #
 #
 
 
-VERSION = '3.2.0-dev'
+VERSION = '3.2.0-beta1'
 
 
 # Hostname
 # Hostname
 HOSTNAME = platform.node()
 HOSTNAME = platform.node()
@@ -50,16 +50,6 @@ except ModuleNotFoundError as e:
         )
         )
     raise
     raise
 
 
-# Warn on removed config parameters
-if hasattr(configuration, 'CACHE_TIMEOUT'):
-    warnings.warn(
-        "The CACHE_TIMEOUT configuration parameter was removed in v3.0.0 and no longer has any effect."
-    )
-if hasattr(configuration, 'RELEASE_CHECK_TIMEOUT'):
-    warnings.warn(
-        "The RELEASE_CHECK_TIMEOUT configuration parameter was removed in v3.0.0 and no longer has any effect."
-    )
-
 # Enforce required configuration parameters
 # Enforce required configuration parameters
 for parameter in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY', 'REDIS']:
 for parameter in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY', 'REDIS']:
     if not hasattr(configuration, parameter):
     if not hasattr(configuration, parameter):
@@ -379,6 +369,7 @@ LANGUAGE_CODE = 'en-us'
 USE_I18N = True
 USE_I18N = True
 USE_L10N = False
 USE_L10N = False
 USE_TZ = True
 USE_TZ = True
+USE_DEPRECATED_PYTZ = True
 
 
 # WSGI
 # WSGI
 WSGI_APPLICATION = 'netbox.wsgi.application'
 WSGI_APPLICATION = 'netbox.wsgi.application'

+ 3 - 3
requirements.txt

@@ -10,11 +10,11 @@ django-redis==5.2.0
 django-rq==2.5.1
 django-rq==2.5.1
 django-tables2==2.4.1
 django-tables2==2.4.1
 django-taggit==2.1.0
 django-taggit==2.1.0
-django-timezone-field==4.2.3
-djangorestframework==3.12.4
+django-timezone-field==5.0
+djangorestframework==3.13.1
 drf-yasg[validation]==1.20.0
 drf-yasg[validation]==1.20.0
 #graphene_django==2.15.0
 #graphene_django==2.15.0
-# Installing from PR origin temporarily
+# Installing from branch pending v2.16 release
 git+git://github.com/graphql-python/graphene-django.git@v2
 git+git://github.com/graphql-python/graphene-django.git@v2
 gunicorn==20.1.0
 gunicorn==20.1.0
 Jinja2==3.0.3
 Jinja2==3.0.3