From 3d9077f42339541281639c7aba63e573366a7e3a Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 17:52:29 +0100 Subject: [PATCH 01/10] Try to move the package into a src file --- Makefile | 2 ++ flake.nix | 4 ++++ {backups => src/backups}/__init__.py | 0 {backups => src/backups}/admin.py | 0 {backups => src/backups}/apps.py | 0 {backups => src/backups}/decorators.py | 0 {backups => src/backups}/fixtures/backups.yaml | 0 {backups => src/backups}/models/__init__.py | 0 {backups => src/backups}/models/backup.py | 0 {backups => src/backups}/models/notification.py | 0 {backups => src/backups}/tables.py | 0 .../templates/backups/backup_confirm_delete.html | 0 .../backups}/templates/backups/backup_create.html | 0 .../backups}/templates/backups/backup_details.html | 0 .../backups}/templates/backups/backup_list.html | 0 {backups => src/backups}/tests/test_backup.py | 0 .../backups}/tests/test_backup_detail_view.py | 0 .../backups}/tests/test_backup_form_view.py | 0 .../tests/test_customer_backup_table_view.py | 0 {backups => src/backups}/urls.py | 0 {backups => src/backups}/views.py | 0 {computers => src/computers}/__init__.py | 0 {computers => src/computers}/admin.py | 0 {computers => src/computers}/apps.py | 0 {computers => src/computers}/filters.py | 0 .../computers}/fixtures/computers.yaml | 0 {computers => src/computers}/forms.py | 0 {computers => src/computers}/models/__init__.py | 0 {computers => src/computers}/models/computer.py | 0 {computers => src/computers}/models/cpu.py | 0 {computers => src/computers}/models/disk.py | 0 {computers => src/computers}/models/gpu.py | 0 {computers => src/computers}/models/raid.py | 0 {computers => src/computers}/models/ram.py | 0 .../computers}/static/inventory/css/inventory.css | 0 .../computers}/static/inventory/js/sorttable.js | 0 {computers => src/computers}/tables.py | 0 .../templates/computers/all_computers.html | 0 .../templates/computers/computer_create.html | 0 .../templates/computers/computer_details.html | 0 .../templates/computers/computer_list.html | 0 .../templates/computers/computer_update.html | 0 .../templates/computers/cpu_relation_create.html | 0 .../templates/computers/cronjob_details.html | 0 .../templates/computers/cronjob_list.html | 0 .../templates/computers/disk_relation_create.html | 0 .../templates/computers/gpu_relation_create.html | 0 .../computers}/templates/computers/raid_create.html | 0 .../templates/computers/ram_relation_create.html | 0 .../computers/relation_confirm_delete.html | 0 .../computers/software_relation_create.html | 0 {computers => src/computers}/tests/test_computer.py | 0 .../computers}/tests/test_computer_detail_view.py | 0 .../computers}/tests/test_computer_form.py | 0 .../computers}/tests/test_computer_form_views.py | 0 .../computers}/tests/test_computer_list_view.py | 0 .../tests/test_customer_computer_table_view.py | 0 {computers => src/computers}/urls.py | 0 {computers => src/computers}/views.py | 0 {core => src/core}/__init__.py | 0 {core => src/core}/admin.py | 0 {core => src/core}/apps.py | 0 {core => src/core}/fixtures/core.yaml | 0 {core => src/core}/models/__init__.py | 0 {core => src/core}/models/calendar.py | 0 {core => src/core}/models/category.py | 0 {core => src/core}/models/company.py | 0 {core => src/core}/models/time.py | 0 {core => src/core}/models/user.py | 0 .../core}/static/core/css/bootstrap-grid.css | 0 .../core}/static/core/css/bootstrap-grid.css.map | 0 .../core}/static/core/css/bootstrap-grid.min.css | 0 .../static/core/css/bootstrap-grid.min.css.map | 0 .../core}/static/core/css/bootstrap-reboot.css | 0 .../core}/static/core/css/bootstrap-reboot.css.map | 0 .../core}/static/core/css/bootstrap-reboot.min.css | 0 .../static/core/css/bootstrap-reboot.min.css.map | 0 {core => src/core}/static/core/css/bootstrap.css | 0 .../core}/static/core/css/bootstrap.css.map | 0 .../core}/static/core/css/bootstrap.min.css | 0 .../core}/static/core/css/bootstrap.min.css.map | 0 .../core}/static/core/css/material-icons.css | 0 .../static/core/fonts/MaterialIcons-Regular.eot | Bin .../static/core/fonts/MaterialIcons-Regular.ttf | Bin .../static/core/fonts/MaterialIcons-Regular.woff | Bin .../static/core/fonts/MaterialIcons-Regular.woff2 | Bin {core => src/core}/static/core/img/favicon.ico | Bin {core => src/core}/static/core/js/htmx.js | 0 {core => src/core}/tables.py | 0 {core => src/core}/templates/core/base.html | 0 .../core}/templates/core/partials/modal.html | 0 .../core}/templates/registration/login.html | 0 {core => src/core}/templatetags/__init__.py | 0 {core => src/core}/templatetags/core_extras.py | 0 {core => src/core}/tests/__init__.py | 0 {core => src/core}/tests/helper.py | 0 .../test_get_all_objects_for_allowed_customers.py | 0 .../tests/test_get_object_with_view_permission.py | 0 .../core}/tests/test_get_objects_for_customer.py | 0 {core => src/core}/tests/test_templatetags.py | 0 {core => src/core}/urls.py | 0 {core => src/core}/utils.py | 0 {customers => src/customers}/__init__.py | 0 {customers => src/customers}/admin.py | 0 {customers => src/customers}/apps.py | 0 {customers => src/customers}/decorators.py | 0 {customers => src/customers}/forms.py | 0 {customers => src/customers}/models.py | 0 {customers => src/customers}/tables.py | 0 .../customers/customer_confirm_delete.html | 0 .../templates/customers/customer_create.html | 0 .../templates/customers/customer_details.html | 0 .../templates/customers/customer_list.html | 0 .../customers/partials/customer_create.html | 0 .../customers/partials/location_create.html | 0 .../customers/partials/location_response.html | 0 {customers => src/customers}/tests/test_customer.py | 0 .../customers}/tests/test_customer_detail_view.py | 0 .../customers}/tests/test_customer_form_views.py | 0 .../customers}/tests/test_customer_list_view.py | 0 .../customers}/tests/test_location_form.py | 0 .../customers}/tests/test_location_form_view.py | 0 {customers => src/customers}/urls.py | 0 {customers => src/customers}/views.py | 0 {devices => src/devices}/__init__.py | 0 {devices => src/devices}/admin.py | 0 {devices => src/devices}/apps.py | 0 {devices => src/devices}/decorators.py | 0 {devices => src/devices}/fixtures/devices.yaml | 0 {devices => src/devices}/forms.py | 0 {devices => src/devices}/models/__init__.py | 0 {devices => src/devices}/models/device.py | 0 {devices => src/devices}/models/warranty.py | 0 {devices => src/devices}/tables.py | 0 .../templates/devices/device_confirm_delete.html | 0 .../devices}/templates/devices/device_create.html | 0 .../devices}/templates/devices/device_details.html | 0 .../templates/devices/device_details_block.html | 0 .../devices/device_in_net_confirm_delete.html | 0 .../templates/devices/device_in_net_create.html | 0 .../templates/devices/device_in_net_update.html | 0 .../devices}/templates/devices/device_list.html | 0 .../devices}/templates/devices/device_update.html | 0 .../devices}/templates/devices/ip_block.html | 0 .../templates/devices/manufacturer_details.html | 0 .../devices/partials/device_category_create.html | 0 .../devices/partials/device_category_response.html | 0 .../devices}/templates/devices/warranties_list.html | 0 .../devices}/templates/devices/warranty_block.html | 0 .../templates/devices/warranty_confirm_delete.html | 0 .../devices}/templates/devices/warranty_create.html | 0 .../devices}/templates/devices/warranty_update.html | 0 .../tests/test_connected_device_detail_view.py | 0 .../tests/test_customer_device_table_view.py | 0 {devices => src/devices}/tests/test_device.py | 0 .../tests/test_device_category_form_views.py | 0 .../devices}/tests/test_device_detail_view.py | 0 {devices => src/devices}/tests/test_device_form.py | 0 .../devices}/tests/test_device_form_views.py | 0 .../devices}/tests/test_warranty_form.py | 0 .../devices}/tests/test_warranty_list.py | 0 {devices => src/devices}/urls.py | 0 {devices => src/devices}/views.py | 0 {licenses => src/licenses}/__init__.py | 0 {licenses => src/licenses}/admin.py | 0 {licenses => src/licenses}/apps.py | 0 {licenses => src/licenses}/models.py | 0 {licenses => src/licenses}/tables.py | 0 .../licenses}/templates/licenses/license_block.html | 0 .../templates/licenses/license_confirm_delete.html | 0 .../licenses}/templates/licenses/license_list.html | 0 .../license_with_computer_confirm_delete.html | 0 .../licenses/license_with_computer_create.html | 0 .../tests/test_customer_license_table_view.py | 0 {licenses => src/licenses}/tests/test_license.py | 0 .../licenses}/tests/test_license_form_view.py | 0 {licenses => src/licenses}/urls.py | 0 {licenses => src/licenses}/views.py | 0 {nets => src/nets}/__init__.py | 0 {nets => src/nets}/admin.py | 0 {nets => src/nets}/apps.py | 0 {nets => src/nets}/decorators.py | 0 {nets => src/nets}/fixtures/nets.yaml | 0 {nets => src/nets}/models.py | 0 {nets => src/nets}/tables.py | 0 .../nets}/templates/nets/net_confirm_delete.html | 0 {nets => src/nets}/templates/nets/net_details.html | 0 {nets => src/nets}/templates/nets/net_list.html | 0 {nets => src/nets}/tests/test_models/test_net.py | 0 .../test_views/test_customer_net_table_view.py | 0 .../nets}/tests/test_views/test_net_detail_view.py | 0 {nets => src/nets}/urls.py | 0 {nets => src/nets}/views.py | 0 .../network_inventory}/__init__.py | 0 .../network_inventory}/settings/__init__.py | 0 .../network_inventory}/settings/base.py | 0 .../network_inventory}/settings/docker.py | 0 .../network_inventory}/settings/local.py | 0 .../network_inventory}/settings/production.py | 0 .../network_inventory}/settings/ram_test.py | 0 .../network_inventory}/urls.py | 0 .../network_inventory}/wsgi.py | 0 {softwares => src/softwares}/__init__.py | 0 {softwares => src/softwares}/admin.py | 0 {softwares => src/softwares}/apps.py | 0 .../softwares}/fixtures/softwares.yaml | 0 {softwares => src/softwares}/models/__init__.py | 0 {softwares => src/softwares}/models/os.py | 0 {softwares => src/softwares}/models/services.py | 0 {softwares => src/softwares}/models/software.py | 0 {users => src/users}/__init__.py | 0 {users => src/users}/admin.py | 0 {users => src/users}/apps.py | 0 {users => src/users}/decorators.py | 0 {users => src/users}/models/__init__.py | 0 {users => src/users}/models/groups.py | 0 {users => src/users}/models/mailalias.py | 0 {users => src/users}/models/user.py | 0 {users => src/users}/tables.py | 0 .../templates/groups/group_confirm_delete.html | 0 .../users}/templates/groups/group_details.html | 0 .../users}/templates/groups/group_list.html | 0 .../users}/templates/users/user_confirm_delete.html | 0 .../users}/templates/users/user_details.html | 0 {users => src/users}/templates/users/user_list.html | 0 .../users}/tests/test_customer_group_table_view.py | 0 .../users}/tests/test_customer_user_table_view.py | 0 .../users}/tests/test_group_detail_view.py | 0 {users => src/users}/tests/test_user.py | 0 {users => src/users}/tests/test_user_detail_view.py | 0 {users => src/users}/urls.py | 0 {users => src/users}/views.py | 0 232 files changed, 6 insertions(+) rename {backups => src/backups}/__init__.py (100%) rename {backups => src/backups}/admin.py (100%) rename {backups => src/backups}/apps.py (100%) rename {backups => src/backups}/decorators.py (100%) rename {backups => src/backups}/fixtures/backups.yaml (100%) rename {backups => src/backups}/models/__init__.py (100%) rename {backups => src/backups}/models/backup.py (100%) rename {backups => src/backups}/models/notification.py (100%) rename {backups => src/backups}/tables.py (100%) rename {backups => src/backups}/templates/backups/backup_confirm_delete.html (100%) rename {backups => src/backups}/templates/backups/backup_create.html (100%) rename {backups => src/backups}/templates/backups/backup_details.html (100%) rename {backups => src/backups}/templates/backups/backup_list.html (100%) rename {backups => src/backups}/tests/test_backup.py (100%) rename {backups => src/backups}/tests/test_backup_detail_view.py (100%) rename {backups => src/backups}/tests/test_backup_form_view.py (100%) rename {backups => src/backups}/tests/test_customer_backup_table_view.py (100%) rename {backups => src/backups}/urls.py (100%) rename {backups => src/backups}/views.py (100%) rename {computers => src/computers}/__init__.py (100%) rename {computers => src/computers}/admin.py (100%) rename {computers => src/computers}/apps.py (100%) rename {computers => src/computers}/filters.py (100%) rename {computers => src/computers}/fixtures/computers.yaml (100%) rename {computers => src/computers}/forms.py (100%) rename {computers => src/computers}/models/__init__.py (100%) rename {computers => src/computers}/models/computer.py (100%) rename {computers => src/computers}/models/cpu.py (100%) rename {computers => src/computers}/models/disk.py (100%) rename {computers => src/computers}/models/gpu.py (100%) rename {computers => src/computers}/models/raid.py (100%) rename {computers => src/computers}/models/ram.py (100%) rename {computers => src/computers}/static/inventory/css/inventory.css (100%) rename {computers => src/computers}/static/inventory/js/sorttable.js (100%) rename {computers => src/computers}/tables.py (100%) rename {computers => src/computers}/templates/computers/all_computers.html (100%) rename {computers => src/computers}/templates/computers/computer_create.html (100%) rename {computers => src/computers}/templates/computers/computer_details.html (100%) rename {computers => src/computers}/templates/computers/computer_list.html (100%) rename {computers => src/computers}/templates/computers/computer_update.html (100%) rename {computers => src/computers}/templates/computers/cpu_relation_create.html (100%) rename {computers => src/computers}/templates/computers/cronjob_details.html (100%) rename {computers => src/computers}/templates/computers/cronjob_list.html (100%) rename {computers => src/computers}/templates/computers/disk_relation_create.html (100%) rename {computers => src/computers}/templates/computers/gpu_relation_create.html (100%) rename {computers => src/computers}/templates/computers/raid_create.html (100%) rename {computers => src/computers}/templates/computers/ram_relation_create.html (100%) rename {computers => src/computers}/templates/computers/relation_confirm_delete.html (100%) rename {computers => src/computers}/templates/computers/software_relation_create.html (100%) rename {computers => src/computers}/tests/test_computer.py (100%) rename {computers => src/computers}/tests/test_computer_detail_view.py (100%) rename {computers => src/computers}/tests/test_computer_form.py (100%) rename {computers => src/computers}/tests/test_computer_form_views.py (100%) rename {computers => src/computers}/tests/test_computer_list_view.py (100%) rename {computers => src/computers}/tests/test_customer_computer_table_view.py (100%) rename {computers => src/computers}/urls.py (100%) rename {computers => src/computers}/views.py (100%) rename {core => src/core}/__init__.py (100%) rename {core => src/core}/admin.py (100%) rename {core => src/core}/apps.py (100%) rename {core => src/core}/fixtures/core.yaml (100%) rename {core => src/core}/models/__init__.py (100%) rename {core => src/core}/models/calendar.py (100%) rename {core => src/core}/models/category.py (100%) rename {core => src/core}/models/company.py (100%) rename {core => src/core}/models/time.py (100%) rename {core => src/core}/models/user.py (100%) rename {core => src/core}/static/core/css/bootstrap-grid.css (100%) rename {core => src/core}/static/core/css/bootstrap-grid.css.map (100%) rename {core => src/core}/static/core/css/bootstrap-grid.min.css (100%) rename {core => src/core}/static/core/css/bootstrap-grid.min.css.map (100%) rename {core => src/core}/static/core/css/bootstrap-reboot.css (100%) rename {core => src/core}/static/core/css/bootstrap-reboot.css.map (100%) rename {core => src/core}/static/core/css/bootstrap-reboot.min.css (100%) rename {core => src/core}/static/core/css/bootstrap-reboot.min.css.map (100%) rename {core => src/core}/static/core/css/bootstrap.css (100%) rename {core => src/core}/static/core/css/bootstrap.css.map (100%) rename {core => src/core}/static/core/css/bootstrap.min.css (100%) rename {core => src/core}/static/core/css/bootstrap.min.css.map (100%) rename {core => src/core}/static/core/css/material-icons.css (100%) rename {core => src/core}/static/core/fonts/MaterialIcons-Regular.eot (100%) rename {core => src/core}/static/core/fonts/MaterialIcons-Regular.ttf (100%) rename {core => src/core}/static/core/fonts/MaterialIcons-Regular.woff (100%) rename {core => src/core}/static/core/fonts/MaterialIcons-Regular.woff2 (100%) rename {core => src/core}/static/core/img/favicon.ico (100%) rename {core => src/core}/static/core/js/htmx.js (100%) rename {core => src/core}/tables.py (100%) rename {core => src/core}/templates/core/base.html (100%) rename {core => src/core}/templates/core/partials/modal.html (100%) rename {core => src/core}/templates/registration/login.html (100%) rename {core => src/core}/templatetags/__init__.py (100%) rename {core => src/core}/templatetags/core_extras.py (100%) rename {core => src/core}/tests/__init__.py (100%) rename {core => src/core}/tests/helper.py (100%) rename {core => src/core}/tests/test_get_all_objects_for_allowed_customers.py (100%) rename {core => src/core}/tests/test_get_object_with_view_permission.py (100%) rename {core => src/core}/tests/test_get_objects_for_customer.py (100%) rename {core => src/core}/tests/test_templatetags.py (100%) rename {core => src/core}/urls.py (100%) rename {core => src/core}/utils.py (100%) rename {customers => src/customers}/__init__.py (100%) rename {customers => src/customers}/admin.py (100%) rename {customers => src/customers}/apps.py (100%) rename {customers => src/customers}/decorators.py (100%) rename {customers => src/customers}/forms.py (100%) rename {customers => src/customers}/models.py (100%) rename {customers => src/customers}/tables.py (100%) rename {customers => src/customers}/templates/customers/customer_confirm_delete.html (100%) rename {customers => src/customers}/templates/customers/customer_create.html (100%) rename {customers => src/customers}/templates/customers/customer_details.html (100%) rename {customers => src/customers}/templates/customers/customer_list.html (100%) rename {customers => src/customers}/templates/customers/partials/customer_create.html (100%) rename {customers => src/customers}/templates/customers/partials/location_create.html (100%) rename {customers => src/customers}/templates/customers/partials/location_response.html (100%) rename {customers => src/customers}/tests/test_customer.py (100%) rename {customers => src/customers}/tests/test_customer_detail_view.py (100%) rename {customers => src/customers}/tests/test_customer_form_views.py (100%) rename {customers => src/customers}/tests/test_customer_list_view.py (100%) rename {customers => src/customers}/tests/test_location_form.py (100%) rename {customers => src/customers}/tests/test_location_form_view.py (100%) rename {customers => src/customers}/urls.py (100%) rename {customers => src/customers}/views.py (100%) rename {devices => src/devices}/__init__.py (100%) rename {devices => src/devices}/admin.py (100%) rename {devices => src/devices}/apps.py (100%) rename {devices => src/devices}/decorators.py (100%) rename {devices => src/devices}/fixtures/devices.yaml (100%) rename {devices => src/devices}/forms.py (100%) rename {devices => src/devices}/models/__init__.py (100%) rename {devices => src/devices}/models/device.py (100%) rename {devices => src/devices}/models/warranty.py (100%) rename {devices => src/devices}/tables.py (100%) rename {devices => src/devices}/templates/devices/device_confirm_delete.html (100%) rename {devices => src/devices}/templates/devices/device_create.html (100%) rename {devices => src/devices}/templates/devices/device_details.html (100%) rename {devices => src/devices}/templates/devices/device_details_block.html (100%) rename {devices => src/devices}/templates/devices/device_in_net_confirm_delete.html (100%) rename {devices => src/devices}/templates/devices/device_in_net_create.html (100%) rename {devices => src/devices}/templates/devices/device_in_net_update.html (100%) rename {devices => src/devices}/templates/devices/device_list.html (100%) rename {devices => src/devices}/templates/devices/device_update.html (100%) rename {devices => src/devices}/templates/devices/ip_block.html (100%) rename {devices => src/devices}/templates/devices/manufacturer_details.html (100%) rename {devices => src/devices}/templates/devices/partials/device_category_create.html (100%) rename {devices => src/devices}/templates/devices/partials/device_category_response.html (100%) rename {devices => src/devices}/templates/devices/warranties_list.html (100%) rename {devices => src/devices}/templates/devices/warranty_block.html (100%) rename {devices => src/devices}/templates/devices/warranty_confirm_delete.html (100%) rename {devices => src/devices}/templates/devices/warranty_create.html (100%) rename {devices => src/devices}/templates/devices/warranty_update.html (100%) rename {devices => src/devices}/tests/test_connected_device_detail_view.py (100%) rename {devices => src/devices}/tests/test_customer_device_table_view.py (100%) rename {devices => src/devices}/tests/test_device.py (100%) rename {devices => src/devices}/tests/test_device_category_form_views.py (100%) rename {devices => src/devices}/tests/test_device_detail_view.py (100%) rename {devices => src/devices}/tests/test_device_form.py (100%) rename {devices => src/devices}/tests/test_device_form_views.py (100%) rename {devices => src/devices}/tests/test_warranty_form.py (100%) rename {devices => src/devices}/tests/test_warranty_list.py (100%) rename {devices => src/devices}/urls.py (100%) rename {devices => src/devices}/views.py (100%) rename {licenses => src/licenses}/__init__.py (100%) rename {licenses => src/licenses}/admin.py (100%) rename {licenses => src/licenses}/apps.py (100%) rename {licenses => src/licenses}/models.py (100%) rename {licenses => src/licenses}/tables.py (100%) rename {licenses => src/licenses}/templates/licenses/license_block.html (100%) rename {licenses => src/licenses}/templates/licenses/license_confirm_delete.html (100%) rename {licenses => src/licenses}/templates/licenses/license_list.html (100%) rename {licenses => src/licenses}/templates/licenses/license_with_computer_confirm_delete.html (100%) rename {licenses => src/licenses}/templates/licenses/license_with_computer_create.html (100%) rename {licenses => src/licenses}/tests/test_customer_license_table_view.py (100%) rename {licenses => src/licenses}/tests/test_license.py (100%) rename {licenses => src/licenses}/tests/test_license_form_view.py (100%) rename {licenses => src/licenses}/urls.py (100%) rename {licenses => src/licenses}/views.py (100%) rename {nets => src/nets}/__init__.py (100%) rename {nets => src/nets}/admin.py (100%) rename {nets => src/nets}/apps.py (100%) rename {nets => src/nets}/decorators.py (100%) rename {nets => src/nets}/fixtures/nets.yaml (100%) rename {nets => src/nets}/models.py (100%) rename {nets => src/nets}/tables.py (100%) rename {nets => src/nets}/templates/nets/net_confirm_delete.html (100%) rename {nets => src/nets}/templates/nets/net_details.html (100%) rename {nets => src/nets}/templates/nets/net_list.html (100%) rename {nets => src/nets}/tests/test_models/test_net.py (100%) rename {nets => src/nets}/tests/test_views/test_customer_net_table_view.py (100%) rename {nets => src/nets}/tests/test_views/test_net_detail_view.py (100%) rename {nets => src/nets}/urls.py (100%) rename {nets => src/nets}/views.py (100%) rename {network_inventory => src/network_inventory}/__init__.py (100%) rename {network_inventory => src/network_inventory}/settings/__init__.py (100%) rename {network_inventory => src/network_inventory}/settings/base.py (100%) rename {network_inventory => src/network_inventory}/settings/docker.py (100%) rename {network_inventory => src/network_inventory}/settings/local.py (100%) rename {network_inventory => src/network_inventory}/settings/production.py (100%) rename {network_inventory => src/network_inventory}/settings/ram_test.py (100%) rename {network_inventory => src/network_inventory}/urls.py (100%) rename {network_inventory => src/network_inventory}/wsgi.py (100%) rename {softwares => src/softwares}/__init__.py (100%) rename {softwares => src/softwares}/admin.py (100%) rename {softwares => src/softwares}/apps.py (100%) rename {softwares => src/softwares}/fixtures/softwares.yaml (100%) rename {softwares => src/softwares}/models/__init__.py (100%) rename {softwares => src/softwares}/models/os.py (100%) rename {softwares => src/softwares}/models/services.py (100%) rename {softwares => src/softwares}/models/software.py (100%) rename {users => src/users}/__init__.py (100%) rename {users => src/users}/admin.py (100%) rename {users => src/users}/apps.py (100%) rename {users => src/users}/decorators.py (100%) rename {users => src/users}/models/__init__.py (100%) rename {users => src/users}/models/groups.py (100%) rename {users => src/users}/models/mailalias.py (100%) rename {users => src/users}/models/user.py (100%) rename {users => src/users}/tables.py (100%) rename {users => src/users}/templates/groups/group_confirm_delete.html (100%) rename {users => src/users}/templates/groups/group_details.html (100%) rename {users => src/users}/templates/groups/group_list.html (100%) rename {users => src/users}/templates/users/user_confirm_delete.html (100%) rename {users => src/users}/templates/users/user_details.html (100%) rename {users => src/users}/templates/users/user_list.html (100%) rename {users => src/users}/tests/test_customer_group_table_view.py (100%) rename {users => src/users}/tests/test_customer_user_table_view.py (100%) rename {users => src/users}/tests/test_group_detail_view.py (100%) rename {users => src/users}/tests/test_user.py (100%) rename {users => src/users}/tests/test_user_detail_view.py (100%) rename {users => src/users}/urls.py (100%) rename {users => src/users}/views.py (100%) diff --git a/Makefile b/Makefile index 684b90d..cdee043 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ run: setup ( \ find . -name __pycache__ -o -name "*.pyc" -delete; \ sudo iptables -I INPUT -p tcp --dport 8000 -j ACCEPT; \ + cd src/ python manage.py runserver 0.0.0.0:8000; \ ) @@ -14,6 +15,7 @@ run: setup setup: ( \ docker-compose -f docker-compose-development.yml up -d; \ + cd src/ if [ -f .second_run ]; then \ sleep 2; \ python manage.py collectstatic --noinput; \ diff --git a/flake.nix b/flake.nix index 684e0f9..4582f0e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,13 @@ (final: prev: { inventoryEnv = prev.poetry2nix.mkPoetryEnv { projectDir = ./.; + editablePackageSources = { + inventory = ./src; + }; }; inventoryPackage = prev.poetry2nix.mkPoetryApplication { projectDir = ./.; + src = ./src; }; }) ]; diff --git a/backups/__init__.py b/src/backups/__init__.py similarity index 100% rename from backups/__init__.py rename to src/backups/__init__.py diff --git a/backups/admin.py b/src/backups/admin.py similarity index 100% rename from backups/admin.py rename to src/backups/admin.py diff --git a/backups/apps.py b/src/backups/apps.py similarity index 100% rename from backups/apps.py rename to src/backups/apps.py diff --git a/backups/decorators.py b/src/backups/decorators.py similarity index 100% rename from backups/decorators.py rename to src/backups/decorators.py diff --git a/backups/fixtures/backups.yaml b/src/backups/fixtures/backups.yaml similarity index 100% rename from backups/fixtures/backups.yaml rename to src/backups/fixtures/backups.yaml diff --git a/backups/models/__init__.py b/src/backups/models/__init__.py similarity index 100% rename from backups/models/__init__.py rename to src/backups/models/__init__.py diff --git a/backups/models/backup.py b/src/backups/models/backup.py similarity index 100% rename from backups/models/backup.py rename to src/backups/models/backup.py diff --git a/backups/models/notification.py b/src/backups/models/notification.py similarity index 100% rename from backups/models/notification.py rename to src/backups/models/notification.py diff --git a/backups/tables.py b/src/backups/tables.py similarity index 100% rename from backups/tables.py rename to src/backups/tables.py diff --git a/backups/templates/backups/backup_confirm_delete.html b/src/backups/templates/backups/backup_confirm_delete.html similarity index 100% rename from backups/templates/backups/backup_confirm_delete.html rename to src/backups/templates/backups/backup_confirm_delete.html diff --git a/backups/templates/backups/backup_create.html b/src/backups/templates/backups/backup_create.html similarity index 100% rename from backups/templates/backups/backup_create.html rename to src/backups/templates/backups/backup_create.html diff --git a/backups/templates/backups/backup_details.html b/src/backups/templates/backups/backup_details.html similarity index 100% rename from backups/templates/backups/backup_details.html rename to src/backups/templates/backups/backup_details.html diff --git a/backups/templates/backups/backup_list.html b/src/backups/templates/backups/backup_list.html similarity index 100% rename from backups/templates/backups/backup_list.html rename to src/backups/templates/backups/backup_list.html diff --git a/backups/tests/test_backup.py b/src/backups/tests/test_backup.py similarity index 100% rename from backups/tests/test_backup.py rename to src/backups/tests/test_backup.py diff --git a/backups/tests/test_backup_detail_view.py b/src/backups/tests/test_backup_detail_view.py similarity index 100% rename from backups/tests/test_backup_detail_view.py rename to src/backups/tests/test_backup_detail_view.py diff --git a/backups/tests/test_backup_form_view.py b/src/backups/tests/test_backup_form_view.py similarity index 100% rename from backups/tests/test_backup_form_view.py rename to src/backups/tests/test_backup_form_view.py diff --git a/backups/tests/test_customer_backup_table_view.py b/src/backups/tests/test_customer_backup_table_view.py similarity index 100% rename from backups/tests/test_customer_backup_table_view.py rename to src/backups/tests/test_customer_backup_table_view.py diff --git a/backups/urls.py b/src/backups/urls.py similarity index 100% rename from backups/urls.py rename to src/backups/urls.py diff --git a/backups/views.py b/src/backups/views.py similarity index 100% rename from backups/views.py rename to src/backups/views.py diff --git a/computers/__init__.py b/src/computers/__init__.py similarity index 100% rename from computers/__init__.py rename to src/computers/__init__.py diff --git a/computers/admin.py b/src/computers/admin.py similarity index 100% rename from computers/admin.py rename to src/computers/admin.py diff --git a/computers/apps.py b/src/computers/apps.py similarity index 100% rename from computers/apps.py rename to src/computers/apps.py diff --git a/computers/filters.py b/src/computers/filters.py similarity index 100% rename from computers/filters.py rename to src/computers/filters.py diff --git a/computers/fixtures/computers.yaml b/src/computers/fixtures/computers.yaml similarity index 100% rename from computers/fixtures/computers.yaml rename to src/computers/fixtures/computers.yaml diff --git a/computers/forms.py b/src/computers/forms.py similarity index 100% rename from computers/forms.py rename to src/computers/forms.py diff --git a/computers/models/__init__.py b/src/computers/models/__init__.py similarity index 100% rename from computers/models/__init__.py rename to src/computers/models/__init__.py diff --git a/computers/models/computer.py b/src/computers/models/computer.py similarity index 100% rename from computers/models/computer.py rename to src/computers/models/computer.py diff --git a/computers/models/cpu.py b/src/computers/models/cpu.py similarity index 100% rename from computers/models/cpu.py rename to src/computers/models/cpu.py diff --git a/computers/models/disk.py b/src/computers/models/disk.py similarity index 100% rename from computers/models/disk.py rename to src/computers/models/disk.py diff --git a/computers/models/gpu.py b/src/computers/models/gpu.py similarity index 100% rename from computers/models/gpu.py rename to src/computers/models/gpu.py diff --git a/computers/models/raid.py b/src/computers/models/raid.py similarity index 100% rename from computers/models/raid.py rename to src/computers/models/raid.py diff --git a/computers/models/ram.py b/src/computers/models/ram.py similarity index 100% rename from computers/models/ram.py rename to src/computers/models/ram.py diff --git a/computers/static/inventory/css/inventory.css b/src/computers/static/inventory/css/inventory.css similarity index 100% rename from computers/static/inventory/css/inventory.css rename to src/computers/static/inventory/css/inventory.css diff --git a/computers/static/inventory/js/sorttable.js b/src/computers/static/inventory/js/sorttable.js similarity index 100% rename from computers/static/inventory/js/sorttable.js rename to src/computers/static/inventory/js/sorttable.js diff --git a/computers/tables.py b/src/computers/tables.py similarity index 100% rename from computers/tables.py rename to src/computers/tables.py diff --git a/computers/templates/computers/all_computers.html b/src/computers/templates/computers/all_computers.html similarity index 100% rename from computers/templates/computers/all_computers.html rename to src/computers/templates/computers/all_computers.html diff --git a/computers/templates/computers/computer_create.html b/src/computers/templates/computers/computer_create.html similarity index 100% rename from computers/templates/computers/computer_create.html rename to src/computers/templates/computers/computer_create.html diff --git a/computers/templates/computers/computer_details.html b/src/computers/templates/computers/computer_details.html similarity index 100% rename from computers/templates/computers/computer_details.html rename to src/computers/templates/computers/computer_details.html diff --git a/computers/templates/computers/computer_list.html b/src/computers/templates/computers/computer_list.html similarity index 100% rename from computers/templates/computers/computer_list.html rename to src/computers/templates/computers/computer_list.html diff --git a/computers/templates/computers/computer_update.html b/src/computers/templates/computers/computer_update.html similarity index 100% rename from computers/templates/computers/computer_update.html rename to src/computers/templates/computers/computer_update.html diff --git a/computers/templates/computers/cpu_relation_create.html b/src/computers/templates/computers/cpu_relation_create.html similarity index 100% rename from computers/templates/computers/cpu_relation_create.html rename to src/computers/templates/computers/cpu_relation_create.html diff --git a/computers/templates/computers/cronjob_details.html b/src/computers/templates/computers/cronjob_details.html similarity index 100% rename from computers/templates/computers/cronjob_details.html rename to src/computers/templates/computers/cronjob_details.html diff --git a/computers/templates/computers/cronjob_list.html b/src/computers/templates/computers/cronjob_list.html similarity index 100% rename from computers/templates/computers/cronjob_list.html rename to src/computers/templates/computers/cronjob_list.html diff --git a/computers/templates/computers/disk_relation_create.html b/src/computers/templates/computers/disk_relation_create.html similarity index 100% rename from computers/templates/computers/disk_relation_create.html rename to src/computers/templates/computers/disk_relation_create.html diff --git a/computers/templates/computers/gpu_relation_create.html b/src/computers/templates/computers/gpu_relation_create.html similarity index 100% rename from computers/templates/computers/gpu_relation_create.html rename to src/computers/templates/computers/gpu_relation_create.html diff --git a/computers/templates/computers/raid_create.html b/src/computers/templates/computers/raid_create.html similarity index 100% rename from computers/templates/computers/raid_create.html rename to src/computers/templates/computers/raid_create.html diff --git a/computers/templates/computers/ram_relation_create.html b/src/computers/templates/computers/ram_relation_create.html similarity index 100% rename from computers/templates/computers/ram_relation_create.html rename to src/computers/templates/computers/ram_relation_create.html diff --git a/computers/templates/computers/relation_confirm_delete.html b/src/computers/templates/computers/relation_confirm_delete.html similarity index 100% rename from computers/templates/computers/relation_confirm_delete.html rename to src/computers/templates/computers/relation_confirm_delete.html diff --git a/computers/templates/computers/software_relation_create.html b/src/computers/templates/computers/software_relation_create.html similarity index 100% rename from computers/templates/computers/software_relation_create.html rename to src/computers/templates/computers/software_relation_create.html diff --git a/computers/tests/test_computer.py b/src/computers/tests/test_computer.py similarity index 100% rename from computers/tests/test_computer.py rename to src/computers/tests/test_computer.py diff --git a/computers/tests/test_computer_detail_view.py b/src/computers/tests/test_computer_detail_view.py similarity index 100% rename from computers/tests/test_computer_detail_view.py rename to src/computers/tests/test_computer_detail_view.py diff --git a/computers/tests/test_computer_form.py b/src/computers/tests/test_computer_form.py similarity index 100% rename from computers/tests/test_computer_form.py rename to src/computers/tests/test_computer_form.py diff --git a/computers/tests/test_computer_form_views.py b/src/computers/tests/test_computer_form_views.py similarity index 100% rename from computers/tests/test_computer_form_views.py rename to src/computers/tests/test_computer_form_views.py diff --git a/computers/tests/test_computer_list_view.py b/src/computers/tests/test_computer_list_view.py similarity index 100% rename from computers/tests/test_computer_list_view.py rename to src/computers/tests/test_computer_list_view.py diff --git a/computers/tests/test_customer_computer_table_view.py b/src/computers/tests/test_customer_computer_table_view.py similarity index 100% rename from computers/tests/test_customer_computer_table_view.py rename to src/computers/tests/test_customer_computer_table_view.py diff --git a/computers/urls.py b/src/computers/urls.py similarity index 100% rename from computers/urls.py rename to src/computers/urls.py diff --git a/computers/views.py b/src/computers/views.py similarity index 100% rename from computers/views.py rename to src/computers/views.py diff --git a/core/__init__.py b/src/core/__init__.py similarity index 100% rename from core/__init__.py rename to src/core/__init__.py diff --git a/core/admin.py b/src/core/admin.py similarity index 100% rename from core/admin.py rename to src/core/admin.py diff --git a/core/apps.py b/src/core/apps.py similarity index 100% rename from core/apps.py rename to src/core/apps.py diff --git a/core/fixtures/core.yaml b/src/core/fixtures/core.yaml similarity index 100% rename from core/fixtures/core.yaml rename to src/core/fixtures/core.yaml diff --git a/core/models/__init__.py b/src/core/models/__init__.py similarity index 100% rename from core/models/__init__.py rename to src/core/models/__init__.py diff --git a/core/models/calendar.py b/src/core/models/calendar.py similarity index 100% rename from core/models/calendar.py rename to src/core/models/calendar.py diff --git a/core/models/category.py b/src/core/models/category.py similarity index 100% rename from core/models/category.py rename to src/core/models/category.py diff --git a/core/models/company.py b/src/core/models/company.py similarity index 100% rename from core/models/company.py rename to src/core/models/company.py diff --git a/core/models/time.py b/src/core/models/time.py similarity index 100% rename from core/models/time.py rename to src/core/models/time.py diff --git a/core/models/user.py b/src/core/models/user.py similarity index 100% rename from core/models/user.py rename to src/core/models/user.py diff --git a/core/static/core/css/bootstrap-grid.css b/src/core/static/core/css/bootstrap-grid.css similarity index 100% rename from core/static/core/css/bootstrap-grid.css rename to src/core/static/core/css/bootstrap-grid.css diff --git a/core/static/core/css/bootstrap-grid.css.map b/src/core/static/core/css/bootstrap-grid.css.map similarity index 100% rename from core/static/core/css/bootstrap-grid.css.map rename to src/core/static/core/css/bootstrap-grid.css.map diff --git a/core/static/core/css/bootstrap-grid.min.css b/src/core/static/core/css/bootstrap-grid.min.css similarity index 100% rename from core/static/core/css/bootstrap-grid.min.css rename to src/core/static/core/css/bootstrap-grid.min.css diff --git a/core/static/core/css/bootstrap-grid.min.css.map b/src/core/static/core/css/bootstrap-grid.min.css.map similarity index 100% rename from core/static/core/css/bootstrap-grid.min.css.map rename to src/core/static/core/css/bootstrap-grid.min.css.map diff --git a/core/static/core/css/bootstrap-reboot.css b/src/core/static/core/css/bootstrap-reboot.css similarity index 100% rename from core/static/core/css/bootstrap-reboot.css rename to src/core/static/core/css/bootstrap-reboot.css diff --git a/core/static/core/css/bootstrap-reboot.css.map b/src/core/static/core/css/bootstrap-reboot.css.map similarity index 100% rename from core/static/core/css/bootstrap-reboot.css.map rename to src/core/static/core/css/bootstrap-reboot.css.map diff --git a/core/static/core/css/bootstrap-reboot.min.css b/src/core/static/core/css/bootstrap-reboot.min.css similarity index 100% rename from core/static/core/css/bootstrap-reboot.min.css rename to src/core/static/core/css/bootstrap-reboot.min.css diff --git a/core/static/core/css/bootstrap-reboot.min.css.map b/src/core/static/core/css/bootstrap-reboot.min.css.map similarity index 100% rename from core/static/core/css/bootstrap-reboot.min.css.map rename to src/core/static/core/css/bootstrap-reboot.min.css.map diff --git a/core/static/core/css/bootstrap.css b/src/core/static/core/css/bootstrap.css similarity index 100% rename from core/static/core/css/bootstrap.css rename to src/core/static/core/css/bootstrap.css diff --git a/core/static/core/css/bootstrap.css.map b/src/core/static/core/css/bootstrap.css.map similarity index 100% rename from core/static/core/css/bootstrap.css.map rename to src/core/static/core/css/bootstrap.css.map diff --git a/core/static/core/css/bootstrap.min.css b/src/core/static/core/css/bootstrap.min.css similarity index 100% rename from core/static/core/css/bootstrap.min.css rename to src/core/static/core/css/bootstrap.min.css diff --git a/core/static/core/css/bootstrap.min.css.map b/src/core/static/core/css/bootstrap.min.css.map similarity index 100% rename from core/static/core/css/bootstrap.min.css.map rename to src/core/static/core/css/bootstrap.min.css.map diff --git a/core/static/core/css/material-icons.css b/src/core/static/core/css/material-icons.css similarity index 100% rename from core/static/core/css/material-icons.css rename to src/core/static/core/css/material-icons.css diff --git a/core/static/core/fonts/MaterialIcons-Regular.eot b/src/core/static/core/fonts/MaterialIcons-Regular.eot similarity index 100% rename from core/static/core/fonts/MaterialIcons-Regular.eot rename to src/core/static/core/fonts/MaterialIcons-Regular.eot diff --git a/core/static/core/fonts/MaterialIcons-Regular.ttf b/src/core/static/core/fonts/MaterialIcons-Regular.ttf similarity index 100% rename from core/static/core/fonts/MaterialIcons-Regular.ttf rename to src/core/static/core/fonts/MaterialIcons-Regular.ttf diff --git a/core/static/core/fonts/MaterialIcons-Regular.woff b/src/core/static/core/fonts/MaterialIcons-Regular.woff similarity index 100% rename from core/static/core/fonts/MaterialIcons-Regular.woff rename to src/core/static/core/fonts/MaterialIcons-Regular.woff diff --git a/core/static/core/fonts/MaterialIcons-Regular.woff2 b/src/core/static/core/fonts/MaterialIcons-Regular.woff2 similarity index 100% rename from core/static/core/fonts/MaterialIcons-Regular.woff2 rename to src/core/static/core/fonts/MaterialIcons-Regular.woff2 diff --git a/core/static/core/img/favicon.ico b/src/core/static/core/img/favicon.ico similarity index 100% rename from core/static/core/img/favicon.ico rename to src/core/static/core/img/favicon.ico diff --git a/core/static/core/js/htmx.js b/src/core/static/core/js/htmx.js similarity index 100% rename from core/static/core/js/htmx.js rename to src/core/static/core/js/htmx.js diff --git a/core/tables.py b/src/core/tables.py similarity index 100% rename from core/tables.py rename to src/core/tables.py diff --git a/core/templates/core/base.html b/src/core/templates/core/base.html similarity index 100% rename from core/templates/core/base.html rename to src/core/templates/core/base.html diff --git a/core/templates/core/partials/modal.html b/src/core/templates/core/partials/modal.html similarity index 100% rename from core/templates/core/partials/modal.html rename to src/core/templates/core/partials/modal.html diff --git a/core/templates/registration/login.html b/src/core/templates/registration/login.html similarity index 100% rename from core/templates/registration/login.html rename to src/core/templates/registration/login.html diff --git a/core/templatetags/__init__.py b/src/core/templatetags/__init__.py similarity index 100% rename from core/templatetags/__init__.py rename to src/core/templatetags/__init__.py diff --git a/core/templatetags/core_extras.py b/src/core/templatetags/core_extras.py similarity index 100% rename from core/templatetags/core_extras.py rename to src/core/templatetags/core_extras.py diff --git a/core/tests/__init__.py b/src/core/tests/__init__.py similarity index 100% rename from core/tests/__init__.py rename to src/core/tests/__init__.py diff --git a/core/tests/helper.py b/src/core/tests/helper.py similarity index 100% rename from core/tests/helper.py rename to src/core/tests/helper.py diff --git a/core/tests/test_get_all_objects_for_allowed_customers.py b/src/core/tests/test_get_all_objects_for_allowed_customers.py similarity index 100% rename from core/tests/test_get_all_objects_for_allowed_customers.py rename to src/core/tests/test_get_all_objects_for_allowed_customers.py diff --git a/core/tests/test_get_object_with_view_permission.py b/src/core/tests/test_get_object_with_view_permission.py similarity index 100% rename from core/tests/test_get_object_with_view_permission.py rename to src/core/tests/test_get_object_with_view_permission.py diff --git a/core/tests/test_get_objects_for_customer.py b/src/core/tests/test_get_objects_for_customer.py similarity index 100% rename from core/tests/test_get_objects_for_customer.py rename to src/core/tests/test_get_objects_for_customer.py diff --git a/core/tests/test_templatetags.py b/src/core/tests/test_templatetags.py similarity index 100% rename from core/tests/test_templatetags.py rename to src/core/tests/test_templatetags.py diff --git a/core/urls.py b/src/core/urls.py similarity index 100% rename from core/urls.py rename to src/core/urls.py diff --git a/core/utils.py b/src/core/utils.py similarity index 100% rename from core/utils.py rename to src/core/utils.py diff --git a/customers/__init__.py b/src/customers/__init__.py similarity index 100% rename from customers/__init__.py rename to src/customers/__init__.py diff --git a/customers/admin.py b/src/customers/admin.py similarity index 100% rename from customers/admin.py rename to src/customers/admin.py diff --git a/customers/apps.py b/src/customers/apps.py similarity index 100% rename from customers/apps.py rename to src/customers/apps.py diff --git a/customers/decorators.py b/src/customers/decorators.py similarity index 100% rename from customers/decorators.py rename to src/customers/decorators.py diff --git a/customers/forms.py b/src/customers/forms.py similarity index 100% rename from customers/forms.py rename to src/customers/forms.py diff --git a/customers/models.py b/src/customers/models.py similarity index 100% rename from customers/models.py rename to src/customers/models.py diff --git a/customers/tables.py b/src/customers/tables.py similarity index 100% rename from customers/tables.py rename to src/customers/tables.py diff --git a/customers/templates/customers/customer_confirm_delete.html b/src/customers/templates/customers/customer_confirm_delete.html similarity index 100% rename from customers/templates/customers/customer_confirm_delete.html rename to src/customers/templates/customers/customer_confirm_delete.html diff --git a/customers/templates/customers/customer_create.html b/src/customers/templates/customers/customer_create.html similarity index 100% rename from customers/templates/customers/customer_create.html rename to src/customers/templates/customers/customer_create.html diff --git a/customers/templates/customers/customer_details.html b/src/customers/templates/customers/customer_details.html similarity index 100% rename from customers/templates/customers/customer_details.html rename to src/customers/templates/customers/customer_details.html diff --git a/customers/templates/customers/customer_list.html b/src/customers/templates/customers/customer_list.html similarity index 100% rename from customers/templates/customers/customer_list.html rename to src/customers/templates/customers/customer_list.html diff --git a/customers/templates/customers/partials/customer_create.html b/src/customers/templates/customers/partials/customer_create.html similarity index 100% rename from customers/templates/customers/partials/customer_create.html rename to src/customers/templates/customers/partials/customer_create.html diff --git a/customers/templates/customers/partials/location_create.html b/src/customers/templates/customers/partials/location_create.html similarity index 100% rename from customers/templates/customers/partials/location_create.html rename to src/customers/templates/customers/partials/location_create.html diff --git a/customers/templates/customers/partials/location_response.html b/src/customers/templates/customers/partials/location_response.html similarity index 100% rename from customers/templates/customers/partials/location_response.html rename to src/customers/templates/customers/partials/location_response.html diff --git a/customers/tests/test_customer.py b/src/customers/tests/test_customer.py similarity index 100% rename from customers/tests/test_customer.py rename to src/customers/tests/test_customer.py diff --git a/customers/tests/test_customer_detail_view.py b/src/customers/tests/test_customer_detail_view.py similarity index 100% rename from customers/tests/test_customer_detail_view.py rename to src/customers/tests/test_customer_detail_view.py diff --git a/customers/tests/test_customer_form_views.py b/src/customers/tests/test_customer_form_views.py similarity index 100% rename from customers/tests/test_customer_form_views.py rename to src/customers/tests/test_customer_form_views.py diff --git a/customers/tests/test_customer_list_view.py b/src/customers/tests/test_customer_list_view.py similarity index 100% rename from customers/tests/test_customer_list_view.py rename to src/customers/tests/test_customer_list_view.py diff --git a/customers/tests/test_location_form.py b/src/customers/tests/test_location_form.py similarity index 100% rename from customers/tests/test_location_form.py rename to src/customers/tests/test_location_form.py diff --git a/customers/tests/test_location_form_view.py b/src/customers/tests/test_location_form_view.py similarity index 100% rename from customers/tests/test_location_form_view.py rename to src/customers/tests/test_location_form_view.py diff --git a/customers/urls.py b/src/customers/urls.py similarity index 100% rename from customers/urls.py rename to src/customers/urls.py diff --git a/customers/views.py b/src/customers/views.py similarity index 100% rename from customers/views.py rename to src/customers/views.py diff --git a/devices/__init__.py b/src/devices/__init__.py similarity index 100% rename from devices/__init__.py rename to src/devices/__init__.py diff --git a/devices/admin.py b/src/devices/admin.py similarity index 100% rename from devices/admin.py rename to src/devices/admin.py diff --git a/devices/apps.py b/src/devices/apps.py similarity index 100% rename from devices/apps.py rename to src/devices/apps.py diff --git a/devices/decorators.py b/src/devices/decorators.py similarity index 100% rename from devices/decorators.py rename to src/devices/decorators.py diff --git a/devices/fixtures/devices.yaml b/src/devices/fixtures/devices.yaml similarity index 100% rename from devices/fixtures/devices.yaml rename to src/devices/fixtures/devices.yaml diff --git a/devices/forms.py b/src/devices/forms.py similarity index 100% rename from devices/forms.py rename to src/devices/forms.py diff --git a/devices/models/__init__.py b/src/devices/models/__init__.py similarity index 100% rename from devices/models/__init__.py rename to src/devices/models/__init__.py diff --git a/devices/models/device.py b/src/devices/models/device.py similarity index 100% rename from devices/models/device.py rename to src/devices/models/device.py diff --git a/devices/models/warranty.py b/src/devices/models/warranty.py similarity index 100% rename from devices/models/warranty.py rename to src/devices/models/warranty.py diff --git a/devices/tables.py b/src/devices/tables.py similarity index 100% rename from devices/tables.py rename to src/devices/tables.py diff --git a/devices/templates/devices/device_confirm_delete.html b/src/devices/templates/devices/device_confirm_delete.html similarity index 100% rename from devices/templates/devices/device_confirm_delete.html rename to src/devices/templates/devices/device_confirm_delete.html diff --git a/devices/templates/devices/device_create.html b/src/devices/templates/devices/device_create.html similarity index 100% rename from devices/templates/devices/device_create.html rename to src/devices/templates/devices/device_create.html diff --git a/devices/templates/devices/device_details.html b/src/devices/templates/devices/device_details.html similarity index 100% rename from devices/templates/devices/device_details.html rename to src/devices/templates/devices/device_details.html diff --git a/devices/templates/devices/device_details_block.html b/src/devices/templates/devices/device_details_block.html similarity index 100% rename from devices/templates/devices/device_details_block.html rename to src/devices/templates/devices/device_details_block.html diff --git a/devices/templates/devices/device_in_net_confirm_delete.html b/src/devices/templates/devices/device_in_net_confirm_delete.html similarity index 100% rename from devices/templates/devices/device_in_net_confirm_delete.html rename to src/devices/templates/devices/device_in_net_confirm_delete.html diff --git a/devices/templates/devices/device_in_net_create.html b/src/devices/templates/devices/device_in_net_create.html similarity index 100% rename from devices/templates/devices/device_in_net_create.html rename to src/devices/templates/devices/device_in_net_create.html diff --git a/devices/templates/devices/device_in_net_update.html b/src/devices/templates/devices/device_in_net_update.html similarity index 100% rename from devices/templates/devices/device_in_net_update.html rename to src/devices/templates/devices/device_in_net_update.html diff --git a/devices/templates/devices/device_list.html b/src/devices/templates/devices/device_list.html similarity index 100% rename from devices/templates/devices/device_list.html rename to src/devices/templates/devices/device_list.html diff --git a/devices/templates/devices/device_update.html b/src/devices/templates/devices/device_update.html similarity index 100% rename from devices/templates/devices/device_update.html rename to src/devices/templates/devices/device_update.html diff --git a/devices/templates/devices/ip_block.html b/src/devices/templates/devices/ip_block.html similarity index 100% rename from devices/templates/devices/ip_block.html rename to src/devices/templates/devices/ip_block.html diff --git a/devices/templates/devices/manufacturer_details.html b/src/devices/templates/devices/manufacturer_details.html similarity index 100% rename from devices/templates/devices/manufacturer_details.html rename to src/devices/templates/devices/manufacturer_details.html diff --git a/devices/templates/devices/partials/device_category_create.html b/src/devices/templates/devices/partials/device_category_create.html similarity index 100% rename from devices/templates/devices/partials/device_category_create.html rename to src/devices/templates/devices/partials/device_category_create.html diff --git a/devices/templates/devices/partials/device_category_response.html b/src/devices/templates/devices/partials/device_category_response.html similarity index 100% rename from devices/templates/devices/partials/device_category_response.html rename to src/devices/templates/devices/partials/device_category_response.html diff --git a/devices/templates/devices/warranties_list.html b/src/devices/templates/devices/warranties_list.html similarity index 100% rename from devices/templates/devices/warranties_list.html rename to src/devices/templates/devices/warranties_list.html diff --git a/devices/templates/devices/warranty_block.html b/src/devices/templates/devices/warranty_block.html similarity index 100% rename from devices/templates/devices/warranty_block.html rename to src/devices/templates/devices/warranty_block.html diff --git a/devices/templates/devices/warranty_confirm_delete.html b/src/devices/templates/devices/warranty_confirm_delete.html similarity index 100% rename from devices/templates/devices/warranty_confirm_delete.html rename to src/devices/templates/devices/warranty_confirm_delete.html diff --git a/devices/templates/devices/warranty_create.html b/src/devices/templates/devices/warranty_create.html similarity index 100% rename from devices/templates/devices/warranty_create.html rename to src/devices/templates/devices/warranty_create.html diff --git a/devices/templates/devices/warranty_update.html b/src/devices/templates/devices/warranty_update.html similarity index 100% rename from devices/templates/devices/warranty_update.html rename to src/devices/templates/devices/warranty_update.html diff --git a/devices/tests/test_connected_device_detail_view.py b/src/devices/tests/test_connected_device_detail_view.py similarity index 100% rename from devices/tests/test_connected_device_detail_view.py rename to src/devices/tests/test_connected_device_detail_view.py diff --git a/devices/tests/test_customer_device_table_view.py b/src/devices/tests/test_customer_device_table_view.py similarity index 100% rename from devices/tests/test_customer_device_table_view.py rename to src/devices/tests/test_customer_device_table_view.py diff --git a/devices/tests/test_device.py b/src/devices/tests/test_device.py similarity index 100% rename from devices/tests/test_device.py rename to src/devices/tests/test_device.py diff --git a/devices/tests/test_device_category_form_views.py b/src/devices/tests/test_device_category_form_views.py similarity index 100% rename from devices/tests/test_device_category_form_views.py rename to src/devices/tests/test_device_category_form_views.py diff --git a/devices/tests/test_device_detail_view.py b/src/devices/tests/test_device_detail_view.py similarity index 100% rename from devices/tests/test_device_detail_view.py rename to src/devices/tests/test_device_detail_view.py diff --git a/devices/tests/test_device_form.py b/src/devices/tests/test_device_form.py similarity index 100% rename from devices/tests/test_device_form.py rename to src/devices/tests/test_device_form.py diff --git a/devices/tests/test_device_form_views.py b/src/devices/tests/test_device_form_views.py similarity index 100% rename from devices/tests/test_device_form_views.py rename to src/devices/tests/test_device_form_views.py diff --git a/devices/tests/test_warranty_form.py b/src/devices/tests/test_warranty_form.py similarity index 100% rename from devices/tests/test_warranty_form.py rename to src/devices/tests/test_warranty_form.py diff --git a/devices/tests/test_warranty_list.py b/src/devices/tests/test_warranty_list.py similarity index 100% rename from devices/tests/test_warranty_list.py rename to src/devices/tests/test_warranty_list.py diff --git a/devices/urls.py b/src/devices/urls.py similarity index 100% rename from devices/urls.py rename to src/devices/urls.py diff --git a/devices/views.py b/src/devices/views.py similarity index 100% rename from devices/views.py rename to src/devices/views.py diff --git a/licenses/__init__.py b/src/licenses/__init__.py similarity index 100% rename from licenses/__init__.py rename to src/licenses/__init__.py diff --git a/licenses/admin.py b/src/licenses/admin.py similarity index 100% rename from licenses/admin.py rename to src/licenses/admin.py diff --git a/licenses/apps.py b/src/licenses/apps.py similarity index 100% rename from licenses/apps.py rename to src/licenses/apps.py diff --git a/licenses/models.py b/src/licenses/models.py similarity index 100% rename from licenses/models.py rename to src/licenses/models.py diff --git a/licenses/tables.py b/src/licenses/tables.py similarity index 100% rename from licenses/tables.py rename to src/licenses/tables.py diff --git a/licenses/templates/licenses/license_block.html b/src/licenses/templates/licenses/license_block.html similarity index 100% rename from licenses/templates/licenses/license_block.html rename to src/licenses/templates/licenses/license_block.html diff --git a/licenses/templates/licenses/license_confirm_delete.html b/src/licenses/templates/licenses/license_confirm_delete.html similarity index 100% rename from licenses/templates/licenses/license_confirm_delete.html rename to src/licenses/templates/licenses/license_confirm_delete.html diff --git a/licenses/templates/licenses/license_list.html b/src/licenses/templates/licenses/license_list.html similarity index 100% rename from licenses/templates/licenses/license_list.html rename to src/licenses/templates/licenses/license_list.html diff --git a/licenses/templates/licenses/license_with_computer_confirm_delete.html b/src/licenses/templates/licenses/license_with_computer_confirm_delete.html similarity index 100% rename from licenses/templates/licenses/license_with_computer_confirm_delete.html rename to src/licenses/templates/licenses/license_with_computer_confirm_delete.html diff --git a/licenses/templates/licenses/license_with_computer_create.html b/src/licenses/templates/licenses/license_with_computer_create.html similarity index 100% rename from licenses/templates/licenses/license_with_computer_create.html rename to src/licenses/templates/licenses/license_with_computer_create.html diff --git a/licenses/tests/test_customer_license_table_view.py b/src/licenses/tests/test_customer_license_table_view.py similarity index 100% rename from licenses/tests/test_customer_license_table_view.py rename to src/licenses/tests/test_customer_license_table_view.py diff --git a/licenses/tests/test_license.py b/src/licenses/tests/test_license.py similarity index 100% rename from licenses/tests/test_license.py rename to src/licenses/tests/test_license.py diff --git a/licenses/tests/test_license_form_view.py b/src/licenses/tests/test_license_form_view.py similarity index 100% rename from licenses/tests/test_license_form_view.py rename to src/licenses/tests/test_license_form_view.py diff --git a/licenses/urls.py b/src/licenses/urls.py similarity index 100% rename from licenses/urls.py rename to src/licenses/urls.py diff --git a/licenses/views.py b/src/licenses/views.py similarity index 100% rename from licenses/views.py rename to src/licenses/views.py diff --git a/nets/__init__.py b/src/nets/__init__.py similarity index 100% rename from nets/__init__.py rename to src/nets/__init__.py diff --git a/nets/admin.py b/src/nets/admin.py similarity index 100% rename from nets/admin.py rename to src/nets/admin.py diff --git a/nets/apps.py b/src/nets/apps.py similarity index 100% rename from nets/apps.py rename to src/nets/apps.py diff --git a/nets/decorators.py b/src/nets/decorators.py similarity index 100% rename from nets/decorators.py rename to src/nets/decorators.py diff --git a/nets/fixtures/nets.yaml b/src/nets/fixtures/nets.yaml similarity index 100% rename from nets/fixtures/nets.yaml rename to src/nets/fixtures/nets.yaml diff --git a/nets/models.py b/src/nets/models.py similarity index 100% rename from nets/models.py rename to src/nets/models.py diff --git a/nets/tables.py b/src/nets/tables.py similarity index 100% rename from nets/tables.py rename to src/nets/tables.py diff --git a/nets/templates/nets/net_confirm_delete.html b/src/nets/templates/nets/net_confirm_delete.html similarity index 100% rename from nets/templates/nets/net_confirm_delete.html rename to src/nets/templates/nets/net_confirm_delete.html diff --git a/nets/templates/nets/net_details.html b/src/nets/templates/nets/net_details.html similarity index 100% rename from nets/templates/nets/net_details.html rename to src/nets/templates/nets/net_details.html diff --git a/nets/templates/nets/net_list.html b/src/nets/templates/nets/net_list.html similarity index 100% rename from nets/templates/nets/net_list.html rename to src/nets/templates/nets/net_list.html diff --git a/nets/tests/test_models/test_net.py b/src/nets/tests/test_models/test_net.py similarity index 100% rename from nets/tests/test_models/test_net.py rename to src/nets/tests/test_models/test_net.py diff --git a/nets/tests/test_views/test_customer_net_table_view.py b/src/nets/tests/test_views/test_customer_net_table_view.py similarity index 100% rename from nets/tests/test_views/test_customer_net_table_view.py rename to src/nets/tests/test_views/test_customer_net_table_view.py diff --git a/nets/tests/test_views/test_net_detail_view.py b/src/nets/tests/test_views/test_net_detail_view.py similarity index 100% rename from nets/tests/test_views/test_net_detail_view.py rename to src/nets/tests/test_views/test_net_detail_view.py diff --git a/nets/urls.py b/src/nets/urls.py similarity index 100% rename from nets/urls.py rename to src/nets/urls.py diff --git a/nets/views.py b/src/nets/views.py similarity index 100% rename from nets/views.py rename to src/nets/views.py diff --git a/network_inventory/__init__.py b/src/network_inventory/__init__.py similarity index 100% rename from network_inventory/__init__.py rename to src/network_inventory/__init__.py diff --git a/network_inventory/settings/__init__.py b/src/network_inventory/settings/__init__.py similarity index 100% rename from network_inventory/settings/__init__.py rename to src/network_inventory/settings/__init__.py diff --git a/network_inventory/settings/base.py b/src/network_inventory/settings/base.py similarity index 100% rename from network_inventory/settings/base.py rename to src/network_inventory/settings/base.py diff --git a/network_inventory/settings/docker.py b/src/network_inventory/settings/docker.py similarity index 100% rename from network_inventory/settings/docker.py rename to src/network_inventory/settings/docker.py diff --git a/network_inventory/settings/local.py b/src/network_inventory/settings/local.py similarity index 100% rename from network_inventory/settings/local.py rename to src/network_inventory/settings/local.py diff --git a/network_inventory/settings/production.py b/src/network_inventory/settings/production.py similarity index 100% rename from network_inventory/settings/production.py rename to src/network_inventory/settings/production.py diff --git a/network_inventory/settings/ram_test.py b/src/network_inventory/settings/ram_test.py similarity index 100% rename from network_inventory/settings/ram_test.py rename to src/network_inventory/settings/ram_test.py diff --git a/network_inventory/urls.py b/src/network_inventory/urls.py similarity index 100% rename from network_inventory/urls.py rename to src/network_inventory/urls.py diff --git a/network_inventory/wsgi.py b/src/network_inventory/wsgi.py similarity index 100% rename from network_inventory/wsgi.py rename to src/network_inventory/wsgi.py diff --git a/softwares/__init__.py b/src/softwares/__init__.py similarity index 100% rename from softwares/__init__.py rename to src/softwares/__init__.py diff --git a/softwares/admin.py b/src/softwares/admin.py similarity index 100% rename from softwares/admin.py rename to src/softwares/admin.py diff --git a/softwares/apps.py b/src/softwares/apps.py similarity index 100% rename from softwares/apps.py rename to src/softwares/apps.py diff --git a/softwares/fixtures/softwares.yaml b/src/softwares/fixtures/softwares.yaml similarity index 100% rename from softwares/fixtures/softwares.yaml rename to src/softwares/fixtures/softwares.yaml diff --git a/softwares/models/__init__.py b/src/softwares/models/__init__.py similarity index 100% rename from softwares/models/__init__.py rename to src/softwares/models/__init__.py diff --git a/softwares/models/os.py b/src/softwares/models/os.py similarity index 100% rename from softwares/models/os.py rename to src/softwares/models/os.py diff --git a/softwares/models/services.py b/src/softwares/models/services.py similarity index 100% rename from softwares/models/services.py rename to src/softwares/models/services.py diff --git a/softwares/models/software.py b/src/softwares/models/software.py similarity index 100% rename from softwares/models/software.py rename to src/softwares/models/software.py diff --git a/users/__init__.py b/src/users/__init__.py similarity index 100% rename from users/__init__.py rename to src/users/__init__.py diff --git a/users/admin.py b/src/users/admin.py similarity index 100% rename from users/admin.py rename to src/users/admin.py diff --git a/users/apps.py b/src/users/apps.py similarity index 100% rename from users/apps.py rename to src/users/apps.py diff --git a/users/decorators.py b/src/users/decorators.py similarity index 100% rename from users/decorators.py rename to src/users/decorators.py diff --git a/users/models/__init__.py b/src/users/models/__init__.py similarity index 100% rename from users/models/__init__.py rename to src/users/models/__init__.py diff --git a/users/models/groups.py b/src/users/models/groups.py similarity index 100% rename from users/models/groups.py rename to src/users/models/groups.py diff --git a/users/models/mailalias.py b/src/users/models/mailalias.py similarity index 100% rename from users/models/mailalias.py rename to src/users/models/mailalias.py diff --git a/users/models/user.py b/src/users/models/user.py similarity index 100% rename from users/models/user.py rename to src/users/models/user.py diff --git a/users/tables.py b/src/users/tables.py similarity index 100% rename from users/tables.py rename to src/users/tables.py diff --git a/users/templates/groups/group_confirm_delete.html b/src/users/templates/groups/group_confirm_delete.html similarity index 100% rename from users/templates/groups/group_confirm_delete.html rename to src/users/templates/groups/group_confirm_delete.html diff --git a/users/templates/groups/group_details.html b/src/users/templates/groups/group_details.html similarity index 100% rename from users/templates/groups/group_details.html rename to src/users/templates/groups/group_details.html diff --git a/users/templates/groups/group_list.html b/src/users/templates/groups/group_list.html similarity index 100% rename from users/templates/groups/group_list.html rename to src/users/templates/groups/group_list.html diff --git a/users/templates/users/user_confirm_delete.html b/src/users/templates/users/user_confirm_delete.html similarity index 100% rename from users/templates/users/user_confirm_delete.html rename to src/users/templates/users/user_confirm_delete.html diff --git a/users/templates/users/user_details.html b/src/users/templates/users/user_details.html similarity index 100% rename from users/templates/users/user_details.html rename to src/users/templates/users/user_details.html diff --git a/users/templates/users/user_list.html b/src/users/templates/users/user_list.html similarity index 100% rename from users/templates/users/user_list.html rename to src/users/templates/users/user_list.html diff --git a/users/tests/test_customer_group_table_view.py b/src/users/tests/test_customer_group_table_view.py similarity index 100% rename from users/tests/test_customer_group_table_view.py rename to src/users/tests/test_customer_group_table_view.py diff --git a/users/tests/test_customer_user_table_view.py b/src/users/tests/test_customer_user_table_view.py similarity index 100% rename from users/tests/test_customer_user_table_view.py rename to src/users/tests/test_customer_user_table_view.py diff --git a/users/tests/test_group_detail_view.py b/src/users/tests/test_group_detail_view.py similarity index 100% rename from users/tests/test_group_detail_view.py rename to src/users/tests/test_group_detail_view.py diff --git a/users/tests/test_user.py b/src/users/tests/test_user.py similarity index 100% rename from users/tests/test_user.py rename to src/users/tests/test_user.py diff --git a/users/tests/test_user_detail_view.py b/src/users/tests/test_user_detail_view.py similarity index 100% rename from users/tests/test_user_detail_view.py rename to src/users/tests/test_user_detail_view.py diff --git a/users/urls.py b/src/users/urls.py similarity index 100% rename from users/urls.py rename to src/users/urls.py diff --git a/users/views.py b/src/users/views.py similarity index 100% rename from users/views.py rename to src/users/views.py From 2e5e0f793aebf9c1001d20afb80b3a77104e2720 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 17:53:42 +0100 Subject: [PATCH 02/10] Ignore static files --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e5b8f45..38a4088 100644 --- a/.gitignore +++ b/.gitignore @@ -175,7 +175,7 @@ migrations/ htmlcov/ .second_run -/static +/src/static .idea/ db_data .direnv From d1cd80950e96e5328ab05c631f7949d3a963018d Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 18:06:17 +0100 Subject: [PATCH 03/10] Move more files to src --- .flake8 | 4 ++-- Makefile | 6 +++--- flake.nix | 3 --- conftest.py => src/conftest.py | 0 manage.py => src/manage.py | 0 network_inventory.yaml => src/network_inventory.yaml | 0 6 files changed, 5 insertions(+), 8 deletions(-) rename conftest.py => src/conftest.py (100%) rename manage.py => src/manage.py (100%) mode change 100755 => 100644 rename network_inventory.yaml => src/network_inventory.yaml (100%) diff --git a/.flake8 b/.flake8 index 8a89f61..ea5280d 100644 --- a/.flake8 +++ b/.flake8 @@ -4,5 +4,5 @@ exclude = __init__.py, *cache*, venv/, - manage.py, - network_inventory/settings/* + src/manage.py, + src/network_inventory/settings/* diff --git a/Makefile b/Makefile index cdee043..d07f2f0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ run: setup ( \ find . -name __pycache__ -o -name "*.pyc" -delete; \ sudo iptables -I INPUT -p tcp --dport 8000 -j ACCEPT; \ - cd src/ + cd src/; \ python manage.py runserver 0.0.0.0:8000; \ ) @@ -15,7 +15,7 @@ run: setup setup: ( \ docker-compose -f docker-compose-development.yml up -d; \ - cd src/ + cd src/; \ if [ -f .second_run ]; then \ sleep 2; \ python manage.py collectstatic --noinput; \ @@ -72,7 +72,7 @@ init: .PHONY: test test: ( \ - pytest --ds=network_inventory.settings.ram_test -nauto --nomigrations --cov=. --cov-report=html; \ + pytest --ds=network_inventory.settings.ram_test -nauto --nomigrations --cov=./src --cov-report=html ./src; \ ) .PHONY: debug diff --git a/flake.nix b/flake.nix index 4582f0e..bf15169 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,6 @@ (final: prev: { inventoryEnv = prev.poetry2nix.mkPoetryEnv { projectDir = ./.; - editablePackageSources = { - inventory = ./src; - }; }; inventoryPackage = prev.poetry2nix.mkPoetryApplication { projectDir = ./.; diff --git a/conftest.py b/src/conftest.py similarity index 100% rename from conftest.py rename to src/conftest.py diff --git a/manage.py b/src/manage.py old mode 100755 new mode 100644 similarity index 100% rename from manage.py rename to src/manage.py diff --git a/network_inventory.yaml b/src/network_inventory.yaml similarity index 100% rename from network_inventory.yaml rename to src/network_inventory.yaml From 6a588d8046b6a0ab20627cbbe06984a72abecfe7 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:19:44 +0100 Subject: [PATCH 04/10] Include the whole src directory in the poetry package --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d9e04e9..78fa19d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,9 @@ version = "0.1.0" description = "" authors = ["Andreas Zweili "] license = "GPLv3" +packages = [ + { include = "src" }, +] [tool.poetry.dependencies] python = "^3.9" From b267dcc6e749352a56e9e36b26ff907fac769f88 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:20:07 +0100 Subject: [PATCH 05/10] Remove the src parameter --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index bf15169..684e0f9 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,6 @@ }; inventoryPackage = prev.poetry2nix.mkPoetryApplication { projectDir = ./.; - src = ./src; }; }) ]; From a45c29c591d82f7916675fdf9304464595780112 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:20:24 +0100 Subject: [PATCH 06/10] Add checks --- flake.nix | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/flake.nix b/flake.nix index 684e0f9..658a3f6 100644 --- a/flake.nix +++ b/flake.nix @@ -41,8 +41,43 @@ export DJANGO_SETTINGS_MODULE=network_inventory.settings.local ''; }; + checks.lint = pkgs.stdenv.mkDerivation { + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontInstall = true; + doCheck = true; + name = "lint"; + src = ./.; + checkInputs = [ pkgs.inventoryEnv ]; + checkPhase = '' + mkdir -p $out + flake8 . --count --show-source --statistics | tee $out/test.log + ''; + }; + checks.tests = pkgs.stdenv.mkDerivation { + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontInstall = true; + doCheck = true; + name = "test"; + src = ./.; + checkInputs = [ pkgs.inventoryEnv ]; + checkPhase = '' + mkdir -p $out + pytest --ds=network_inventory.settings.ram_test \ + -nauto \ + --nomigrations \ + --cov=./src \ + --cov-report=html \ + ./src + cp -r htmlcov $out/ + ''; + }; packages.venv = pkgs.inventoryEnv; packages.inventory = pkgs.inventoryPackage; packages.default = pkgs.inventoryPackage; })); } + From b890db242003d5262730e1faa884c85dc844aad1 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:21:04 +0100 Subject: [PATCH 07/10] Use flake check in CI --- .github/workflows/tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 40c48ef..609f382 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,10 +14,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v18 - - name: Linting + - name: Test run: | - nix develop --command flake8 . --count --show-source --statistics - - - name: Testing - run: | - nix develop --command make test + nix flake check From 42939e5aa2db8387182797c186ca8c02143e99f4 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:34:05 +0100 Subject: [PATCH 08/10] Enable verbose output for checks --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 609f382..4778a06 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,4 +16,4 @@ jobs: - uses: cachix/install-nix-action@v18 - name: Test run: | - nix flake check + nix flake check -L From 363898ed603172153ee6750ff4ca13a09b54c0ce Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:36:06 +0100 Subject: [PATCH 09/10] Refactor the checks --- flake.nix | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.nix b/flake.nix index 658a3f6..61f0edd 100644 --- a/flake.nix +++ b/flake.nix @@ -41,39 +41,39 @@ export DJANGO_SETTINGS_MODULE=network_inventory.settings.local ''; }; - checks.lint = pkgs.stdenv.mkDerivation { - dontPatch = true; - dontConfigure = true; - dontBuild = true; - dontInstall = true; - doCheck = true; - name = "lint"; - src = ./.; - checkInputs = [ pkgs.inventoryEnv ]; - checkPhase = '' - mkdir -p $out - flake8 . --count --show-source --statistics | tee $out/test.log - ''; - }; - checks.tests = pkgs.stdenv.mkDerivation { - dontPatch = true; - dontConfigure = true; - dontBuild = true; - dontInstall = true; - doCheck = true; - name = "test"; - src = ./.; - checkInputs = [ pkgs.inventoryEnv ]; - checkPhase = '' - mkdir -p $out - pytest --ds=network_inventory.settings.ram_test \ - -nauto \ - --nomigrations \ - --cov=./src \ - --cov-report=html \ - ./src - cp -r htmlcov $out/ - ''; + checks = { + lint = pkgs.stdenv.mkDerivation { + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontInstall = true; + doCheck = true; + name = "lint"; + src = ./.; + checkInputs = [ pkgs.inventoryEnv ]; + checkPhase = '' + mkdir -p $out + flake8 . --count --show-source --statistics + ''; + }; + tests = pkgs.stdenv.mkDerivation { + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontInstall = true; + doCheck = true; + name = "test"; + src = ./.; + checkInputs = [ pkgs.inventoryEnv ]; + checkPhase = '' + mkdir -p $out + pytest --ds=network_inventory.settings.ram_test \ + -nauto \ + --nomigrations \ + --cov=./src \ + ./src + ''; + }; }; packages.venv = pkgs.inventoryEnv; packages.inventory = pkgs.inventoryPackage; From 0d98d64cd44b8129a380e5a4a7b098ce16d15f0c Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 27 Nov 2022 21:38:37 +0100 Subject: [PATCH 10/10] Remove test from Makefile They are now covered by `nix flake check` --- Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile index d07f2f0..651eaf3 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,6 @@ setup: venv: nix build .#venv -o venv - .PHONY: clean clean: docker-compose -f docker-compose-development.yml down -v @@ -69,12 +68,6 @@ init: python manage.py loaddata network_inventory.yaml; \ ) -.PHONY: test -test: - ( \ - pytest --ds=network_inventory.settings.ram_test -nauto --nomigrations --cov=./src --cov-report=html ./src; \ - ) - .PHONY: debug debug: ( \