From c7ad1e633696c25702a51b77cb73b9b721985821 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 15 Dec 2020 10:48:13 +0100
Subject: [PATCH] don't use deprecated resolver anymore
---
.gitlab-ci.yml | 8 ++++----
Dockerfile | 2 +-
readme.md | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 672dc848..5edfab6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,8 @@ variables:
stage: test
before_script:
- apt-get update && apt-get install -y --allow-unauthenticated libsasl2-dev libssl-dev locales locales-all
- - pip install --use-deprecated=legacy-resolver -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
- - pip install --use-deprecated=legacy-resolver -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
+ - pip install -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
+ - pip install -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
test_postgres:
<<: *test_definition
@@ -89,8 +89,8 @@ build_debian:
- curl -sL https://deb.nodesource.com/setup_14.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
- - pip install --use-deprecated=legacy-resolver -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
- - pip install --use-deprecated=legacy-resolver -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
+ - pip install -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
+ - pip install -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
- export DEBFULLNAME="Piotr Gawron"
- export DEBEMAIL="piotr.gawron@uni.lu"
diff --git a/Dockerfile b/Dockerfile
index 955f7115..0b52e1a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir /code
WORKDIR /code
RUN apt-get update && apt-get install -y --allow-unauthenticated libsasl2-dev libssl-dev locales locales-all
ADD requirements* /code/
-RUN pip install --use-deprecated=legacy-resolver -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/ && pip install --use-deprecated=legacy-resolver -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/ # --use-feature=2020-resolver
+RUN pip install -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/ && pip install -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/ # --use-feature=2020-resolver
ADD . /code/
RUN cp local_settings_ci.py smash/smash/local_settings.py
WORKDIR /code/smash
diff --git a/readme.md b/readme.md
index 82e6a16c..c5dc61cb 100644
--- a/readme.md
+++ b/readme.md
@@ -27,7 +27,7 @@ python manage.py createsuperuser
- `cd scheduling-system`
- `virtualenv env` to create new virtualenv (contains clean python working environment)
- `. env/bin/activate` (to start using virtualenv)
- - `pip install --use-deprecated=legacy-resolver -r requirements.txt` to install project's dependencies
+ - `pip install -r requirements.txt` to install project's dependencies
- Create `local_settings.py` file in `(./scheduling-system)/smash/smash` directory by copying the template in `(./scheduling-system)/smash/smash/local_settings.template` and edit your local_setttings.py file to change your database connection data.
- Update migration db scrpit from file structure (`./scheduling-system/smash/manage.py makemigrations`)
--
GitLab