Merge branch 'fix-pip-requirements' into 'master'

Fix pip requirements

See merge request NCER-PD/scheduling-system!294

.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"

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

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`)

requirements.txt

@@ -2,13 +2,13 @@ pycurl==7.43.0.2
 asn1crypto==1.4.0
 Babel==2.9.0
 backports.functools-lru-cache==1.6.1
-certifi==2020.11.8
+certifi==2020.12.5
 cffi==1.14.4
 chardet==3.0.4
 coverage==5.3
-cryptography==3.2.1
+cryptography==3.3.1
 cycler==0.10.0
-Django==3.1.3
+Django==3.1.4
 django-cleanup==5.1.0
 django-common-helpers==0.9.2
 django-cron==0.5.1
@@ -16,11 +16,11 @@ django-excel==0.0.10
 django-formtools==2.2
 django-npm==1.0.0
 django-otp==1.0.2
-django-phonenumber-field==5.0.0
+django-phonenumber-field==3.0.1
 django-stronghold==0.4.0
 django-two-factor-auth==1.13
 enum34==1.1.10
-Faker==4.17.1
+Faker==5.0.2
 funcsigs==1.0.2
 gunicorn==20.0.4
 idna==2.10
@@ -28,15 +28,16 @@ ipaddress==1.0.23
 kiwisolver==1.3.1
 lml==0.1.0
 luhn==0.2.0
-lxml==4.6.1
+lxml==4.6.2
 matplotlib==3.3.3
 mockito==1.2.2
 nexmo==2.5.2
 numpy==1.19.4
-pandas==1.1.4
+pandas==1.1.5
+packaging==20.8
 django-datatables-view==1.19.1
-phonenumberslite==8.12.13
-Pillow==3.4.2
+phonenumberslite==8.12.15
+Pillow==8.0.1
 psycopg2==2.8.6
 pycparser==2.20
 pyexcel==0.6.6
@@ -48,6 +49,8 @@ pyparsing==2.4.7
 python-dateutil==2.8.1
 python-docx==0.8.10
 pytz==2020.4
+py==1.10.0
+pytest==6.2.1
 qrcode==6.1
 requests==2.25.0
 six==1.15.0
@@ -58,7 +61,8 @@ texttable==1.6.3
 timeout-decorator==0.5.0
 urllib3==1.26.2
 whitenoise==5.2.0
-xlrd==1.2.0
+xlrd==2.0.1
+wheel==0.36.2
 xlwt==1.3.0
 parameterized==0.7.4
-setuptools==50.3.2
+setuptools==51.0.0