diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000000000000000000000000000000000000..f30466c0d74041255b47e70362458d189b37f6d1 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,13 @@ +include requirements.txt +recursive-include vote *.py *.html *.js *.css *.png *.svg *.po *.txt *.tex +graft vote/static +graft vote/templates +graft vote/static +graft vote/templatetags +graft vote/management +recursive-include management *.py *.html *.js *.css *.png *.svg *.po *.txt *.tex +graft management/static +graft management/templates +graft management/static +graft management/templatetags +graft management/management diff --git a/Makefile b/Makefile index 75b917be9dae9bf5596a58f07849c9dae7d5e739..26e774f39a9653b8064cd585ba68eda6b2ac8e3f 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ bandit: .PHONY: test test: # a bit hacky due to the manage.py script now living in the main module but it werks, meh ... - PYTHONPATH="$PYTHONPATH:$(pwd)" WAHLFANG_DEBUG=True python3 wahlfang/manage.py test + PYTHONPATH="${PYTHONPATH}:$(pwd)" WAHLFANG_DEBUG=True python3 wahlfang/manage.py test .PHONY: package package: diff --git a/setup.cfg b/setup.cfg index 3198bf867f617eedefe044d842ebdd20fe1a470f..eb12e810fa0f2c5588ae67d2d24a9c493eaad55f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,6 +36,8 @@ install_requires = djangorestframework~=3.12 djangorestframework-simplejwt~=4.7 packages = find: +include_package_data = True +zip_safe = False [options.entry_points] console_scripts = diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-grid.css b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.css similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-grid.css rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.css diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.css.map diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-grid.min.css.map diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.css.map diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map b/vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap-reboot.min.css.map diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap.css b/vote/static/bootstrap-4.5.3-dist/css/bootstrap.css similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap.css rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap.css diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap.css.map b/vote/static/bootstrap-4.5.3-dist/css/bootstrap.css.map similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap.css.map rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap.css.map diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap.min.css b/vote/static/bootstrap-4.5.3-dist/css/bootstrap.min.css similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap.min.css rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap.min.css diff --git a/static/bootstrap-4.5.3-dist/css/bootstrap.min.css.map b/vote/static/bootstrap-4.5.3-dist/css/bootstrap.min.css.map similarity index 100% rename from static/bootstrap-4.5.3-dist/css/bootstrap.min.css.map rename to vote/static/bootstrap-4.5.3-dist/css/bootstrap.min.css.map diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.js.map diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.bundle.min.js.map diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.js b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.js similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.js rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.js diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.js.map b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.js.map similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.js.map rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.js.map diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.min.js b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.min.js similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.min.js rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.min.js diff --git a/static/bootstrap-4.5.3-dist/js/bootstrap.min.js.map b/vote/static/bootstrap-4.5.3-dist/js/bootstrap.min.js.map similarity index 100% rename from static/bootstrap-4.5.3-dist/js/bootstrap.min.js.map rename to vote/static/bootstrap-4.5.3-dist/js/bootstrap.min.js.map diff --git a/static/img/apple-touch-icon.png b/vote/static/img/apple-touch-icon.png similarity index 100% rename from static/img/apple-touch-icon.png rename to vote/static/img/apple-touch-icon.png diff --git a/static/img/blank_avatar.png b/vote/static/img/blank_avatar.png similarity index 100% rename from static/img/blank_avatar.png rename to vote/static/img/blank_avatar.png diff --git a/static/img/example.png b/vote/static/img/example.png similarity index 100% rename from static/img/example.png rename to vote/static/img/example.png diff --git a/static/img/favicon128.png b/vote/static/img/favicon128.png similarity index 100% rename from static/img/favicon128.png rename to vote/static/img/favicon128.png diff --git a/static/img/favicon16.png b/vote/static/img/favicon16.png similarity index 100% rename from static/img/favicon16.png rename to vote/static/img/favicon16.png diff --git a/static/img/favicon32.png b/vote/static/img/favicon32.png similarity index 100% rename from static/img/favicon32.png rename to vote/static/img/favicon32.png diff --git a/static/img/favicon64.png b/vote/static/img/favicon64.png similarity index 100% rename from static/img/favicon64.png rename to vote/static/img/favicon64.png diff --git a/static/img/logo_inv.png b/vote/static/img/logo_inv.png similarity index 100% rename from static/img/logo_inv.png rename to vote/static/img/logo_inv.png diff --git a/static/img/question-circle.svg b/vote/static/img/question-circle.svg similarity index 100% rename from static/img/question-circle.svg rename to vote/static/img/question-circle.svg diff --git a/static/js/application.js b/vote/static/js/application.js similarity index 100% rename from static/js/application.js rename to vote/static/js/application.js diff --git a/static/js/jquery-3.5.1.min.js b/vote/static/js/jquery-3.5.1.min.js similarity index 100% rename from static/js/jquery-3.5.1.min.js rename to vote/static/js/jquery-3.5.1.min.js diff --git a/static/js/jquery-3.5.1.slim.min.js b/vote/static/js/jquery-3.5.1.slim.min.js similarity index 100% rename from static/js/jquery-3.5.1.slim.min.js rename to vote/static/js/jquery-3.5.1.slim.min.js diff --git a/static/js/popper-1.16.1.min.js b/vote/static/js/popper-1.16.1.min.js similarity index 100% rename from static/js/popper-1.16.1.min.js rename to vote/static/js/popper-1.16.1.min.js diff --git a/static/js/reload.js b/vote/static/js/reload.js similarity index 100% rename from static/js/reload.js rename to vote/static/js/reload.js diff --git a/wahlfang/__init__.py b/wahlfang/__init__.py index 1f356cc57bfa00a3b251402604c54702fb414c96..cd7ca4980cf264061d65f39e973230b6c27bc5fd 100644 --- a/wahlfang/__init__.py +++ b/wahlfang/__init__.py @@ -1 +1 @@ -__version__ = '1.0.0' +__version__ = '1.0.1' diff --git a/wahlfang/settings/base.py b/wahlfang/settings/base.py index 3200b7d87d8ba9d467bb0601d3f825d4f57fde37..b045b7a3152504843c1991aee2eb8f6b4c9d8b38 100644 --- a/wahlfang/settings/base.py +++ b/wahlfang/settings/base.py @@ -130,10 +130,6 @@ USE_TZ = True STATIC_URL = '/static/' -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, 'static') -] - CRISPY_TEMPLATE_PACK = 'bootstrap4' # Content Security Policy