Some dependency cleanups.

This commit is contained in:
Sybren A. Stüvel 2016-09-29 10:01:15 +02:00
parent dcef372e4f
commit d7fe196af0
3 changed files with 29 additions and 2 deletions

View File

@ -21,3 +21,17 @@ it to [css2sass](http://css2sass.herokuapp.com/) to convert it to SASS, and
place it in [src/styles/_font-pillar.sass](src/styles/_font-pillar.sass). place it in [src/styles/_font-pillar.sass](src/styles/_font-pillar.sass).
Don't forget to Gulp! Don't forget to Gulp!
## Installation
Make sure your /data directory exists and is writable by the current user.
Alternatively, provide a `pillar/config_local.py` that changes the relevant
settings.
```
git clone git@git.blender.org:pillar-python-sdk.git ../pillar-python-sdk
pip install -e ../pillar-python-sdk
pip install -U -r requirements.txt
pip install -e .
```

View File

@ -1,4 +1,5 @@
# Primary requirements # Primary requirements
# pillarsdk
attrs==16.2.0 attrs==16.2.0
algoliasearch==1.8.0 algoliasearch==1.8.0
bcrypt==2.0.0 bcrypt==2.0.0
@ -8,8 +9,11 @@ Cerberus==0.9.2
Eve==0.6.3 Eve==0.6.3
Events==0.2.1 Events==0.2.1
Flask==0.10.1 Flask==0.10.1
Flask-Cache==0.13.1
Flask-Script==2.0.5 Flask-Script==2.0.5
flup==1.0.2 Flask-Login==0.3.2
Flask-OAuthlib==0.9.3
Flask-WTF==0.12
gcloud==0.12.0 gcloud==0.12.0
google-apitools==0.4.11 google-apitools==0.4.11
httplib2==0.9.2 httplib2==0.9.2
@ -21,7 +25,7 @@ pycparser==2.14
pycrypto==2.6.1 pycrypto==2.6.1
pyOpenSSL==0.15.1 pyOpenSSL==0.15.1
requests==2.9.1 requests==2.9.1
rsa==3.3 rsa==3.4.2
simplejson==3.8.2 simplejson==3.8.2
WebOb==1.5.0 WebOb==1.5.0
wheel==0.24.0 wheel==0.24.0
@ -34,6 +38,7 @@ pytest-cov==2.3.1
mock==2.0.0 mock==2.0.0
# Secondary requirements # Secondary requirements
flup==1.0.2
Flask-PyMongo==0.4.1 Flask-PyMongo==0.4.1
Jinja2==2.8 Jinja2==2.8
Werkzeug==0.11.10 Werkzeug==0.11.10
@ -55,6 +60,7 @@ py==1.4.31
pyasn1==0.1.9 pyasn1==0.1.9
pyasn1-modules==0.0.8 pyasn1-modules==0.0.8
pymongo==3.2.2 pymongo==3.2.2
requests_oauthlib==0.7.0
six==1.10.0 six==1.10.0
wsgiref==0.1.2 wsgiref==0.1.2
coverage==4.0.3 coverage==4.0.3

View File

@ -11,8 +11,14 @@ setuptools.setup(
install_requires=[ install_requires=[
'Flask>0.10,<0.11', # Flask 0.11 is incompatible with Eve 0.6.4 'Flask>0.10,<0.11', # Flask 0.11 is incompatible with Eve 0.6.4
'Eve>=0.6.3', 'Eve>=0.6.3',
'Flask-Cache>=0.13.1',
'Flask-Script>=2.0.5', 'Flask-Script>=2.0.5',
'Flask-Login>=0.3.2',
'Flask-OAuthlib>=0.9.3',
'Flask-WTF>=0.12',
'algoliasearch>=1.8.0,<1.9.0', # 1.9 Gives an issue importing some exception class. 'algoliasearch>=1.8.0,<1.9.0', # 1.9 Gives an issue importing some exception class.
'attrs>=16.2.0',
'bugsnag>=2.3.1,<3.0', # latest version on PyPi is beta of 3.0
'gcloud>=0.12.0', 'gcloud>=0.12.0',
'google-apitools>=0.4.11', 'google-apitools>=0.4.11',
'MarkupSafe>=0.23', 'MarkupSafe>=0.23',
@ -22,6 +28,7 @@ setuptools.setup(
'zencoder>=0.6.5', 'zencoder>=0.6.5',
'bcrypt>=2.0.0', 'bcrypt>=2.0.0',
'blinker>=1.4', 'blinker>=1.4',
'pillarsdk',
], ],
tests_require=[ tests_require=[
'pytest>=2.9.1', 'pytest>=2.9.1',