summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-07-30 12:32:34 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-07-30 12:33:15 +0200
commitade915ba623932a0c9d65f49a7f001c00e369ff5 (patch)
tree66d12a68aae4bbb1eeec1ad8eb4d3b7737205d46
parent8ced4c7e1355ef7638c1d7af0bf827f41a7977ae (diff)
downloadChimère-ade915ba623932a0c9d65f49a7f001c00e369ff5.tar.bz2
Chimère-ade915ba623932a0c9d65f49a7f001c00e369ff5.zip
CI: force setuptool update
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--requirements_gitlab.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45e7098..3d48d7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
before_script:
- apt-get update
- apt-get install -q -y locales-all python3-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev libexiv2-dev python3-gdal libboost-python-dev libtidy-0.99-0
+ - pip3 install -U setuptools
- pip3 install -r requirements_gitlab.txt
- cp Makefile.example Makefile
- cp local_settings.py.gitlab-ci local_settings.py
diff --git a/requirements_gitlab.txt b/requirements_gitlab.txt
index 4ecd468..1795ff0 100644
--- a/requirements_gitlab.txt
+++ b/requirements_gitlab.txt
@@ -1,4 +1,3 @@
-setuptools==5.5.1
django>=1.11,<1.11.99
beautifulsoup4==4.5.3
psycopg2