paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

requirements: Update to new pyoembed release.

Browse Source 
This should mean we no longer need to maintain a fork.
This commit is contained in:
Tim Abbott
2017-11-17 08:30:09 -08:00
committed by Steve Howell
parent 4fb7292dd4
commit 1b28ddd8a7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/common.txt
View File

@@ -165,7 +165,7 @@ ijson==2.3
# Needed for link preview
beautifulsoup4==4.6.0
-e git+https://github.com/zulip/pyoembed.git@8a4855b5bbf83e18283d6e6e5d8fe401ede14923#egg=pyoembed==0.1.1.zulip2
pyoembed==0.1.2
# The Zulip API bindings, from its own repository.
# We integrate with these tightly, so often it makes sense to pin a

4
requirements/dev_lock.txt
View File

@@ -7,7 +7,6 @@
#
# For details, see requirements/README.md .
#
git+https://github.com/zulip/pyoembed.git@8a4855b5bbf83e18283d6e6e5d8fe401ede14923#egg=pyoembed==0.1.1.zulip2
git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1
git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
git+https://github.com/zulip/virtualenv-clone.git@44e831da39ffb6b9bb5c7d103d98babccdca0456#egg=virtualenv-clone==0.2.6.zulip1
@@ -113,6 +112,7 @@ pygments==2.2.0
pyjwt==1.5.3
pyldap==2.4.37
pylibmc==1.5.2
pyoembed==0.1.2
pyopenssl==17.0.0 # via ndg-httpsclient, scrapy, service-identity
python-dateutil==2.6.1
python-digitalocean==1.12
@@ -126,7 +126,7 @@ recommonmark==0.4.0
redis==2.10.6
regex==2017.7.28
requests-oauthlib==0.8.0
requests==2.18.4 # via aws-xray-sdk, docker, moto, premailer, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, social-auth-core, sphinx
requests==2.18.4 # via aws-xray-sdk, docker, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, social-auth-core, sphinx
rsa==3.4.2
s3transfer==0.1.11 # via boto3
scrapy==1.4.0

4
requirements/prod_lock.txt
View File

@@ -7,7 +7,6 @@
#
# For details, see requirements/README.md .
#
git+https://github.com/zulip/pyoembed.git@8a4855b5bbf83e18283d6e6e5d8fe401ede14923#egg=pyoembed==0.1.1.zulip2
git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1
git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
git+https://github.com/zulip/virtualenv-clone.git@44e831da39ffb6b9bb5c7d103d98babccdca0456#egg=virtualenv-clone==0.2.6.zulip1
@@ -79,6 +78,7 @@ pygments==2.2.0
pyjwt==1.5.3
pyldap==2.4.37
pylibmc==1.5.2
pyoembed==0.1.2
pyopenssl==17.2.0 # via ndg-httpsclient
python-dateutil==2.6.1
python-gcm==0.4
@@ -88,7 +88,7 @@ pytz==2017.2
redis==2.10.6
regex==2017.7.28
requests-oauthlib==0.8.0
requests==2.18.4 # via premailer, python-gcm, python-twitter, requests-oauthlib, social-auth-core
requests==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core
rsa==3.4.2
simplegeneric==0.8.1 # via ipython
simplejson==3.11.1

2
version.py
View File

@@ -1,2 +1,2 @@
ZULIP_VERSION = "1.7.0+git"
PROVISION_VERSION = '11.4'
PROVISION_VERSION = '11.5'