Commit 1477278b32b554521d0531e6d90a22fd46006465

Authored by Etienne Pallier
2 parents 2d84f108 a350a459
Exists in dev

Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
docker/.env-sample
  1 +# ============================================================
  2 +# This file is common for Docker or nor Docker install types.
  3 +# ------------------------------------------------------------
  4 +# 1) Please copy this file into the same directory as .env
  5 +# 2) The file .env can/must be modified before:
  6 +# * The install of PyROS if you want to use without Docker.
  7 +# * The PYROS_DOCKER_BUILD of PyROS with Docker.
  8 +# ============================================================
  9 +
  10 +# === MySQL variables (change them only if you do not use Docker)
1 11 # any value as password without any space
2 12 MYSQL_ROOT_PASSWORD=root
3 13 # define the name of the root account (when not using Docker)
... ...
install/requirements_win.txt
... ... @@ -15,8 +15,8 @@ django-test-without-migrations==0.6
15 15 iso8601==0.1.12
16 16 jdcal==1.4
17 17 #lxml==3.8.0 (installed manually)
18   -lxml==4.3.0
19   -mysqlclient==1.3.12
  18 +lxml==4.6.1
  19 +mysqlclient==2.0.3
20 20 #pluggy==0.6.0
21 21 #pluggy>=0.7
22 22 pluggy==0.8.1
... ...