From 406c7434a2e50a51a139a741b0492b98839bff66 Mon Sep 17 00:00:00 2001 From: Jay Miller <kjaymiller@gmail.com> Date: Thu, 30 Nov 2023 15:42:52 -0500 Subject: [PATCH 1/4] Rename requirements-dev.in to requirements-dev.txt --- .../{requirements-dev.in => requirements-dev.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {{cookiecutter.__src_folder_name}}/{requirements-dev.in => requirements-dev.txt} (100%) diff --git a/{{cookiecutter.__src_folder_name}}/requirements-dev.in b/{{cookiecutter.__src_folder_name}}/requirements-dev.txt similarity index 100% rename from {{cookiecutter.__src_folder_name}}/requirements-dev.in rename to {{cookiecutter.__src_folder_name}}/requirements-dev.txt From a8f34a6ee77605ddd79656ad9af7488bfdee9994 Mon Sep 17 00:00:00 2001 From: Jay Miller <kjaymiller@gmail.com> Date: Thu, 30 Nov 2023 15:44:12 -0500 Subject: [PATCH 2/4] Update devcontainer.json renames *.in to *.txt --- .../.devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json b/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json index 4d51be2..affdb84 100644 --- a/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json +++ b/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json @@ -74,7 +74,7 @@ "ghcr.io/azure/azure-dev/azd:latest": {} }, {% if cookiecutter.project_backend == "django" %} - "postCreateCommand": "python -m pip install -r requirements-dev.in && python src/manage.py migrate && python src/manage.py loaddata src/seed_data.json" + "postCreateCommand": "python -m pip install -r requirements-dev.txt && python src/manage.py migrate && python src/manage.py loaddata src/seed_data.json" {% endif %} {% if cookiecutter.project_backend == "flask" %} {% if 'postgres' in cookiecutter.db_resource %} From e39eee1345da13b1ba3e3e5d0e987c0f17c25659 Mon Sep 17 00:00:00 2001 From: Jay Miller <kjaymiller@gmail.com> Date: Thu, 30 Nov 2023 15:44:35 -0500 Subject: [PATCH 3/4] Update devcontainer.json --- .../.devcontainer/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json b/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json index affdb84..442e011 100644 --- a/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json +++ b/{{cookiecutter.__src_folder_name}}/.devcontainer/devcontainer.json @@ -78,13 +78,13 @@ {% endif %} {% if cookiecutter.project_backend == "flask" %} {% if 'postgres' in cookiecutter.db_resource %} - "postCreateCommand": "pip install -r requirements-dev.in && pip install -e src && python3 -m flask --app src/flaskapp db upgrade --directory src/flaskapp/migrations && python3 -m flask --app src/flaskapp seed --filename src/seed_data.json" + "postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src && python3 -m flask --app src/flaskapp db upgrade --directory src/flaskapp/migrations && python3 -m flask --app src/flaskapp seed --filename src/seed_data.json" {% else %} - "postCreateCommand": "pip install -r requirements-dev.in && pip install -e src && python3 -m flask --app src/flaskapp seed --filename src/seed_data.json --drop" + "postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src && python3 -m flask --app src/flaskapp seed --filename src/seed_data.json --drop" {% endif %} {% endif %} {% if cookiecutter.project_backend == "fastapi" %} - "postCreateCommand": "pip install -r requirements-dev.in && pip install -e src && python3 src/fastapi_app/seed_data.py" + "postCreateCommand": "pip install -r requirements-dev.txt && pip install -e src && python3 src/fastapi_app/seed_data.py" {% endif %} } From 9580fb985661bdd4eb5310b444e2d6e5f09c7b4f Mon Sep 17 00:00:00 2001 From: Jay Miller <kjaymiller@gmail.com> Date: Thu, 30 Nov 2023 15:47:44 -0500 Subject: [PATCH 4/4] updates all the places --- .../.github/workflows/azure-dev.yml | 2 +- {{cookiecutter.__src_folder_name}}/.github/workflows/cruft.yml | 2 +- {{cookiecutter.__src_folder_name}}/.github/workflows/format.yml | 2 +- {{cookiecutter.__src_folder_name}}/.github/workflows/tests.yml | 2 +- {{cookiecutter.__src_folder_name}}/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.__src_folder_name}}/.github/workflows/azure-dev.yml b/{{cookiecutter.__src_folder_name}}/.github/workflows/azure-dev.yml index 7f2d960..3013f96 100644 --- a/{{cookiecutter.__src_folder_name}}/.github/workflows/azure-dev.yml +++ b/{{cookiecutter.__src_folder_name}}/.github/workflows/azure-dev.yml @@ -102,6 +102,6 @@ jobs: URI: ${{needs.build.outputs.uri}} run: | python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-dev.in + python3 -m pip install -r requirements-dev.txt python3 -m playwright install --with-deps python3 -m pytest --exitfirst src/tests/smoke/smoketests.py --live-server-url $URI diff --git a/{{cookiecutter.__src_folder_name}}/.github/workflows/cruft.yml b/{{cookiecutter.__src_folder_name}}/.github/workflows/cruft.yml index 3fce56d..6910276 100644 --- a/{{cookiecutter.__src_folder_name}}/.github/workflows/cruft.yml +++ b/{{cookiecutter.__src_folder_name}}/.github/workflows/cruft.yml @@ -31,7 +31,7 @@ jobs: python-version: "3.10" - name: Install Cruft - run: pip3 install -r requirements-dev.in + run: pip3 install -r requirements-dev.txt - name: Check if update is available continue-on-error: false diff --git a/{{cookiecutter.__src_folder_name}}/.github/workflows/format.yml b/{{cookiecutter.__src_folder_name}}/.github/workflows/format.yml index e511d2a..26dcb0f 100644 --- a/{{cookiecutter.__src_folder_name}}/.github/workflows/format.yml +++ b/{{cookiecutter.__src_folder_name}}/.github/workflows/format.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements-dev.in + pip install -r requirements-dev.txt - name: Lint with ruff run: | ruff check . diff --git a/{{cookiecutter.__src_folder_name}}/.github/workflows/tests.yml b/{{cookiecutter.__src_folder_name}}/.github/workflows/tests.yml index 06d5bb8..181d056 100644 --- a/{{cookiecutter.__src_folder_name}}/.github/workflows/tests.yml +++ b/{{cookiecutter.__src_folder_name}}/.github/workflows/tests.yml @@ -55,7 +55,7 @@ jobs: - name: Install dependencies run: | python3 -m pip install --upgrade pip - python3 -m pip install -r requirements-dev.in + python3 -m pip install -r requirements-dev.txt playwright install --with-deps {% if cookiecutter.project_backend in ("flask", "fastapi") %} python3 -m pip install -e src diff --git a/{{cookiecutter.__src_folder_name}}/README.md b/{{cookiecutter.__src_folder_name}}/README.md index b5b049d..3f4e0f1 100644 --- a/{{cookiecutter.__src_folder_name}}/README.md +++ b/{{cookiecutter.__src_folder_name}}/README.md @@ -98,7 +98,7 @@ python3 src/manage.py createsuperuser 2. Install the development requirements: ```sh - python3 -m pip install -r requirements-dev.in + python3 -m pip install -r requirements-dev.txt python3 -m playwright install --with-deps ```