Fix tests (python2 only still)

ckan · Nov 8, 2019 · 6fe7fa8 · 6fe7fa8
1 parent 1cec4b1
commit 6fe7fa8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,7 +42,7 @@ jobs:
 
           # Python Dependencies
           pip install -r requirement-setuptools.txt
-          pip install -r requirements.txt
+          pip install -r requirements-py2.txt
           pip install -r dev-requirements.txt
           python setup.py develop
 

diff --git a/Dockerfile b/Dockerfile
@@ -50,7 +50,7 @@ RUN mkdir -p $CKAN_VENV $CKAN_CONFIG $CKAN_STORAGE_PATH && \
 ADD . $CKAN_VENV/src/ckan/
 RUN ckan-pip install -U pip && \
     ckan-pip install --upgrade --no-cache-dir -r $CKAN_VENV/src/ckan/requirement-setuptools.txt && \
-    ckan-pip install --upgrade --no-cache-dir -r $CKAN_VENV/src/ckan/requirements.txt && \
+    ckan-pip install --upgrade --no-cache-dir -r $CKAN_VENV/src/ckan/requirements-py2.txt && \
     ckan-pip install -e $CKAN_VENV/src/ckan/ && \
     ln -s $CKAN_VENV/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini && \
     cp -v $CKAN_VENV/src/ckan/contrib/docker/ckan-entrypoint.sh /ckan-entrypoint.sh && \

diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies
@@ -30,7 +30,7 @@ sudo -E -u postgres ./bin/postgres_init/2_create_ckan_datastore_db.sh
 
 export PIP_USE_MIRRORS=true
 pip install -r requirement-setuptools.txt --allow-all-external
-pip install -r requirements.txt --allow-all-external
+pip install -r requirements-py2.txt --allow-all-external
 pip install -r dev-requirements.txt --allow-all-external
 
 python setup.py develop

diff --git a/doc/maintaining/upgrading/index.rst b/doc/maintaining/upgrading/index.rst
@@ -128,3 +128,4 @@ appropriate one of these documents:
     upgrade-package-to-minor-release
     upgrade-source
     upgrade-postgres
+    upgrade-to-python3