From 5a76ee4215fca99909f1426b5772c6852b9cc6da Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Thu, 14 Nov 2024 23:30:15 +0100 Subject: [PATCH] Fixes (#89) * Clean-up Makefile. * Remove old `scripts` directory. --- .secrets.baseline | 6 +- Makefile | 113 +--------------------- scripts/alembic_migrate.sh | 3 - scripts/benchmark_test.sh | 2 - scripts/black.sh | 6 -- scripts/build_docs.sh | 3 - scripts/check_release.sh | 4 - scripts/clean_up.sh | 17 ---- scripts/compile_requirements.sh | 73 -------------- scripts/detect-secrets-create-baseline.sh | 2 - scripts/doc8.sh | 2 - scripts/flask_runserver.sh | 2 - scripts/install.sh | 7 -- scripts/isort.sh | 6 -- scripts/jupyter.sh | 3 - scripts/make_migrations.sh | 10 -- scripts/make_release.sh | 4 - scripts/migrate.sh | 3 - scripts/mypy.sh | 2 - scripts/rebuild_docs.sh | 7 -- scripts/ruff.sh | 5 - scripts/runserver.sh | 3 - scripts/serve_docs.sh | 3 - scripts/shell.sh | 3 - scripts/sqlalchemy_shell.sh | 3 - scripts/test_rst_docs.sh | 3 - scripts/test_tests.sh | 2 - scripts/uninstall.sh | 7 -- scripts/upgrade_requirements.sh | 51 ---------- 29 files changed, 7 insertions(+), 348 deletions(-) delete mode 100755 scripts/alembic_migrate.sh delete mode 100755 scripts/benchmark_test.sh delete mode 100755 scripts/black.sh delete mode 100755 scripts/build_docs.sh delete mode 100755 scripts/check_release.sh delete mode 100755 scripts/clean_up.sh delete mode 100755 scripts/compile_requirements.sh delete mode 100755 scripts/detect-secrets-create-baseline.sh delete mode 100755 scripts/doc8.sh delete mode 100755 scripts/flask_runserver.sh delete mode 100755 scripts/install.sh delete mode 100755 scripts/isort.sh delete mode 100755 scripts/jupyter.sh delete mode 100755 scripts/make_migrations.sh delete mode 100755 scripts/make_release.sh delete mode 100755 scripts/migrate.sh delete mode 100755 scripts/mypy.sh delete mode 100755 scripts/rebuild_docs.sh delete mode 100755 scripts/ruff.sh delete mode 100755 scripts/runserver.sh delete mode 100755 scripts/serve_docs.sh delete mode 100755 scripts/shell.sh delete mode 100755 scripts/sqlalchemy_shell.sh delete mode 100755 scripts/test_rst_docs.sh delete mode 100755 scripts/test_tests.sh delete mode 100755 scripts/uninstall.sh delete mode 100755 scripts/upgrade_requirements.sh diff --git a/.secrets.baseline b/.secrets.baseline index 84a8f726..1c4914ec 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -118,14 +118,14 @@ "filename": "Makefile", "hashed_secret": "504a5c3a2ce5fa0acc5f8d9685dc45860c25a8ed", "is_verified": true, - "line_number": 235 + "line_number": 134 }, { "type": "Secret Keyword", "filename": "Makefile", "hashed_secret": "a3dd3453449ace4d9d2320fa941a909b57c0e846", "is_verified": true, - "line_number": 238 + "line_number": 137 } ], "README.rst": [ @@ -219,5 +219,5 @@ } ] }, - "generated_at": "2024-10-30T22:52:46Z" + "generated_at": "2024-11-14T22:15:37Z" } diff --git a/Makefile b/Makefile index 46b652d3..7afabf2b 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,13 @@ alembic_migrate: benchmark_test: pytest -vvrx --durations=0 -#black: -# black . - build_docs: sphinx-build -n -a -b html docs builddocs cd builddocs && zip -r ../builddocs.zip . -x ".*" && cd .. check_release: python setup.py sdist bdist_wheel - twine check dist/* + twine check dist/* --verbose clean: find . -name "*.pyc" -exec rm -rf {} \; @@ -35,104 +32,6 @@ clean: rm -rf .mypy_cache/ rm -rf .ruff_cache/ -#compile_requirements: -# echo "common.in" -# pip-compile examples/requirements/common.in -# -# echo "debug.in" -# pip-compile examples/requirements/debug.in -# -# echo "deployment.in" -# pip-compile examples/requirements/deployment.in -# -# echo "dev.in" -# pip-compile examples/requirements/dev.in -# -# echo "django_5_0.in" -# pip-compile examples/requirements/django_5_0.in -# -# echo "django_5_1.in" -# pip-compile examples/requirements/django_5_1.in -# -# echo "django_4_2.in" -# pip-compile examples/requirements/django_4_2.in -# -# echo "django_5_0_and_flask.in" -# pip-compile examples/requirements/django_5_0_and_flask.in -# -# echo "django_5_1_and_flask.in" -# pip-compile examples/requirements/django_5_1_and_flask.in -# -# echo "django_4_2_and_flask.in" -# pip-compile examples/requirements/django_4_2_and_flask.in -# -# echo "docs.in" -# pip-compile examples/requirements/docs.in -# -# echo "flask.in" -# pip-compile examples/requirements/flask.in -# -# echo "ml.in" -# pip-compile examples/requirements/ml.in -# -# echo "style_checkers.in" -# pip-compile examples/requirements/style_checkers.in -# -# echo "test.in" -# pip-compile examples/requirements/test.in -# -# echo "testing.in" -# pip-compile examples/requirements/testing.in -# -#compile_requirements_upgrade: -# echo "common.in" -# pip-compile --upgrade examples/requirements/common.in -# -# echo "debug.in" -# pip-compile --upgrade examples/requirements/debug.in -# -# echo "deployment.in" -# pip-compile --upgrade examples/requirements/deployment.in -# -# echo "dev.in" -# pip-compile --upgrade examples/requirements/dev.in -# -# echo "django_5_0.in" -# pip-compile --upgrade examples/requirements/django_5_0.in -# -# echo "django_5_1.in" -# pip-compile --upgrade examples/requirements/django_5_1.in -# -# echo "django_4_2.in" -# pip-compile --upgrade examples/requirements/django_4_2.in -# -# echo "django_5_0_and_flask.in" -# pip-compile --upgrade examples/requirements/django_5_0_and_flask.in -# -# echo "django_5_1_and_flask.in" -# pip-compile --upgrade examples/requirements/django_5_1_and_flask.in -# -# echo "django_4_2_and_flask.in" -# pip-compile --upgrade examples/requirements/django_4_2_and_flask.in -# -# echo "docs.in" -# pip-compile --upgrade examples/requirements/docs.in -# -# echo "flask.in" -# pip-compile --upgrade examples/requirements/flask.in -# -# echo "ml.in" -# pip-compile --upgrade examples/requirements/ml.in -# -# echo "style_checkers.in" -# pip-compile --upgrade examples/requirements/style_checkers.in -# -# echo "test.in" -# pip-compile --upgrade examples/requirements/test.in -# -# echo "testing.in" -# pip-compile --upgrade examples/requirements/testing.in - compile_requirements: echo "common.in" uv pip compile --no-strip-extras examples/requirements/common.in -o examples/requirements/common.txt @@ -246,17 +145,13 @@ flask_runserver: pre-commit: pre-commit run --all-files -install: - pip-compile examples/requirements/dev.in +install: compile_requirements pip install -r examples/requirements/dev.txt pip install -e . mkdir -p var/logs examples/db examples/media examples/media/static python examples/django_example/manage.py collectstatic --noinput python examples/django_example/manage.py migrate --noinput -#isort: -# isort . --overwrite-in-place - jupyter: cd examples/django_example/ && TOKENIZERS_PARALLELISM=true ./manage.py shell_plus --notebook @@ -287,7 +182,7 @@ mypy: auto_build_docs: sphinx-autobuild docs docs/_build/html -rebuild_docs: clean_up +rebuild_docs: clean sphinx-apidoc src/faker_file --full -o docs -H 'faker-file' -A 'Artur Barseghyan ' -f -d 20 cp docs/conf.py.distrib docs/conf.py cp docs/index.rst.distrib docs/index.rst @@ -302,7 +197,7 @@ runserver: cd examples/django_example/ && ./manage.py runserver 0.0.0.0:8000 --traceback -v 3 "$$@" serve_docs: - cd builddocs/ && python -m http.server 5000 + cd builddocs/ && python -m http.server 5001 shell: cd examples/django_example/ && ./manage.py shell --traceback -v 3 "$$@" diff --git a/scripts/alembic_migrate.sh b/scripts/alembic_migrate.sh deleted file mode 100755 index ddbb7554..00000000 --- a/scripts/alembic_migrate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd examples/sqlalchemy_example/faker_file_admin/ -alembic upgrade head diff --git a/scripts/benchmark_test.sh b/scripts/benchmark_test.sh deleted file mode 100755 index eace09d6..00000000 --- a/scripts/benchmark_test.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -pytest -vvrx --durations=0 diff --git a/scripts/black.sh b/scripts/black.sh deleted file mode 100755 index d051de43..00000000 --- a/scripts/black.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -#black conftest.py -#black setup.py -#black examples/ -#black src/ -black . diff --git a/scripts/build_docs.sh b/scripts/build_docs.sh deleted file mode 100755 index 31c0bb54..00000000 --- a/scripts/build_docs.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -sphinx-build -n -a -b html docs builddocs -cd builddocs && zip -r ../builddocs.zip . -x ".*" && cd .. diff --git a/scripts/check_release.sh b/scripts/check_release.sh deleted file mode 100755 index 8855e417..00000000 --- a/scripts/check_release.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -#python setup.py register -python setup.py sdist bdist_wheel -twine check dist/* --verbose diff --git a/scripts/clean_up.sh b/scripts/clean_up.sh deleted file mode 100755 index 3905f775..00000000 --- a/scripts/clean_up.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -find . -name "*.pyc" -exec rm -rf {} \; -find . -name "*.py,cover" -exec rm -rf {} \; -find . -name "*.orig" -exec rm -rf {} \; -find . -name "__pycache__" -exec rm -rf {} \; -rm -rf build/ -rm -rf builddocs/ -rm -rf dist/ -rm -rf src/faker-file.egg-info/ -rm -rf src/faker-file/var/ -rm -rf .cache/ -rm -rf .idea/ -rm -rf htmlcov/ -rm -rf .coverage -rm -rf .pytest_cache/ -rm -rf .mypy_cache/ -rm -rf .ruff_cache/ diff --git a/scripts/compile_requirements.sh b/scripts/compile_requirements.sh deleted file mode 100755 index fe072953..00000000 --- a/scripts/compile_requirements.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env bash -#cd examples/requirements/ -echo "common.in" -pip-compile examples/requirements/common.in "$@" - -echo "debug.in" -pip-compile examples/requirements/debug.in "$@" - -echo "deployment.in" -pip-compile examples/requirements/deployment.in "$@" - -echo "dev.in" -pip-compile examples/requirements/dev.in "$@" - -#echo "django_2_2.in" -#pip-compile examples/requirements/django_2_2.in "$@" -# -#echo "django_3_0.in" -#pip-compile examples/requirements/django_3_0.in "$@" -# -#echo "django_3_1.in" -#pip-compile examples/requirements/django_3_1.in "$@" - -echo "django_3_2.in" -pip-compile examples/requirements/django_3_2.in "$@" - -#echo "django_4_0.in" -#pip-compile examples/requirements/django_4_0.in "$@" - -echo "django_4_1.in" -pip-compile examples/requirements/django_4_1.in "$@" - -echo "django_4_2.in" -pip-compile examples/requirements/django_4_2.in "$@" - -#echo "django_2_2_and_flask.in" -#pip-compile examples/requirements/django_2_2_and_flask.in "$@" - -#echo "django_3_0_and_flask.in" -#pip-compile examples/requirements/django_3_0_and_flask.in "$@" -# -#echo "django_3_1_and_flask.in" -#pip-compile examples/requirements/django_3_1_and_flask.in "$@" - -echo "django_3_2_and_flask.in" -pip-compile examples/requirements/django_3_2_and_flask.in "$@" - -#echo "django_4_0_and_flask.in" -#pip-compile examples/requirements/django_4_0_and_flask.in "$@" - -echo "django_4_1_and_flask.in" -pip-compile examples/requirements/django_4_1_and_flask.in "$@" - -echo "django_4_2_and_flask.in" -pip-compile examples/requirements/django_4_2_and_flask.in "$@" - -echo "docs.in" -pip-compile examples/requirements/docs.in "$@" - -echo "flask.in" -pip-compile examples/requirements/flask.in "$@" - -echo "ml.in" -pip-compile examples/requirements/ml.in "$@" - -echo "style_checkers.in" -pip-compile examples/requirements/style_checkers.in "$@" - -echo "test.in" -pip-compile examples/requirements/test.in "$@" - -echo "testing.in" -pip-compile examples/requirements/testing.in "$@" diff --git a/scripts/detect-secrets-create-baseline.sh b/scripts/detect-secrets-create-baseline.sh deleted file mode 100755 index 69ae54c1..00000000 --- a/scripts/detect-secrets-create-baseline.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -detect-secrets scan --baseline .secrets.baseline diff --git a/scripts/doc8.sh b/scripts/doc8.sh deleted file mode 100755 index 38d6fdca..00000000 --- a/scripts/doc8.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -doc8 diff --git a/scripts/flask_runserver.sh b/scripts/flask_runserver.sh deleted file mode 100755 index 8e886d67..00000000 --- a/scripts/flask_runserver.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -python examples/sqlalchemy_example/run_server.py diff --git a/scripts/install.sh b/scripts/install.sh deleted file mode 100755 index c5859648..00000000 --- a/scripts/install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -pip-compile examples/requirements/dev.in -pip install -r examples/requirements/dev.txt -pip install -e . -mkdir -p var/logs examples/db examples/media examples/media/static -python examples/django_example/manage.py collectstatic --noinput -python examples/django_example/manage.py migrate --noinput diff --git a/scripts/isort.sh b/scripts/isort.sh deleted file mode 100755 index a4b18a78..00000000 --- a/scripts/isort.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -#isort conftest.py --overwrite-in-place -#isort setup.py --overwrite-in-place -#isort examples/ --overwrite-in-place -#isort src/ --overwrite-in-place -isort . --overwrite-in-place diff --git a/scripts/jupyter.sh b/scripts/jupyter.sh deleted file mode 100755 index 57a05951..00000000 --- a/scripts/jupyter.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd examples/django_example/ -TOKENIZERS_PARALLELISM=true ./manage.py shell_plus --notebook diff --git a/scripts/make_migrations.sh b/scripts/make_migrations.sh deleted file mode 100755 index 5703221a..00000000 --- a/scripts/make_migrations.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -echo 'Making messages for faker-file...' -cd examples/django_example/ -./manage.py makemigrations faker-file - -echo 'Making messages for example projects...' -./manage.py makemigrations - -echo 'Applying migrations...' -./manage.py migrate diff --git a/scripts/make_release.sh b/scripts/make_release.sh deleted file mode 100755 index 3aa2e4e2..00000000 --- a/scripts/make_release.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -#python setup.py register -python setup.py sdist bdist_wheel -twine upload dist/* --verbose diff --git a/scripts/migrate.sh b/scripts/migrate.sh deleted file mode 100755 index 7fbde481..00000000 --- a/scripts/migrate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd examples/django_example/ -./manage.py migrate "$@" diff --git a/scripts/mypy.sh b/scripts/mypy.sh deleted file mode 100755 index 53ef81c3..00000000 --- a/scripts/mypy.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -mypy src/ diff --git a/scripts/rebuild_docs.sh b/scripts/rebuild_docs.sh deleted file mode 100755 index c22c52b6..00000000 --- a/scripts/rebuild_docs.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -#./scripts/uninstall.sh -#./scripts/install.sh -./scripts/clean_up.sh -sphinx-apidoc src/faker_file --full -o docs -H 'faker-file' -A 'Artur Barseghyan ' -f -d 20 -cp docs/conf.py.distrib docs/conf.py -cp docs/index.rst.distrib docs/index.rst diff --git a/scripts/ruff.sh b/scripts/ruff.sh deleted file mode 100755 index a1568b14..00000000 --- a/scripts/ruff.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -ruff conftest.py -ruff setup.py -ruff examples/ -ruff src/ diff --git a/scripts/runserver.sh b/scripts/runserver.sh deleted file mode 100755 index 4491954b..00000000 --- a/scripts/runserver.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd examples/django_example/ -./manage.py runserver 0.0.0.0:8000 --traceback -v 3 "$@" diff --git a/scripts/serve_docs.sh b/scripts/serve_docs.sh deleted file mode 100755 index 76ebe8e7..00000000 --- a/scripts/serve_docs.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd builddocs/ -python -m http.server 5000 diff --git a/scripts/shell.sh b/scripts/shell.sh deleted file mode 100755 index 5c1c562c..00000000 --- a/scripts/shell.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd examples/django_example/ -./manage.py shell --traceback -v 3 "$@" diff --git a/scripts/sqlalchemy_shell.sh b/scripts/sqlalchemy_shell.sh deleted file mode 100755 index 4f40e96b..00000000 --- a/scripts/sqlalchemy_shell.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -cd examples/sqlalchemy_example/ -ipython diff --git a/scripts/test_rst_docs.sh b/scripts/test_rst_docs.sh deleted file mode 100755 index 06dff98d..00000000 --- a/scripts/test_rst_docs.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -#find . -name "*.rst" | xargs pytest -pytest *.rst docs/*.rst diff --git a/scripts/test_tests.sh b/scripts/test_tests.sh deleted file mode 100755 index f3a0c402..00000000 --- a/scripts/test_tests.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -pytest --cov-config=tests.coveragerc diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh deleted file mode 100755 index 28555988..00000000 --- a/scripts/uninstall.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -pip uninstall faker-file -y -rm build -rf -rm dist -rf -rm src/faker-file.egg-info -rf -rm builddocs.zip -rm builddocs/ -rf diff --git a/scripts/upgrade_requirements.sh b/scripts/upgrade_requirements.sh deleted file mode 100755 index 01c40e03..00000000 --- a/scripts/upgrade_requirements.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash -echo "common.in" -pip-compile examples/requirements/common.in --upgrade - -echo "debug.in" -pip-compile examples/requirements/debug.in --upgrade - -echo "deployment.in" -pip-compile examples/requirements/deployment.in --upgrade - -echo "dev.in" -pip-compile examples/requirements/dev.in --upgrade -#pip-compile examples/requirements/django_2_2.in --upgrade -#pip-compile examples/requirements/django_3_0.in --upgrade -#pip-compile examples/requirements/django_3_1.in --upgrade - -echo "django_3_2.in" -pip-compile examples/requirements/django_3_2.in --upgrade - -echo "django_4_1.in" -pip-compile examples/requirements/django_4_1.in --upgrade - -echo "django_4_2.in" -pip-compile examples/requirements/django_4_2.in --upgrade - -echo "django_3_2_and_flask.in" -pip-compile examples/requirements/django_3_2_and_flask.in --upgrade - -echo "django_4_1_and_flask.in" -pip-compile examples/requirements/django_4_1_and_flask.in --upgrade - -echo "django_4_2_and_flask.in" -pip-compile examples/requirements/django_4_2_and_flask.in --upgrade - -echo "docs.in" -pip-compile examples/requirements/docs.in --upgrade - -echo "flask.in" -pip-compile examples/requirements/flask.in --upgrade - -echo "ml.in" -pip-compile examples/requirements/ml.in --upgrade - -echo "style_checkers.in" -pip-compile examples/requirements/style_checkers.in --upgrade - -echo "test.in" -pip-compile examples/requirements/test.in --upgrade - -echo "testing.in" -pip-compile examples/requirements/testing.in --upgrade