Skip to content

Commit

Permalink
no more prod, just base
Browse files Browse the repository at this point in the history
  • Loading branch information
adRn-s committed Oct 21, 2024
1 parent 87810ff commit 36e701d
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 26 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ jobs:
export this=backend/requirements/${{ matrix.python-version }}
uv pip compile --no-progress --no-cache --universal --python-version ${{ matrix.python-version }} \
backend/requirements/base.in -o ${this}/base.txt
uv pip compile --no-progress --no-cache --universal --python-version ${{ matrix.python-version }} \
backend/requirements/prod.in -c ${this}/base.txt -o ${this}/prod.txt
uv pip compile --no-progress --no-cache --universal --python-version ${{ matrix.python-version }} \
backend/requirements/dev.in -c ${this}/base.txt -o ${this}/dev.txt
uv pip compile --no-progress --no-cache --universal --python-version ${{ matrix.python-version }} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:

- name: Install dependencies
run: |
uv pip install --system -r backend/requirements/${{ matrix.python-version }}/prod.txt
uv pip install --system -r backend/requirements/${{ matrix.python-version }}/base.txt
- name: Verify migrations
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ check-rootdir:
exit 1; }

set-prod:
@sed -i -e 's#\(target:\) pk2_.*#\1 pk2_prod#' docker-compose.yml
@sed -i -e 's#\(target:\) pk2_.*#\1 pk2_base#' docker-compose.yml
@sed -i -e 's#\(^CMD \["npm", "run", "start-\).*\]#\1prod"\]#' frontend.Dockerfile
@test -e ./misc/parkour.env.ignore && cp ./misc/parkour.env.ignore ./misc/parkour.env || :

Expand Down Expand Up @@ -296,8 +296,6 @@ compile:
this=backend/requirements/$$version; \
uv pip compile --no-progress --no-cache --universal --python-version $$version \
backend/requirements/base.in -o $$this/base.txt; \
uv pip compile --no-progress --no-cache --universal --python-version $$version \
backend/requirements/prod.in -c $$this/base.txt -o $$this/prod.txt; \
uv pip compile --no-progress --no-cache --universal --python-version $$version \
backend/requirements/dev.in -c $$this/base.txt -o $$this/dev.txt; \
uv pip compile --no-progress --no-cache --universal --python-version $$version \
Expand Down
4 changes: 0 additions & 4 deletions backend.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ ENV DJANGO_SETTINGS_MODULE=wui.settings.prod

CMD ["gunicorn", "wui.wsgi:application", "--name=parkour2", "--timeout=600", "--workers=4", "--bind=0.0.0.0:8000"]

# ----------------------
FROM pk2_base AS pk2_prod
RUN uv pip install --system -r requirements/${PyVersion}/prod.txt

# ----------------------
FROM pk2_base AS pk2_dev
RUN echo "from functools import partial\nimport rich\nhelp = partial(rich.inspect, help=True, methods=True)" \
Expand Down
8 changes: 0 additions & 8 deletions backend/requirements/3.10/prod.txt

This file was deleted.

8 changes: 0 additions & 8 deletions backend/requirements/3.11/prod.txt

This file was deleted.

Empty file removed backend/requirements/prod.in
Empty file.

0 comments on commit 36e701d

Please sign in to comment.