From ee7708a8b76ef1cfbbfd1ed904eaeea449832a8d Mon Sep 17 00:00:00 2001 From: SKairinos <skairinos@gmail.com> Date: Thu, 4 Jul 2024 14:18:01 +0000 Subject: [PATCH] new package --- Pipfile | 4 ++-- Pipfile.lock | 6 +++--- scripts/hard-install | 8 ++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Pipfile b/Pipfile index 3b428b03..35dc04dd 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,7 @@ name = "pypi" # 5. Run `pipenv install --dev` in your terminal. [packages] -codeforlife = {ref = "backend_template", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"} +codeforlife = {ref = "v0.18.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"} # 🚫 Don't add [packages] below that are inherited from the CFL package. pyjwt = "==2.6.0" # TODO: upgrade to latest version # TODO: Needed by RR. Remove when RR has moved to new system. @@ -32,7 +32,7 @@ django-sekizai = "==2.0.0" django-classy-tags = "==2.0.0" [dev-packages] -codeforlife = {ref = "backend_template", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]} +codeforlife = {ref = "v0.18.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]} # codeforlife = {file = "../codeforlife-package-python", editable = true, extras = ["dev"]} # 🚫 Don't add [dev-packages] below that are inherited from the CFL package. diff --git a/Pipfile.lock b/Pipfile.lock index 72d6bd91..0179d82a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e4cf42cbb4705433125db32f7246b58e9f3fd527945a457b57f0d07b7277bf1e" + "sha256": "70c81e5ee9aae9776023efe4db14354b01dae99a728f20828b2d1aa035a59571" }, "pipfile-spec": 6, "requires": { @@ -160,7 +160,7 @@ }, "codeforlife": { "git": "https://github.com/ocadotechnology/codeforlife-package-python.git", - "ref": "bd0c488e6c8522d52d547fec609b01eddf0528e5" + "ref": "88d1d62af7a1d7423b6bc8d0bdb44099abf08e2e" }, "codeforlife-portal": { "hashes": [ @@ -1133,7 +1133,7 @@ }, "codeforlife": { "git": "https://github.com/ocadotechnology/codeforlife-package-python.git", - "ref": "bd0c488e6c8522d52d547fec609b01eddf0528e5" + "ref": "88d1d62af7a1d7423b6bc8d0bdb44099abf08e2e" }, "codeforlife-portal": { "hashes": [ diff --git a/scripts/hard-install b/scripts/hard-install index 4b04d379..1326a12a 100755 --- a/scripts/hard-install +++ b/scripts/hard-install @@ -1,10 +1,6 @@ #!/bin/bash set -e -cd "${BASH_SOURCE%/*}" +cd "${BASH_SOURCE%/*}/.." -rm -f ../Pipfile.lock -shopt -s extglob -rm -rf ../.venv/!(".gitkeep") -shopt -u extglob -pipenv install --dev +wget -O - https://raw.githubusercontent.com/ocadotechnology/codeforlife-workspace/main/scripts/backend/hard-install | bash