From a9fd3daba9ae4801b94b8960d1d447a775f8ea41 Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Wed, 4 May 2016 10:31:14 -0300 Subject: [PATCH] Faz a integracao continua com o travis funcionar corretamente --- .travis.yml | 3 ++- requirements/dev-requirements.txt | 7 +------ requirements/requirements.txt | 9 ++++++--- requirements/test-requirements.txt | 17 +++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77b6e6b60..9d469a9b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: install: - sudo apt-get install git nginx python3-dev libpq-dev graphviz-dev graphviz pkg-config python-psycopg2 nodejs npm - sudo ln -s /usr/bin/node - - pip install -r requirements/dev-requirements.txt + - pip install -r requirements/test-requirements.txt - pip install --upgrade setuptools # Line 24 to 35 is a hack found in this link below @@ -41,4 +41,5 @@ before_script: script: - ./manage.py migrate - ./manage.py bower install + - pip freeze - ./test_and_check_qa.sh \ No newline at end of file diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index b4a0bed4d..63ab21d6c 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -2,11 +2,6 @@ autopep8==1.2.2 beautifulsoup4==4.4.1 django-debug-toolbar==1.4 -django-extensions==1.6.1 -django-floppyforms==1.6.1 -easy-thumbnails==2.3 -flake8==2.5.4 ipdb==0.9.0 pygraphviz==1.3rc2 -pytest-ipdb==0.1-prerelease2 - +pytest-ipdb==0.1-prerelease2 \ No newline at end of file diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 10d6300cd..4ff777ebd 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,23 +1,26 @@ -dj-database-url +dj-database-url==0.4.1 django-admin-bootstrapped==2.5.7 django-bootstrap3==7.0.1 django-bower==5.1.0 django-braces==1.8.1 django-compressor==2.0 django-crispy-forms==1.6.0 -python-decouple==3.0 +django-extensions==1.6.1 django-extra-views==0.7.1 django-filter==0.13.0 +django-floppyforms==1.6.1 django-model-utils==2.4 django-sass-processor==0.3.4 django==1.9.5 djangorestframework +easy-thumbnails==2.3 git+git://github.com/interlegis/trml2pdf.git libsass==0.11.0 psycopg2==2.6.1 +python-decouple==3.0 pytz==2016.3 pyyaml==3.11 rtyaml==0.0.2 unipath==1.1 python-magic==0.4.10 -gunicorn==19.4.5 +gunicorn==19.4.5 \ No newline at end of file diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 5929d4dec..03bd937a2 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,10 +1,11 @@ -r requirements.txt -coverage +coverage==4.0.3 django-webtest -isort -model_mommy -pep8 -pytest -pytest-cov -pytest-django -webtest +flake8==2.5.4 +isort==4.2.5 +model_mommy==1.2.6 +pep8==1.7.0 +pytest==2.7.2 +pytest-cov==2.2.1 +pytest-django==2.9.1 +webtest==2.0.21 \ No newline at end of file