From 0bf74b2d21b8c4b0ac7db096b2b8167a57da2f2b Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Thu, 3 Mar 2016 10:26:45 -0300 Subject: [PATCH] Reverte "Fix #30" pq esta quebrando a debug-toolbar This reverts commit 8deedf3d52fe47dc7ae8124a9423765183c1eb9b. --- requirements/dev-requirements.txt | 14 +++++------ requirements/migration-requirements.txt | 2 +- requirements/requirements.txt | 33 +++++++++++++------------ requirements/test-requirements.txt | 16 ++++++------ 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index f890913e8..ee005e608 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,10 +1,10 @@ -r test-requirements.txt -autopep8==1.2.1 -beautifulsoup4==4.4.0 -django-debug-toolbar==1.3.2 -django-extensions==1.5.5 -flake8==2.4.1 -ipdb==0.8.1 -isort==4.0.0 +autopep8 +beautifulsoup4 +django-debug-toolbar +django-extensions +flake8 +ipdb +isort pygraphviz==1.3rc2 pytest-ipdb==0.1-prerelease2 diff --git a/requirements/migration-requirements.txt b/requirements/migration-requirements.txt index f426a03f9..25d226602 100644 --- a/requirements/migration-requirements.txt +++ b/requirements/migration-requirements.txt @@ -1,2 +1,2 @@ -r dev-requirements.txt -mysqlclient==1.3.6 +mysqlclient diff --git a/requirements/requirements.txt b/requirements/requirements.txt index adf689db8..cdf73800b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,18 +1,19 @@ -django-admin-bootstrapped==2.5.4 -django-bootstrap3==6.1.0 -django-bower==5.0.4 -django-braces==1.8.1 -django-compressor==1.5 -django-crispy-forms==1.5.1 -django-extra-views==0.7.1 -django-model-utils==2.4 -django-sass-processor==0.2.5 -django-vanilla-views==1.0.4 +django-admin-bootstrapped +django-bootstrap3 +django-bower +django-braces +django-compressor +django-crispy-forms +django-extra-views +django-model-utils +django-sass-processor +django-vanilla-views django==1.9 -djangorestframework==3.3.2 +djangorestframework git+git://github.com/interlegis/trml2pdf.git -libsass==0.8.3 -psycopg2==2.6.1 -pytz==2015.4 -pyyaml==3.11 -unipath==1.1 +libsass +psycopg2 +pytz +pyyaml +rtyaml +unipath diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 92cc7f3c0..476bc9c8e 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,9 +1,9 @@ -r requirements.txt -coverage==3.7.1 -django-webtest==1.7.8 -model_mommy==1.2.5 -pep8==1.6.2 -pytest==2.7.2 -pytest-cov==2.0.0 -pytest-django==2.8.0 -webtest==2.0.18 +coverage +django-webtest +model_mommy +pep8 +pytest +pytest-cov +pytest-django +webtest