diff --git a/docs/additional-features/custom-scripts.md b/docs/additional-features/custom-scripts.md index 3ed910791..8fe3661ed 100644 --- a/docs/additional-features/custom-scripts.md +++ b/docs/additional-features/custom-scripts.md @@ -175,7 +175,7 @@ A particular object within NetBox. Each ObjectVar must specify a particular mode * `null_option` - A label representing a "null" or empty choice (optional) !!! warning - The `display_field` parameter is now deprecated, and will be removed in NetBox v2.12. All ObjectVar instances will + The `display_field` parameter is now deprecated, and will be removed in NetBox v3.0. All ObjectVar instances will instead use the new standard `display` field for all serializers (introduced in NetBox v2.11). To limit the selections available within the list, additional query parameters can be passed as the `query_params` dictionary. For example, to show only devices with an "active" status: diff --git a/docs/installation/index.md b/docs/installation/index.md index 2ae5e5299..1c2fcf567 100644 --- a/docs/installation/index.md +++ b/docs/installation/index.md @@ -24,7 +24,7 @@ The video below demonstrates the installation of NetBox v2.10.3 on Ubuntu 20.04 | 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. + 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: diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index 4a0fcef8f..65f81a2b5 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -93,7 +93,7 @@ ## v2.11.0 (2021-04-16) -**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. +**Note:** NetBox v2.11 is the last major release that will support Python 3.6. Beginning with NetBox v3.0, Python 3.7 or later will be required. ### Breaking Changes @@ -151,7 +151,7 @@ Devices can now be assigned to locations (formerly known as rack groups) within When exporting a list of objects in NetBox, users now have the option of selecting the "current view". This will render CSV output matching the current configuration of the table being viewed. For example, if you modify the sites list to display only the site name, tenant, and status, the rendered CSV will include only these columns, and they will appear in the order chosen. -The legacy static export behavior has been retained to ensure backward compatibility for dependent integrations. However, users are strongly encouraged to adapt custom export templates where needed as this functionality will be removed in v2.12. +The legacy static export behavior has been retained to ensure backward compatibility for dependent integrations. However, users are strongly encouraged to adapt custom export templates where needed as this functionality will be removed in v3.0. #### Variable Scope Support for VLAN Groups ([#5284](https://github.com/netbox-community/netbox/issues/5284)) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index 29ecc3ef3..a4040bdf4 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -188,10 +188,10 @@ class ObjectVar(ScriptVariable): def __init__(self, model, query_params=None, null_option=None, *args, **kwargs): - # TODO: Remove display_field in v2.12 + # TODO: Remove display_field in v3.0 if 'display_field' in kwargs: warnings.warn( - "The 'display_field' parameter has been deprecated, and will be removed in NetBox v2.12. Object " + "The 'display_field' parameter has been deprecated, and will be removed in NetBox v3.0. Object " "variables will now reference the 'display' attribute available on all model serializers by default." ) display_field = kwargs.pop('display_field', 'display') diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 2d3f8570d..bf42a64c2 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -29,10 +29,10 @@ 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 +# TODO: Remove in NetBox v3.0 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 " + "Support for Python 3.6 will be dropped in NetBox v3.0. Please upgrade to Python 3.7 or later at your " "earliest convenience." ) diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index 88f647225..f10f0e4d5 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -92,7 +92,7 @@ def inject_deprecation_warning(request): """ messages.warning( request, - mark_safe(' The secrets functionality will be moved to a plugin in NetBox v2.12. ' + mark_safe(' The secrets functionality will be moved to a plugin in NetBox v3.0. ' 'Please see issue #5278 for ' 'more information.') ) diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py index 9bc0e3df7..93b9e6c44 100644 --- a/netbox/utilities/forms/fields.py +++ b/netbox/utilities/forms/fields.py @@ -338,7 +338,7 @@ class DynamicModelChoiceMixin: filter = django_filters.ModelChoiceFilter widget = widgets.APISelect - # TODO: Remove display_field in v2.12 + # TODO: Remove display_field in v3.0 def __init__(self, display_field='display', query_params=None, initial_params=None, null_option=None, disabled_indicator=None, *args, **kwargs): self.display_field = display_field