Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

fix: cleanup ci and update pipfile #1632

Merged
merged 5 commits into from
Mar 15, 2022
Merged

fix: cleanup ci and update pipfile #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
995cb0c
fix: cleanup ci and update pipfile
razvan-pro Mar 15, 2022
9578f5e
fix aimmo-game-worker python version
razvan-pro Mar 15, 2022
5d0e40c
update game worker pipfile
razvan-pro Mar 15, 2022
67c8258
update python version in docker images
razvan-pro Mar 15, 2022
4c21596
update pipfile lock
razvan-pro Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
run: |
pip install pipenv
pipenv install --dev --system
pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@upgrade-django#egg=cfl-common&subdirectory=cfl_common" # TODO remove after Django upgrade
pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@upgrade-django#egg=codeforlife-portal" # TODO remove after Django upgrade
pip install -U "git+https://github.com/ocadotechnology/rapid-router@upgrade-django#egg=rapid-router" # TODO remove after Django upgrade
cd game_frontend
yarn --frozen-lockfile
- name: Run Javascript tests
Expand Down
5 changes: 2 additions & 3 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ name = "pypi"
pytest = "~=6.2"
pytest-django = "==4.5.2"
pytest-pythonpath = "*"
# TODO uncomment after Django upgrade
# codeforlife-portal = "*"
codeforlife-portal = "*"
pytest-cov = "*"
black = "*"
django-test-migrations = "==1.2.0"

[packages]
aimmo = {editable = true,path = "."}
django-autoconfig = { git = 'https://github.com/ocadotechnology/django-autoconfig.git', ref = 'upgrade-django' }
django-autoconfig = { git = 'https://github.com/ocadotechnology/django-autoconfig.git', ref = 'master' }
kubernetes = "*"
eventlet = "*"
docker = "*"
Expand Down
627 changes: 622 additions & 5 deletions Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions aimmo-game-creator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM python:3.6.10-buster as builder
FROM python:3.7.12-buster as builder
LABEL Author='codeforlife@ocado.com'
RUN pip install pipenv=="2018.11.26"
COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"]
RUN pipenv install --system --deploy

FROM python:3.6.10-buster as base
COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
FROM python:3.7.12-buster as base
COPY --from=builder /usr/local/lib/python3.7/site-packages /usr/local/lib/python3.7/site-packages
COPY . .

FROM base as tester
Expand Down
6 changes: 3 additions & 3 deletions aimmo-game-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM python:3.6.10-buster as builder
FROM python:3.7.12-buster as builder
LABEL Author='codeforlife@ocado.com'

RUN pip install pipenv=="2018.11.26"
COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"]
RUN pipenv install --system --deploy

FROM python:3.6.10-buster as base
COPY --from=builder /usr/local/lib/python3.6/site-packages /usr/local/lib/python3.6/site-packages
FROM python:3.7.12-buster as base
COPY --from=builder /usr/local/lib/python3.7/site-packages /usr/local/lib/python3.7/site-packages
COPY . .

FROM base as tester
Expand Down
2 changes: 1 addition & 1 deletion aimmo-game-worker/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiohttp-cors = "*"
idna-ssl = "*"

[requires]
python_version = "3.6.7"
python_version = "3.7"

[dev-packages]
"autopep8" = "*"
741 changes: 440 additions & 301 deletions aimmo-game-worker/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions aimmo-game/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM python:3.7.7-buster as builder
FROM python:3.7.12-buster as builder
LABEL Author='codeforlife@ocado.com'

RUN pip install pipenv=="2018.11.26"
COPY ["Pipfile", "Pipfile.lock", "setup.py", "./"]
RUN pipenv install --system --deploy

FROM python:3.7.7-buster as base
FROM python:3.7.12-buster as base
COPY --from=builder /usr/local/lib/python3.7/site-packages /usr/local/lib/python3.7/site-packages
COPY . .

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"requests==2.25.0",
"hypothesis==5.41.3",
"kubernetes==21.7.0",
# "cfl-common", # TODO uncomment after Django upgrade
"cfl-common",
"django-csp==3.7",
],
tests_require=["docker >= 3.5, < 3.6", "kubernetes == 21.7.0", "PyYAML == 5.4"],
Expand Down