simplify

fandsdev · Nov 29, 2023 · 4a0ffbf · 4a0ffbf
1 parent 13ff22d
commit 4a0ffbf
Show file tree

Hide file tree

Showing 100 changed files with 16 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -1,15 +1,4 @@
-test: bootstrap
-	cd testproject && poetry run src/manage.py makemigrations --check
-	cd testproject && poetry run src/manage.py startapp test_app
-
-	make coverage
-
 bootstrap:
 	rm -Rf testproject
 
 	poetry run cookiecutter --no-input ./
-
-	cd testproject && poetry install
-
-coverage:
-	cd testproject && poetry run python -m pytest --cov-report=xml --cov=core --cov=apps.a12n --cov=apps.users --cov=sepulkas
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -1,9 +1,12 @@
 {
-    "project_slug": "testproject",
-    "email": "",
-    "project_version": "0.0.0-dev",
+    "name": "testproject",
     "_copy_without_render": [
-        "*.py-tpl",
-        ".github/workflows/ci.yml"
+	".github/workflows/ci.yml",
+	".mypy_cache",
+	".pytest_cache",
+	".venv",
+	"**/__pycache__",
+	"db.sqlite",
+	"src/.django-app-template"
     ]
 }
diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh
@@ -1,10 +1,15 @@
 #!/bin/bash -e
 
+rm -rf .mypy_cache \
+   .pytest_cache \
+   .venv
+
 cp src/core/.env.ci src/core/.env
 
 poetry install
 
 poetry run python src/manage.py collectstatic
 poetry run python src/manage.py migrate
+poetry run python src/manage.py startapp test_app
 
-make fmt lint test
+make lint test
diff --git a/{{cookiecutter.project_slug}}/.dockerignore → {{cookiecutter.name}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore → {{cookiecutter.name}}/.dockerignore
diff --git a/{{cookiecutter.project_slug}}/.editorconfig → {{cookiecutter.name}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig → {{cookiecutter.name}}/.editorconfig
diff --git a/...r.project_slug}}/.github/workflows/ci.yml → ...kiecutter.name}}/.github/workflows/ci.yml b/...r.project_slug}}/.github/workflows/ci.yml → ...kiecutter.name}}/.github/workflows/ci.yml
diff --git a/{{cookiecutter.project_slug}}/.gitignore → {{cookiecutter.name}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore → {{cookiecutter.name}}/.gitignore
diff --git a/{{cookiecutter.project_slug}}/Dockerfile → {{cookiecutter.name}}/Dockerfile b/{{cookiecutter.project_slug}}/Dockerfile → {{cookiecutter.name}}/Dockerfile
diff --git a/{{cookiecutter.project_slug}}/Makefile → {{cookiecutter.name}}/Makefile b/{{cookiecutter.project_slug}}/Makefile → {{cookiecutter.name}}/Makefile
diff --git a/{{cookiecutter.project_slug}}/README.md → {{cookiecutter.name}}/README.md b/{{cookiecutter.project_slug}}/README.md → {{cookiecutter.name}}/README.md
diff --git a/...ecutter.project_slug}}/docker-compose.yml → {{cookiecutter.name}}/docker-compose.yml b/...ecutter.project_slug}}/docker-compose.yml → {{cookiecutter.name}}/docker-compose.yml
diff --git a/{{cookiecutter.project_slug}}/mypy.ini → {{cookiecutter.name}}/mypy.ini b/{{cookiecutter.project_slug}}/mypy.ini → {{cookiecutter.name}}/mypy.ini
diff --git a/{{cookiecutter.project_slug}}/poetry.lock → {{cookiecutter.name}}/poetry.lock b/{{cookiecutter.project_slug}}/poetry.lock → {{cookiecutter.name}}/poetry.lock
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml → {{cookiecutter.name}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml → {{cookiecutter.name}}/pyproject.toml
@@ -1,9 +1,9 @@
 [tool.poetry]
 authors = ["you <[email protected]>"]
 description = "your project description"
-name = "{{cookiecutter.project_slug}}"
+name = "your project name"
 readme = "README.md"
-version = "{{cookiecutter.project_version}}"
+version = "0.0.0-dev"
 
 [tool.poetry.dependencies]
 python = "~3.11"

diff --git a/.../src/.django-app-template/__init__.py-tpl → .../src/.django-app-template/__init__.py-tpl b/.../src/.django-app-template/__init__.py-tpl → .../src/.django-app-template/__init__.py-tpl
diff --git a/...g}}/src/.django-app-template/admin.py-tpl → ...e}}/src/.django-app-template/admin.py-tpl b/...g}}/src/.django-app-template/admin.py-tpl → ...e}}/src/.django-app-template/admin.py-tpl
diff --git a/...-app-template/api/serializers/__init__.py → ...-app-template/api/serializers/__init__.py b/...-app-template/api/serializers/__init__.py → ...-app-template/api/serializers/__init__.py
diff --git a/...-template/api/serializers/app_name.py-tpl → ...-template/api/serializers/app_name.py-tpl b/...-template/api/serializers/app_name.py-tpl → ...-template/api/serializers/app_name.py-tpl
diff --git a/.../src/.django-app-template/api/urls.py-tpl → .../src/.django-app-template/api/urls.py-tpl b/.../src/.django-app-template/api/urls.py-tpl → .../src/.django-app-template/api/urls.py-tpl
diff --git a/...django-app-template/api/views/__init__.py → ...django-app-template/api/views/__init__.py b/...django-app-template/api/views/__init__.py → ...django-app-template/api/views/__init__.py
diff --git a/...go-app-template/api/views/app_name.py-tpl → ...go-app-template/api/views/app_name.py-tpl b/...go-app-template/api/views/app_name.py-tpl → ...go-app-template/api/views/app_name.py-tpl
diff --git a/...ug}}/src/.django-app-template/apps.py-tpl → ...me}}/src/.django-app-template/apps.py-tpl b/...ug}}/src/.django-app-template/apps.py-tpl → ...me}}/src/.django-app-template/apps.py-tpl
diff --git a/...o-app-template/migrations/__init__.py-tpl → ...o-app-template/migrations/__init__.py-tpl b/...o-app-template/migrations/__init__.py-tpl → ...o-app-template/migrations/__init__.py-tpl
diff --git a/...c/.django-app-template/models/__init__.py → ...c/.django-app-template/models/__init__.py b/...c/.django-app-template/models/__init__.py → ...c/.django-app-template/models/__init__.py
diff --git a/...jango-app-template/models/app_name.py-tpl → ...jango-app-template/models/app_name.py-tpl b/...jango-app-template/models/app_name.py-tpl → ...jango-app-template/models/app_name.py-tpl
diff --git a/....project_slug}}/src/apps/a12n/__init__.py → ...iecutter.name}}/src/apps/a12n/__init__.py b/....project_slug}}/src/apps/a12n/__init__.py → ...iecutter.name}}/src/apps/a12n/__init__.py
diff --git a/...t_slug}}/src/apps/a12n/api/serializers.py → ...r.name}}/src/apps/a12n/api/serializers.py b/...t_slug}}/src/apps/a12n/api/serializers.py → ...r.name}}/src/apps/a12n/api/serializers.py
diff --git a/...ct_slug}}/src/apps/a12n/api/throttling.py → ...er.name}}/src/apps/a12n/api/throttling.py b/...ct_slug}}/src/apps/a12n/api/throttling.py → ...er.name}}/src/apps/a12n/api/throttling.py
diff --git a/....project_slug}}/src/apps/a12n/api/urls.py → ...iecutter.name}}/src/apps/a12n/api/urls.py b/....project_slug}}/src/apps/a12n/api/urls.py → ...iecutter.name}}/src/apps/a12n/api/urls.py
diff --git a/...project_slug}}/src/apps/a12n/api/views.py → ...ecutter.name}}/src/apps/a12n/api/views.py b/...project_slug}}/src/apps/a12n/api/views.py → ...ecutter.name}}/src/apps/a12n/api/views.py
diff --git a/...ug}}/src/apps/a12n/migrations/__init__.py → ...me}}/src/apps/a12n/migrations/__init__.py b/...ug}}/src/apps/a12n/migrations/__init__.py → ...me}}/src/apps/a12n/migrations/__init__.py
diff --git a/...ter.project_slug}}/src/apps/a12n/utils.py → {{cookiecutter.name}}/src/apps/a12n/utils.py b/...ter.project_slug}}/src/apps/a12n/utils.py → {{cookiecutter.name}}/src/apps/a12n/utils.py
diff --git a/...project_slug}}/src/apps/users/__init__.py → ...ecutter.name}}/src/apps/users/__init__.py b/...project_slug}}/src/apps/users/__init__.py → ...ecutter.name}}/src/apps/users/__init__.py
diff --git a/...er.project_slug}}/src/apps/users/admin.py → ...okiecutter.name}}/src/apps/users/admin.py b/...er.project_slug}}/src/apps/users/admin.py → ...okiecutter.name}}/src/apps/users/admin.py
diff --git a/..._slug}}/src/apps/users/api/serializers.py → ....name}}/src/apps/users/api/serializers.py b/..._slug}}/src/apps/users/api/serializers.py → ....name}}/src/apps/users/api/serializers.py
diff --git a/...project_slug}}/src/apps/users/api/urls.py → ...ecutter.name}}/src/apps/users/api/urls.py b/...project_slug}}/src/apps/users/api/urls.py → ...ecutter.name}}/src/apps/users/api/urls.py
diff --git a/...ect_slug}}/src/apps/users/api/viewsets.py → ...ter.name}}/src/apps/users/api/viewsets.py b/...ect_slug}}/src/apps/users/api/viewsets.py → ...ter.name}}/src/apps/users/api/viewsets.py
diff --git a/...src/apps/users/migrations/0001_initial.py → ...src/apps/users/migrations/0001_initial.py b/...src/apps/users/migrations/0001_initial.py → ...src/apps/users/migrations/0001_initial.py
diff --git a/...g}}/src/apps/users/migrations/__init__.py → ...e}}/src/apps/users/migrations/__init__.py b/...g}}/src/apps/users/migrations/__init__.py → ...e}}/src/apps/users/migrations/__init__.py
diff --git a/...r.project_slug}}/src/apps/users/models.py → ...kiecutter.name}}/src/apps/users/models.py b/...r.project_slug}}/src/apps/users/models.py → ...kiecutter.name}}/src/apps/users/models.py
diff --git a/...kiecutter.project_slug}}/src/core/.env.ci → {{cookiecutter.name}}/src/core/.env.ci b/...kiecutter.project_slug}}/src/core/.env.ci → {{cookiecutter.name}}/src/core/.env.ci
diff --git a/...utter.project_slug}}/src/core/__init__.py → {{cookiecutter.name}}/src/core/__init__.py b/...utter.project_slug}}/src/core/__init__.py → {{cookiecutter.name}}/src/core/__init__.py
diff --git a/...r.project_slug}}/src/core/admin/README.md → ...kiecutter.name}}/src/core/admin/README.md b/...r.project_slug}}/src/core/admin/README.md → ...kiecutter.name}}/src/core/admin/README.md
diff --git a/...project_slug}}/src/core/admin/__init__.py → ...ecutter.name}}/src/core/admin/__init__.py b/...project_slug}}/src/core/admin/__init__.py → ...ecutter.name}}/src/core/admin/__init__.py
diff --git a/...ject_slug}}/src/core/admin/model_admin.py → ...tter.name}}/src/core/admin/model_admin.py b/...ject_slug}}/src/core/admin/model_admin.py → ...tter.name}}/src/core/admin/model_admin.py
diff --git a/...project_slug}}/src/core/api/pagination.py → ...ecutter.name}}/src/core/api/pagination.py b/...project_slug}}/src/core/api/pagination.py → ...ecutter.name}}/src/core/api/pagination.py
diff --git a/....project_slug}}/src/core/api/renderers.py → ...iecutter.name}}/src/core/api/renderers.py b/....project_slug}}/src/core/api/renderers.py → ...iecutter.name}}/src/core/api/renderers.py
diff --git a/...project_slug}}/src/core/api/throttling.py → ...ecutter.name}}/src/core/api/throttling.py b/...project_slug}}/src/core/api/throttling.py → ...ecutter.name}}/src/core/api/throttling.py
diff --git a/...r.project_slug}}/src/core/api/viewsets.py → ...kiecutter.name}}/src/core/api/viewsets.py b/...r.project_slug}}/src/core/api/viewsets.py → ...kiecutter.name}}/src/core/api/viewsets.py
diff --git a/...kiecutter.project_slug}}/src/core/asgi.py → {{cookiecutter.name}}/src/core/asgi.py b/...kiecutter.project_slug}}/src/core/asgi.py → {{cookiecutter.name}}/src/core/asgi.py
diff --git a/...er.project_slug}}/src/core/base_config.py → ...okiecutter.name}}/src/core/base_config.py b/...er.project_slug}}/src/core/base_config.py → ...okiecutter.name}}/src/core/base_config.py
diff --git a/...utter.project_slug}}/src/core/conf/api.py → {{cookiecutter.name}}/src/core/conf/api.py b/...utter.project_slug}}/src/core/conf/api.py → {{cookiecutter.name}}/src/core/conf/api.py
diff --git a/...tter.project_slug}}/src/core/conf/auth.py → {{cookiecutter.name}}/src/core/conf/auth.py b/...tter.project_slug}}/src/core/conf/auth.py → {{cookiecutter.name}}/src/core/conf/auth.py
diff --git a/...oject_slug}}/src/core/conf/boilerplate.py → ...utter.name}}/src/core/conf/boilerplate.py b/...oject_slug}}/src/core/conf/boilerplate.py → ...utter.name}}/src/core/conf/boilerplate.py
diff --git a/...cutter.project_slug}}/src/core/conf/db.py → {{cookiecutter.name}}/src/core/conf/db.py b/...cutter.project_slug}}/src/core/conf/db.py → {{cookiecutter.name}}/src/core/conf/db.py
diff --git a/...r.project_slug}}/src/core/conf/environ.py → ...kiecutter.name}}/src/core/conf/environ.py b/...r.project_slug}}/src/core/conf/environ.py → ...kiecutter.name}}/src/core/conf/environ.py
diff --git a/...ject_slug}}/src/core/conf/healthchecks.py → ...tter.name}}/src/core/conf/healthchecks.py b/...ject_slug}}/src/core/conf/healthchecks.py → ...tter.name}}/src/core/conf/healthchecks.py
diff --git a/...tter.project_slug}}/src/core/conf/http.py → {{cookiecutter.name}}/src/core/conf/http.py b/...tter.project_slug}}/src/core/conf/http.py → {{cookiecutter.name}}/src/core/conf/http.py
diff --git a/...tter.project_slug}}/src/core/conf/i18n.py → {{cookiecutter.name}}/src/core/conf/i18n.py b/...tter.project_slug}}/src/core/conf/i18n.py → {{cookiecutter.name}}/src/core/conf/i18n.py
diff --git a/...ct_slug}}/src/core/conf/installed_apps.py → ...er.name}}/src/core/conf/installed_apps.py b/...ct_slug}}/src/core/conf/installed_apps.py → ...er.name}}/src/core/conf/installed_apps.py
diff --git a/...ter.project_slug}}/src/core/conf/media.py → {{cookiecutter.name}}/src/core/conf/media.py b/...ter.project_slug}}/src/core/conf/media.py → {{cookiecutter.name}}/src/core/conf/media.py
diff --git a/...roject_slug}}/src/core/conf/middleware.py → ...cutter.name}}/src/core/conf/middleware.py b/...roject_slug}}/src/core/conf/middleware.py → ...cutter.name}}/src/core/conf/middleware.py
diff --git a/...er.project_slug}}/src/core/conf/sentry.py → ...okiecutter.name}}/src/core/conf/sentry.py b/...er.project_slug}}/src/core/conf/sentry.py → ...okiecutter.name}}/src/core/conf/sentry.py
diff --git a/...er.project_slug}}/src/core/conf/static.py → ...okiecutter.name}}/src/core/conf/static.py b/...er.project_slug}}/src/core/conf/static.py → ...okiecutter.name}}/src/core/conf/static.py
diff --git a/...r.project_slug}}/src/core/conf/storage.py → ...kiecutter.name}}/src/core/conf/storage.py b/...r.project_slug}}/src/core/conf/storage.py → ...kiecutter.name}}/src/core/conf/storage.py
diff --git a/...project_slug}}/src/core/conf/templates.py → ...ecutter.name}}/src/core/conf/templates.py b/...project_slug}}/src/core/conf/templates.py → ...ecutter.name}}/src/core/conf/templates.py
diff --git a/....project_slug}}/src/core/conf/timezone.py → ...iecutter.name}}/src/core/conf/timezone.py b/....project_slug}}/src/core/conf/timezone.py → ...iecutter.name}}/src/core/conf/timezone.py
diff --git a/...ore/management/commands/makemigrations.py → ...ore/management/commands/makemigrations.py b/...ore/management/commands/makemigrations.py → ...ore/management/commands/makemigrations.py
diff --git a/.../src/core/management/commands/startapp.py → .../src/core/management/commands/startapp.py b/.../src/core/management/commands/startapp.py → .../src/core/management/commands/startapp.py
diff --git a/...ect_slug}}/src/core/middleware/real_ip.py → ...ter.name}}/src/core/middleware/real_ip.py b/...ect_slug}}/src/core/middleware/real_ip.py → ...ter.name}}/src/core/middleware/real_ip.py
diff --git a/...ecutter.project_slug}}/src/core/models.py → {{cookiecutter.name}}/src/core/models.py b/...ecutter.project_slug}}/src/core/models.py → {{cookiecutter.name}}/src/core/models.py
diff --git a/...utter.project_slug}}/src/core/services.py → {{cookiecutter.name}}/src/core/services.py b/...utter.project_slug}}/src/core/services.py → {{cookiecutter.name}}/src/core/services.py
diff --git a/...utter.project_slug}}/src/core/settings.py → {{cookiecutter.name}}/src/core/settings.py b/...utter.project_slug}}/src/core/settings.py → {{cookiecutter.name}}/src/core/settings.py
diff --git a/...oject_slug}}/src/core/testing/__init__.py → ...utter.name}}/src/core/testing/__init__.py b/...oject_slug}}/src/core/testing/__init__.py → ...utter.name}}/src/core/testing/__init__.py
diff --git a/...er.project_slug}}/src/core/testing/api.py → ...okiecutter.name}}/src/core/testing/api.py b/...er.project_slug}}/src/core/testing/api.py → ...okiecutter.name}}/src/core/testing/api.py
diff --git a/...roject_slug}}/src/core/testing/factory.py → ...cutter.name}}/src/core/testing/factory.py b/...roject_slug}}/src/core/testing/factory.py → ...cutter.name}}/src/core/testing/factory.py
diff --git a/....project_slug}}/src/core/testing/mixer.py → ...iecutter.name}}/src/core/testing/mixer.py b/....project_slug}}/src/core/testing/mixer.py → ...iecutter.name}}/src/core/testing/mixer.py
diff --git a/...project_slug}}/src/core/testing/runner.py → ...ecutter.name}}/src/core/testing/runner.py b/...project_slug}}/src/core/testing/runner.py → ...ecutter.name}}/src/core/testing/runner.py
diff --git a/....project_slug}}/src/core/testing/types.py → ...iecutter.name}}/src/core/testing/types.py b/....project_slug}}/src/core/testing/types.py → ...iecutter.name}}/src/core/testing/types.py
diff --git a/....project_slug}}/src/core/urls/__init__.py → ...iecutter.name}}/src/core/urls/__init__.py b/....project_slug}}/src/core/urls/__init__.py → ...iecutter.name}}/src/core/urls/__init__.py
diff --git a/...cutter.project_slug}}/src/core/urls/v1.py → {{cookiecutter.name}}/src/core/urls/v1.py b/...cutter.project_slug}}/src/core/urls/v1.py → {{cookiecutter.name}}/src/core/urls/v1.py
diff --git a/...kiecutter.project_slug}}/src/core/wsgi.py → {{cookiecutter.name}}/src/core/wsgi.py b/...kiecutter.project_slug}}/src/core/wsgi.py → {{cookiecutter.name}}/src/core/wsgi.py
diff --git a/{{cookiecutter.project_slug}}/src/manage.py → {{cookiecutter.name}}/src/manage.py b/{{cookiecutter.project_slug}}/src/manage.py → {{cookiecutter.name}}/src/manage.py
diff --git a/...iecutter.project_slug}}/tests/__init__.py → {{cookiecutter.name}}/tests/__init__.py b/...iecutter.project_slug}}/tests/__init__.py → {{cookiecutter.name}}/tests/__init__.py
diff --git a/...ps/a12n/jwt_views/test_obtain_jwt_view.py → ...ps/a12n/jwt_views/test_obtain_jwt_view.py b/...ps/a12n/jwt_views/test_obtain_jwt_view.py → ...ps/a12n/jwt_views/test_obtain_jwt_view.py
diff --git a/.../a12n/jwt_views/test_refresh_jwt_token.py → .../a12n/jwt_views/test_refresh_jwt_token.py b/.../a12n/jwt_views/test_refresh_jwt_token.py → .../a12n/jwt_views/test_refresh_jwt_token.py
diff --git a/...roject_slug}}/tests/apps/users/factory.py → ...cutter.name}}/tests/apps/users/factory.py b/...roject_slug}}/tests/apps/users/factory.py → ...cutter.name}}/tests/apps/users/factory.py
diff --git a/...oject_slug}}/tests/apps/users/fixtures.py → ...utter.name}}/tests/apps/users/fixtures.py b/...oject_slug}}/tests/apps/users/fixtures.py → ...utter.name}}/tests/apps/users/fixtures.py
diff --git a/...tests/apps/users/test_password_hashing.py → ...tests/apps/users/test_password_hashing.py b/...tests/apps/users/test_password_hashing.py → ...tests/apps/users/test_password_hashing.py
diff --git a/...ct_slug}}/tests/apps/users/test_whoami.py → ...er.name}}/tests/apps/users/test_whoami.py b/...ct_slug}}/tests/apps/users/test_whoami.py → ...er.name}}/tests/apps/users/test_whoami.py
diff --git a/...iecutter.project_slug}}/tests/conftest.py → {{cookiecutter.name}}/tests/conftest.py b/...iecutter.project_slug}}/tests/conftest.py → {{cookiecutter.name}}/tests/conftest.py
diff --git a/...ter.project_slug}}/tests/core/__init__.py → {{cookiecutter.name}}/tests/core/__init__.py b/...ter.project_slug}}/tests/core/__init__.py → {{cookiecutter.name}}/tests/core/__init__.py
diff --git a/...tter.project_slug}}/tests/core/factory.py → {{cookiecutter.name}}/tests/core/factory.py b/...tter.project_slug}}/tests/core/factory.py → {{cookiecutter.name}}/tests/core/factory.py
diff --git a/...ter.project_slug}}/tests/core/fixtures.py → {{cookiecutter.name}}/tests/core/fixtures.py b/...ter.project_slug}}/tests/core/fixtures.py → {{cookiecutter.name}}/tests/core/fixtures.py
diff --git a/....project_slug}}/tests/core/test_health.py → ...iecutter.name}}/tests/core/test_health.py b/....project_slug}}/tests/core/test_health.py → ...iecutter.name}}/tests/core/test_health.py
diff --git a/...tests/core/test_remote_addr_midlleware.py → ...tests/core/test_remote_addr_midlleware.py b/...tests/core/test_remote_addr_midlleware.py → ...tests/core/test_remote_addr_midlleware.py
diff --git a/...ect_slug}}/tests/core/testing/__init__.py → ...ter.name}}/tests/core/testing/__init__.py b/...ect_slug}}/tests/core/testing/__init__.py → ...ter.name}}/tests/core/testing/__init__.py
diff --git a/...}}/tests/core/testing/factory/__init__.py → ...}}/tests/core/testing/factory/__init__.py b/...}}/tests/core/testing/factory/__init__.py → ...}}/tests/core/testing/factory/__init__.py
diff --git a/...ests/core/testing/factory/test_factory.py → ...ests/core/testing/factory/test_factory.py b/...ests/core/testing/factory/test_factory.py → ...ests/core/testing/factory/test_factory.py
diff --git a/...sts/core/testing/factory/test_registry.py → ...sts/core/testing/factory/test_registry.py b/...sts/core/testing/factory/test_registry.py → ...sts/core/testing/factory/test_registry.py