Attempt #4 to make the travis script 3.x compatible #54

Signed-off-by: Thomas Druez <tdruez@nexb.com>
aboutcode-org · Nov 18, 2020 · 3a4eb40 · 3a4eb40
1 parent 0681ca5
commit 3a4eb40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,9 +25,7 @@ env:
   - SCANCODEIO_DB_USER=postgres
 
 install:
-  - pip install -r etc/requirements/base.txt
-  - pip uninstall --yes typing
-  - pip install -r etc/requirements/dev.txt
+  - make dev
   - make envfile
   - make check
 

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@
 # Python version can be specified with `$ PYTHON_EXE=python3.x make conf`
 PYTHON_EXE?=python3
 MANAGE=bin/python manage.py
-ACTIVATE=. bin/activate;
+ACTIVATE=
 ANSIBLE_PLAYBOOK=cd etc/ansible/ && ansible-playbook --inventory-file=hosts --verbose --ask-become-pass --user=${USER}
 BLACK_ARGS=--exclude="migrations|data|docs" .
 GET_SECRET_KEY=`${PYTHON_EXE} -c "from django.core.management import utils; print(utils.get_random_secret_key())"`