diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 672dc848af6d04a61ae0f71604edc2cbbaa0627a..5edfab6f5d64ddd50111d569b7f49aac1ee95f95 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 955f7115fc7acd0bcd0287a0e5c64c56fb3ea543..0b52e1a3990087a573d328adcf7ee6df58872505 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 82e6a16c766b40091f0a61ce61c559b19933c363..c5dc61cb6e66713e08de2f72cb0ac28318636a27 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`)