Skip to content

Commit

Permalink
Merge 5fb0fdb into e7c3d6c
Browse files Browse the repository at this point in the history
  • Loading branch information
Brutus5000 committed May 14, 2018
2 parents e7c3d6c + 5fb0fdb commit 92ec833
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
-f https://content.faforever.com/wheel/
pillow
docopt
lupa
pillow==4.2.1
docopt==0.6.2
lupa==1.4
marshmallow==2.13.1
marshmallow-jsonapi
pathlib
requests
pytest-cov
pytest-mock
werkzeug
marshmallow-jsonapi==0.15.1
pathlib==1.0.1
requests==2.18.4
pytest-cov==2.5.1
pytest-mock==1.6.2
werkzeug==0.12.2
-e .
13 changes: 9 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from distutils.core import setup
from setuptools import find_packages

from pip.req import parse_requirements

setup(
name='faftools',
version='0.1',
Expand All @@ -13,7 +11,14 @@
author_email='sheeo@faforever.com',
description='faftools project',
requires=['lupa'],
install_requires=[str(r.req) for r in parse_requirements('requirements.txt', session=False)
if r.req is not None],
install_requires=['docopt==0.6.2',
'lupa==1.4',
'marshmallow==2.13.1',
'marshmallow-jsonapi==0.15.1',
'pathlib==1.0.1',
'requests==2.18.4',
'pytest-cov==2.5.1',
'pytest-mock==1.6.2',
'werkzeug==0.12.2'],
include_package_data=True
)

0 comments on commit 92ec833

Please sign in to comment.