Merge pull request #239 from mlebreuil/move-netbox-plugin-code

Remove the src directory
mlebreuil · Feb 11, 2025 · 4ae9087 · 4ae9087
2 parents d1b6d4f + d41f92c
commit 4ae9087
Show file tree

Hide file tree

Showing 74 changed files with 12 additions and 44 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,5 +4,5 @@ repos:
   hooks:
     - id: ruff
       name: "Ruff linter"
-      args: [ "src/netbox_contract/" ]
+      args: [ "netbox_contract/" ]
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ The [ruff](https://docs.astral.sh/ruff/) linter is used to enforce code style. A
 
 ```
 python3 -m pip install ruff
-ruff check src/netbox_contract/
+ruff check netbox_contract/
 ```
 
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -9,5 +9,5 @@ recursive-exclude * *.py[co]
 recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
 
 
-graft src/netbox_contract/templates
-graft src/netbox_contract/templates/netbox_contract
+graft netbox_contract/templates
+graft netbox_contract/templates/netbox_contract
diff --git a/Makefile b/Makefile
diff --git a/src/netbox_contract/__init__.py → netbox_contract/__init__.py b/src/netbox_contract/__init__.py → netbox_contract/__init__.py
diff --git a/src/netbox_contract/api/__init__.py → netbox_contract/api/__init__.py b/src/netbox_contract/api/__init__.py → netbox_contract/api/__init__.py
diff --git a/src/netbox_contract/api/serializers.py → netbox_contract/api/serializers.py b/src/netbox_contract/api/serializers.py → netbox_contract/api/serializers.py
diff --git a/src/netbox_contract/api/urls.py → netbox_contract/api/urls.py b/src/netbox_contract/api/urls.py → netbox_contract/api/urls.py
diff --git a/src/netbox_contract/api/views.py → netbox_contract/api/views.py b/src/netbox_contract/api/views.py → netbox_contract/api/views.py
diff --git a/src/netbox_contract/constants.py → netbox_contract/constants.py b/src/netbox_contract/constants.py → netbox_contract/constants.py
diff --git a/src/netbox_contract/filtersets.py → netbox_contract/filtersets.py b/src/netbox_contract/filtersets.py → netbox_contract/filtersets.py
diff --git a/src/netbox_contract/forms.py → netbox_contract/forms.py b/src/netbox_contract/forms.py → netbox_contract/forms.py
diff --git a/..._contract/locale/en/LC_MESSAGES/django.mo → ..._contract/locale/en/LC_MESSAGES/django.mo b/..._contract/locale/en/LC_MESSAGES/django.mo → ..._contract/locale/en/LC_MESSAGES/django.mo
diff --git a/..._contract/locale/en/LC_MESSAGES/django.po → ..._contract/locale/en/LC_MESSAGES/django.po b/..._contract/locale/en/LC_MESSAGES/django.po → ..._contract/locale/en/LC_MESSAGES/django.po
diff --git a/..._contract/locale/fr/LC_MESSAGES/django.mo → ..._contract/locale/fr/LC_MESSAGES/django.mo b/..._contract/locale/fr/LC_MESSAGES/django.mo → ..._contract/locale/fr/LC_MESSAGES/django.mo
diff --git a/..._contract/locale/fr/LC_MESSAGES/django.po → ..._contract/locale/fr/LC_MESSAGES/django.po b/..._contract/locale/fr/LC_MESSAGES/django.po → ..._contract/locale/fr/LC_MESSAGES/django.po
diff --git a/...etbox_contract/migrations/0001_initial.py → netbox_contract/migrations/0001_initial.py b/...etbox_contract/migrations/0001_initial.py → netbox_contract/migrations/0001_initial.py
diff --git a/...s/0002_alter_contract_circuit_and_more.py → ...s/0002_alter_contract_circuit_and_more.py b/...s/0002_alter_contract_circuit_and_more.py → ...s/0002_alter_contract_circuit_and_more.py
diff --git a/...er_contract_custom_field_data_and_more.py → ...er_contract_custom_field_data_and_more.py b/...er_contract_custom_field_data_and_more.py → ...er_contract_custom_field_data_and_more.py
diff --git a/...004_contract_currency_invoice_currency.py → ...004_contract_currency_invoice_currency.py b/...004_contract_currency_invoice_currency.py → ...004_contract_currency_invoice_currency.py
diff --git a/...ontract_accounting_dimensions_and_more.py → ...ontract_accounting_dimensions_and_more.py b/...ontract_accounting_dimensions_and_more.py → ...ontract_accounting_dimensions_and_more.py
diff --git a/...migrations/0006_alter_contract_circuit.py → ...migrations/0006_alter_contract_circuit.py b/...migrations/0006_alter_contract_circuit.py → ...migrations/0006_alter_contract_circuit.py
diff --git a/..._contract/migrations/0007_invoice_date.py → ..._contract/migrations/0007_invoice_date.py b/..._contract/migrations/0007_invoice_date.py → ..._contract/migrations/0007_invoice_date.py
diff --git a/...tract/migrations/0008_invoice_comments.py → ...tract/migrations/0008_invoice_comments.py b/...tract/migrations/0008_invoice_comments.py → ...tract/migrations/0008_invoice_comments.py
diff --git a/...tions/0009_contract_external_reference.py → ...tions/0009_contract_external_reference.py b/...tions/0009_contract_external_reference.py → ...tions/0009_contract_external_reference.py
diff --git a/...ract/migrations/0010_invoice_contracts.py → ...ract/migrations/0010_invoice_contracts.py b/...ract/migrations/0010_invoice_contracts.py → ...ract/migrations/0010_invoice_contracts.py
diff --git a/...act/migrations/0011_auto_20230122_2112.py → ...act/migrations/0011_auto_20230122_2112.py b/...act/migrations/0011_auto_20230122_2112.py → ...act/migrations/0011_auto_20230122_2112.py
diff --git a/...igrations/0012_remove_invoice_contract.py → ...igrations/0012_remove_invoice_contract.py b/...igrations/0012_remove_invoice_contract.py → ...igrations/0012_remove_invoice_contract.py
diff --git a/...3_contract_documents_invoice_documents.py → ...3_contract_documents_invoice_documents.py b/...3_contract_documents_invoice_documents.py → ...3_contract_documents_invoice_documents.py
diff --git a/...ract/migrations/0014_contract_end_date.py → ...ract/migrations/0014_contract_end_date.py b/...ract/migrations/0014_contract_end_date.py → ...ract/migrations/0014_contract_end_date.py
diff --git a/...ct/migrations/0015_contractassignement.py → ...ct/migrations/0015_contractassignement.py b/...ct/migrations/0015_contractassignement.py → ...ct/migrations/0015_contractassignement.py
diff --git a/...ntract/migrations/0016_contract_parent.py → ...ntract/migrations/0016_contract_parent.py b/...ntract/migrations/0016_contract_parent.py → ...ntract/migrations/0016_contract_parent.py
diff --git a/...7_alter_contract_accounting_dimensions.py → ...7_alter_contract_accounting_dimensions.py b/...7_alter_contract_accounting_dimensions.py → ...7_alter_contract_accounting_dimensions.py
diff --git a/...act_external_partie_object_id_and_more.py → ...act_external_partie_object_id_and_more.py b/...act_external_partie_object_id_and_more.py → ...act_external_partie_object_id_and_more.py
diff --git a/...act/migrations/0019_auto_20230924_1813.py → ...act/migrations/0019_auto_20230924_1813.py b/...act/migrations/0019_auto_20230924_1813.py → ...act/migrations/0019_auto_20230924_1813.py
diff --git a/...ns/0020_alter_contract_external_partie.py → ...ns/0020_alter_contract_external_partie.py b/...ns/0020_alter_contract_external_partie.py → ...ns/0020_alter_contract_external_partie.py
diff --git a/...ns/0021_alter_contract_external_partie.py → ...ns/0021_alter_contract_external_partie.py b/...ns/0021_alter_contract_external_partie.py → ...ns/0021_alter_contract_external_partie.py
diff --git a/..._internal_partie_alter_contract_parent.py → ..._internal_partie_alter_contract_parent.py b/..._internal_partie_alter_contract_parent.py → ..._internal_partie_alter_contract_parent.py
diff --git a/...ssignement_contractassignment_and_more.py → ...ssignement_contractassignment_and_more.py b/...ssignement_contractassignment_and_more.py → ...ssignement_contractassignment_and_more.py
diff --git a/...s/0024_remove_contract_external_partie.py → ...s/0024_remove_contract_external_partie.py b/...s/0024_remove_contract_external_partie.py → ...s/0024_remove_contract_external_partie.py
diff --git a/.../0025_remove_contract_circuit_and_more.py → .../0025_remove_contract_circuit_and_more.py b/.../0025_remove_contract_circuit_and_more.py → .../0025_remove_contract_circuit_and_more.py
diff --git a/...act/migrations/0026_auto_20240421_1550.py → ...act/migrations/0026_auto_20240421_1550.py b/...act/migrations/0026_auto_20240421_1550.py → ...act/migrations/0026_auto_20240421_1550.py
diff --git a/...x_contract/migrations/0027_invoiceline.py → ...x_contract/migrations/0027_invoiceline.py b/...x_contract/migrations/0027_invoiceline.py → ...x_contract/migrations/0027_invoiceline.py
diff --git a/...0028_invoiceline_accounting_dimensions.py → ...0028_invoiceline_accounting_dimensions.py b/...0028_invoiceline_accounting_dimensions.py → ...0028_invoiceline_accounting_dimensions.py
diff --git a/...iceline_accounting_dimensions_and_more.py → ...iceline_accounting_dimensions_and_more.py b/...iceline_accounting_dimensions_and_more.py → ...iceline_accounting_dimensions_and_more.py
diff --git a/...lter_invoiceline_accounting_dimensions.py → ...lter_invoiceline_accounting_dimensions.py b/...lter_invoiceline_accounting_dimensions.py → ...lter_invoiceline_accounting_dimensions.py
diff --git a/...ract_invoice_template_invoice_template.py → ...ract_invoice_template_invoice_template.py b/...ract_invoice_template_invoice_template.py → ...ract_invoice_template_invoice_template.py
diff --git a/...nd_alter_invoice_period_start_and_more.py → ...nd_alter_invoice_period_start_and_more.py b/...nd_alter_invoice_period_start_and_more.py → ...nd_alter_invoice_period_start_and_more.py
diff --git a/.../0033_remove_contract_invoice_template.py → .../0033_remove_contract_invoice_template.py b/.../0033_remove_contract_invoice_template.py → .../0033_remove_contract_invoice_template.py
diff --git a/...s/0034_contract_yrc_alter_contract_mrc.py → ...s/0034_contract_yrc_alter_contract_mrc.py b/...s/0034_contract_yrc_alter_contract_mrc.py → ...s/0034_contract_yrc_alter_contract_mrc.py
diff --git a/...35_accountingdimension_status_and_more.py → ...35_accountingdimension_status_and_more.py b/...35_accountingdimension_status_and_more.py → ...35_accountingdimension_status_and_more.py
diff --git a/...lter_invoiceline_accounting_dimensions.py → ...lter_invoiceline_accounting_dimensions.py b/...lter_invoiceline_accounting_dimensions.py → ...lter_invoiceline_accounting_dimensions.py
diff --git a/...eriod_alter_contract_currency_and_more.py → ...eriod_alter_contract_currency_and_more.py b/...eriod_alter_contract_currency_and_more.py → ...eriod_alter_contract_currency_and_more.py
diff --git a/...r_accountingdimension_options_and_more.py → ...r_accountingdimension_options_and_more.py b/...r_accountingdimension_options_and_more.py → ...r_accountingdimension_options_and_more.py
diff --git a/...er_accountingdimension_status_and_more.py → ...er_accountingdimension_status_and_more.py b/...er_accountingdimension_status_and_more.py → ...er_accountingdimension_status_and_more.py
diff --git a/src/netbox_contract/migrations/__init__.py → netbox_contract/migrations/__init__.py b/src/netbox_contract/migrations/__init__.py → netbox_contract/migrations/__init__.py
diff --git a/src/netbox_contract/models.py → netbox_contract/models.py b/src/netbox_contract/models.py → netbox_contract/models.py
@@ -12,6 +12,7 @@
 from dcim.choices import DeviceStatusChoices, SiteStatusChoices
 from virtualization.choices import VirtualMachineStatusChoices
 
+
 class StatusChoices(ChoiceSet):
     key = 'Contract.status'
 

diff --git a/src/netbox_contract/navigation.py → netbox_contract/navigation.py b/src/netbox_contract/navigation.py → netbox_contract/navigation.py
diff --git a/src/netbox_contract/search.py → netbox_contract/search.py b/src/netbox_contract/search.py → netbox_contract/search.py
diff --git a/src/netbox_contract/tables.py → netbox_contract/tables.py b/src/netbox_contract/tables.py → netbox_contract/tables.py
@@ -19,7 +19,6 @@ class ContractAssignmentListTable(NetBoxTable):
     contract__external_partie_object = tables.Column(linkify=True)
     tags = columns.TagColumn(url_name='plugins:netbox_contract:contractassignment_list')
 
-
     class Meta(NetBoxTable.Meta):
         model = ContractAssignment
         fields = (

diff --git a/src/netbox_contract/template_content.py → netbox_contract/template_content.py b/src/netbox_contract/template_content.py → netbox_contract/template_content.py
diff --git a/...emplates/contract_assignments_bottom.html → ...emplates/contract_assignments_bottom.html b/...emplates/contract_assignments_bottom.html → ...emplates/contract_assignments_bottom.html
diff --git a/...tract/templates/contract_list_bottom.html → ...tract/templates/contract_list_bottom.html b/...tract/templates/contract_list_bottom.html → ...tract/templates/contract_list_bottom.html
diff --git a/.../netbox_contract/accountingdimension.html → .../netbox_contract/accountingdimension.html b/.../netbox_contract/accountingdimension.html → .../netbox_contract/accountingdimension.html
diff --git a/...t/templates/netbox_contract/contract.html → ...t/templates/netbox_contract/contract.html b/...t/templates/netbox_contract/contract.html → ...t/templates/netbox_contract/contract.html
diff --git a/...s/netbox_contract/contractassignment.html → ...s/netbox_contract/contractassignment.html b/...s/netbox_contract/contractassignment.html → ...s/netbox_contract/contractassignment.html
diff --git a/...ct/templates/netbox_contract/invoice.html → ...ct/templates/netbox_contract/invoice.html b/...ct/templates/netbox_contract/invoice.html → ...ct/templates/netbox_contract/invoice.html
diff --git a/...emplates/netbox_contract/invoiceline.html → ...emplates/netbox_contract/invoiceline.html b/...emplates/netbox_contract/invoiceline.html → ...emplates/netbox_contract/invoiceline.html
diff --git a/...ates/netbox_contract/serviceprovider.html → ...ates/netbox_contract/serviceprovider.html b/...ates/netbox_contract/serviceprovider.html → ...ates/netbox_contract/serviceprovider.html
diff --git a/src/netbox_contract/tests/__init__.py → netbox_contract/tests/__init__.py b/src/netbox_contract/tests/__init__.py → netbox_contract/tests/__init__.py
diff --git a/src/netbox_contract/tests/test_views.py → netbox_contract/tests/test_views.py b/src/netbox_contract/tests/test_views.py → netbox_contract/tests/test_views.py
diff --git a/src/netbox_contract/urls.py → netbox_contract/urls.py b/src/netbox_contract/urls.py → netbox_contract/urls.py
diff --git a/src/netbox_contract/views.py → netbox_contract/views.py b/src/netbox_contract/views.py → netbox_contract/views.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,10 @@
+# See PEP 518 for the spec of this file
+# https://www.python.org/dev/peps/pep-0518/
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "netbox-contract"
 version = "2.3.1"
@@ -20,21 +27,3 @@ classifiers = [
 [project.urls]
 "Homepage" = "https://github.com/mlebreuil/netbox-contract"
 "Bug Tracker" = "https://github.com/mlebreuil/netbox-contract/issues"
-
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools]
-zip-safe = false
-
-[tool.setuptools.packages.find]
-where = ["src"]
-include = ["*"]
-namespaces = false
-
-[tool.black]
-skip-string-normalization = true
-
-[tool.isort]
-profile = "black"
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     python3 -m pip install ruff
-    ruff check src/netbox_contract/
+    ruff check netbox_contract/
     ```
@@ Expand Down @@