Skip to content

Commit

Permalink
Update requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishek776 authored and JamshedVesuna committed Sep 7, 2016
1 parent cb984fc commit 90dfa73
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 12 deletions.
26 changes: 21 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,30 @@ env:
global:
PYTHONUNBUFFERED=yes
matrix:
- TOXENV=2.7
- TOXENV=3.4
- TOXENV=pypy
- TOXENV=3.5
- TOXENV=pypy3
- TOXENV=2.7-django1.10
- TOXENV=2.7-django1.9
- TOXENV=pypy-django1.10
- TOXENV=pypy-django1.9
- TOXENV=3.4-django1.10
- TOXENV=3.4-django1.9
- TOXENV=3.5-django1.10
- TOXENV=3.5-django1.9
- TOXENV=flake8
- TOXENV=flakeplus
- TOXENV=apicheck
before_install:
- |
if [ "$TOXENV" = "pypy" ]; then
export PYENV_ROOT="$HOME/.pyenv"
if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
cd "$PYENV_ROOT" && git pull
else
rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
fi
"$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
fi
install: travis_retry pip install -U tox
script: tox -v -- -v
after_success:
Expand Down
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
include AUTHORS
include Changelog
include LICENSE
include README.rst
include MANIFEST.in
include setup.cfg
include setup.py
include tox.ini
recursive-include docs *
recursive-include extra/*
recursive-include examples *
recursive-include requirements *.txt *.rst
recursive-include test_proj *

recursive-exclude * __pycache__
recursive-exclude * *.py[co]
Expand Down
1 change: 1 addition & 0 deletions deux/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

__version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION)
__author__ = 'Robinhood Markets'
__contact__ = 'opensource@robinhood.com'
__homepage__ = 'https://github.com/robinhood/deux'
__docformat__ = 'restructuredtext'

Expand Down
14 changes: 7 additions & 7 deletions requirements/default.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
djangorestframework>=2.4.3
django-oauth-toolkit==0.10.0
django-otp==0.3.5
httplib2==0.9.2
oauthlib==1.0.3
pytz==2016.4
six==1.10.0
twilio==5.4.0
django-oauth-toolkit>=0.10.0
django-otp>=0.3.5
httplib2>=0.9.2
oauthlib>=1.0.3
pytz>dev
six>=1.10.0
twilio>=5.4.0
1 change: 1 addition & 0 deletions requirements/django.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django
1 change: 1 addition & 0 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
sphinx_celery>=1.1
-r django.txt
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ def _pyimp():
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Programming Language :: Python :: Implementation :: Jython
Framework :: Django
Framework :: Django :: 1.9
Framework :: Django :: 1.10
Operating System :: OS Independent
"""
classifiers = [s.strip() for s in classes.split('\n') if s]
Expand Down Expand Up @@ -158,6 +161,7 @@ def finalize_options(self):
version=meta['VERSION'],
description=meta['doc'],
author=meta['author'],
author_email=meta['contact'],
url=meta['homepage'],
platforms=['any'],
license='BSD',
Expand Down

0 comments on commit 90dfa73

Please sign in to comment.