Merge branch 'master' into computer_form

.gitignore

@@ -174,5 +174,4 @@ migrations/
 htmlcov/
 .second_run
 
-network_inventory/static/
-!network_inventory/static/core
+/static

.vscode/settings.json

@@ -8,6 +8,7 @@
     "python.linting.enabled": true,
     "python.testing.pytestArgs": [
         ".",
+        "-n 4",
         "--ds=network_inventory.settings.local"
     ]
 }

Makefile

@@ -15,6 +15,13 @@ local:
 	pip3 install -r requirements/local.txt; \
 	)
 
+testlocal:
+	( \
+	source venv/bin/activate; \
+	pytest -n 6 --ds=network_inventory.settings.local --nomigrations; \
+	)
+
+
 clean:
 	sudo find . \( -name __pycache__ -o -name "*.pyc" \) -delete
 	sudo rm -f */migrations/0*.py

development.sh

@@ -5,6 +5,7 @@ if [ -f ./.second_run ]; then
     python manage.py makemigrations
     python manage.py migrate
 else
+    python manage.py collectstatic --noinput
     python manage.py makemigrations backups
     python manage.py makemigrations computers
     python manage.py makemigrations core

docs/notes.org

@@ -130,6 +130,16 @@ A backup can be run on multiple days
 
 ** TODO Groups [0/1]
 *** NEXT Table for groups
+*** NEXT the computer is missing a GPU
+
+CAD computers often have sppecial graphics cards which we should be able to
+track.
+
+** TODO NETs [0/1]
+*** NEXT the IP needs to be able to be null
+
+Currently it's always required however when a device is in DHCP mode we can't
+know the IP for sure.
 
 * TODO Nice to Have [0/9]
 *** TODO allow technicians to add custom fields

network_inventory/settings/base.py

@@ -125,7 +125,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")
 
 DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
 CRISPY_TEMPLATE_PACK = 'bootstrap4'

pytest.ini

@@ -1,2 +0,0 @@
-[pytest]
-junit_family=legacy

run.sh

@@ -5,6 +5,7 @@ if [ -f ./.second_run ]; then
     python manage.py makemigrations
     python manage.py migrate
 else
+    python manage.py collectstatic --noinput
     python manage.py makemigrations backups
     python manage.py makemigrations computers
     python manage.py makemigrations core