From e19ce692388c2242ad271dfe2e85b269d7101d31 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 9 Jan 2023 10:08:26 -0500 Subject: [PATCH] Closes #10923: Remove unused NetBoxModelCSVForm class --- docs/release-notes/version-3.5.md | 7 +++++++ mkdocs.yml | 1 + netbox/netbox/forms/base.py | 9 --------- netbox/netbox/settings.py | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 docs/release-notes/version-3.5.md diff --git a/docs/release-notes/version-3.5.md b/docs/release-notes/version-3.5.md new file mode 100644 index 000000000..1e3ea18a9 --- /dev/null +++ b/docs/release-notes/version-3.5.md @@ -0,0 +1,7 @@ +# NetBox v3.4 + +## v3.5.0 (FUTURE) + +### Other Changes + +* [#10923](https://github.com/netbox-community/netbox/issues/10923) - Remove unused `NetBoxModelCSVForm` class (replaced by `NetBoxModelImportForm`) diff --git a/mkdocs.yml b/mkdocs.yml index 2317dad6d..ff9174455 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -259,6 +259,7 @@ nav: - git Cheat Sheet: 'development/git-cheat-sheet.md' - Release Notes: - Summary: 'release-notes/index.md' + - Version 3.5: 'release-notes/version-3.5.md' - Version 3.4: 'release-notes/version-3.4.md' - Version 3.3: 'release-notes/version-3.3.md' - Version 3.2: 'release-notes/version-3.2.md' diff --git a/netbox/netbox/forms/base.py b/netbox/netbox/forms/base.py index b4ad39b5e..83c238e0f 100644 --- a/netbox/netbox/forms/base.py +++ b/netbox/netbox/forms/base.py @@ -10,7 +10,6 @@ from utilities.forms import BootstrapMixin, CSVModelForm from utilities.forms.fields import CSVModelMultipleChoiceField, DynamicModelMultipleChoiceField __all__ = ( - 'NetBoxModelCSVForm', 'NetBoxModelForm', 'NetBoxModelImportForm', 'NetBoxModelBulkEditForm', @@ -86,14 +85,6 @@ class NetBoxModelImportForm(CSVModelForm, NetBoxModelForm): return customfield.to_form_field(for_csv_import=True) -class NetBoxModelCSVForm(NetBoxModelImportForm): - """ - Maintains backward compatibility for NetBoxModelImportForm for plugins. - """ - # TODO: Remove in NetBox v3.5 - pass - - class NetBoxModelBulkEditForm(BootstrapMixin, CustomFieldsMixin, forms.Form): """ Base form for modifying multiple NetBox objects (of the same type) in bulk via the UI. Adds support for custom diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index f6ce7ff33..cc8aa44e8 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -24,7 +24,7 @@ from netbox.constants import RQ_QUEUE_DEFAULT, RQ_QUEUE_HIGH, RQ_QUEUE_LOW # Environment setup # -VERSION = '3.4.5-dev' +VERSION = '3.5.0-dev' # Hostname HOSTNAME = platform.node()