diff --git a/tests/test_docker.sh b/tests/test_docker.sh index 796a772a3..98a3f9622 100755 --- a/tests/test_docker.sh +++ b/tests/test_docker.sh @@ -31,7 +31,7 @@ docker compose -f docker-compose.local.yml build # run the project's type checks docker compose -f docker-compose.local.yml run django mypy my_awesome_project -docker compose -f docker-compose.local.yml run --volume $PWD:/app django uv lock +docker compose -f docker-compose.local.yml run django uv lock # run the project's tests docker compose -f docker-compose.local.yml run django pytest diff --git a/uv.lock b/uv.lock index 20b4fa047..f0a5f5929 100644 --- a/uv.lock +++ b/uv.lock @@ -192,7 +192,7 @@ wheels = [ [[package]] name = "cookiecutter-django" -version = "2024.10.15" +version = "2024.10.25" source = { virtual = "." } dependencies = [ { name = "binaryornot" }, @@ -240,7 +240,7 @@ requires-dist = [ { name = "pytest-xdist", specifier = "==3.6.1" }, { name = "pyyaml", specifier = "==6.0.2" }, { name = "requests", specifier = "==2.32.3" }, - { name = "ruff", specifier = "==0.7.0" }, + { name = "ruff", specifier = "==0.7" }, { name = "sh", marker = "sys_platform != 'win23'", specifier = "==2.0.7" }, { name = "sphinx", marker = "extra == 'docs'", specifier = ">=8.0.2" }, { name = "sphinx-autobuild", marker = "extra == 'docs'", specifier = ">=2024.10.3" }, diff --git a/{{cookiecutter.project_slug}}/docker-compose.docs.yml b/{{cookiecutter.project_slug}}/docker-compose.docs.yml index 5fa13cd33..011356c8a 100644 --- a/{{cookiecutter.project_slug}}/docker-compose.docs.yml +++ b/{{cookiecutter.project_slug}}/docker-compose.docs.yml @@ -9,22 +9,6 @@ services: - ./.envs/.local/.django volumes: - ./docs:/docs:z - develop: - # Create a `watch` configuration to update the appl - # https://docs.docker.com/compose/file-watch/#compose-watch-versus-bind-mounts - watch: - # Sync the working directory with the `/app` directory in the container - - action: sync - path: {{ cookiecutter.project_slug }} - target: /app/{{ cookiecutter.project_slug }} - # Exclude the project virtual environment — it could be for a - # different platform in the container - ignore: - - .venv/ - - # Rebuild the image on changes to the `pyproject.toml` - - action: rebuild - path: ./pyproject.toml ports: - '9000:9000' command: /start-docs diff --git a/{{cookiecutter.project_slug}}/docker-compose.local.yml b/{{cookiecutter.project_slug}}/docker-compose.local.yml index a92138dc5..154f79608 100644 --- a/{{cookiecutter.project_slug}}/docker-compose.local.yml +++ b/{{cookiecutter.project_slug}}/docker-compose.local.yml @@ -10,6 +10,9 @@ services: dockerfile: ./compose/local/django/Dockerfile image: {{ cookiecutter.project_slug }}_local_django container_name: {{ cookiecutter.project_slug }}_local_django + volumes: + - /app/.venv + - .:/app:z depends_on: - postgres {%- if cookiecutter.use_celery == 'y' %} @@ -18,22 +21,6 @@ services: {%- if cookiecutter.use_mailpit == 'y' %} - mailpit {%- endif %} - develop: - # Create a `watch` configuration to update the appl - # https://docs.docker.com/compose/file-watch/#compose-watch-versus-bind-mounts - watch: - # Sync the working directory with the `/app` directory in the container - - action: sync - path: . - target: /app - # Exclude the project virtual environment — it could be for a - # different platform in the container - ignore: - - .venv/ - - # Rebuild the image on changes to the `pyproject.toml` - - action: rebuild - path: ./pyproject.toml env_file: - ./.envs/.local/.django - ./.envs/.local/.postgres diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml index 91d190176..b8dfdc149 100644 --- a/{{cookiecutter.project_slug}}/pyproject.toml +++ b/{{cookiecutter.project_slug}}/pyproject.toml @@ -196,7 +196,7 @@ license = { text = "BSD" } authors = [ { name = "Daniel Roy Greenfeld", email = "pydanny@gmail.com" }, ] -requires-python = ">=3.12" +requires-python = "==3.12.*" dependencies = [ "python-slugify==8.0.4", # https://github.com/un33k/python-slugify "Pillow==10.4.0", # https://github.com/python-pillow/Pillow