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

zulip_bots: Upgrade to latest commit.

Browse Source 
This upgrade fixes a dependency conflict between one of the bots
in zulip_bots and the main repo.
This commit is contained in:
Eeshan Garg
2018-06-04 20:23:10 -02:30
committed by Tim Abbott
parent ca18c635e7
commit 2d6d8fe5d8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/common.in
View File

@@ -170,7 +170,7 @@ pyoembed==0.1.2
# release tarballs (which is a bug). So we need to pin it makes sense # release tarballs (which is a bug). So we need to pin it makes sense
# to pin a version from Git rather than a release. # to pin a version from Git rather than a release.
-e "git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip==0.4.7_git&subdirectory=zulip" -e "git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip==0.4.7_git&subdirectory=zulip"
-e "git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip_bots==0.4.7+git&subdirectory=zulip_bots" -e "git+https://github.com/zulip/python-zulip-api.git@e7e9059cb812914d2760bdb6c5032d17d95ee8df#egg=zulip_bots==0.4.7+git&subdirectory=zulip_bots"
# Used for Hesiod lookups, etc. # Used for Hesiod lookups, etc.
py3dns==3.1.0 py3dns==3.1.0
@@ -195,4 +195,4 @@ django-sendfile==0.3.11
disposable-email-domains==0.0.28 disposable-email-domains==0.0.28
# Needed for parsing YAML with JSON references from the REST API spec files # Needed for parsing YAML with JSON references from the REST API spec files
yamole==2.1.2 yamole==2.1.2

6
requirements/dev.txt
View File

@@ -13,7 +13,7 @@ git+https://github.com/python/mypy.git@6a934d32124991a77ea433856cf2d62871ceb632#
git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1 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/ultrajson@70ac02bec#egg=ujson==1.35+git
git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip==0.4.7_git&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip==0.4.7_git&subdirectory=zulip
git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip_bots==0.4.7+git&subdirectory=zulip_bots git+https://github.com/zulip/python-zulip-api.git@e7e9059cb812914d2760bdb6c5032d17d95ee8df#egg=zulip_bots==0.4.7+git&subdirectory=zulip_bots
alabaster==0.7.10 alabaster==0.7.10
apns2==0.4.1 apns2==0.4.1
argon2-cffi==18.1.0 argon2-cffi==18.1.0
@@ -124,7 +124,7 @@ pyjwt==1.6.4
pyldap==3.0.0.post1 # via fakeldap pyldap==3.0.0.post1 # via fakeldap
pylibmc==1.5.2 pylibmc==1.5.2
pyoembed==0.1.2 pyoembed==0.1.2
pyopenssl==17.3.0 # via ndg-httpsclient, scrapy, service-identity pyopenssl==17.3.0 # via ndg-httpsclient, requests, scrapy, service-identity
pyparsing==2.2.0 # via packaging pyparsing==2.2.0 # via packaging
pysocks==1.6.7 # via twilio pysocks==1.6.7 # via twilio
python-dateutil==2.6.1 python-dateutil==2.6.1
@@ -141,7 +141,7 @@ recommonmark==0.4.0
redis==2.10.6 redis==2.10.6
regex==2017.11.9 regex==2017.11.9
requests-oauthlib==0.8.0 requests-oauthlib==0.8.0
requests==2.18.4 # via aws-xray-sdk, docker, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, responses, social-auth-core, sphinx, stripe, twilio requests[security]==2.18.4 # via aws-xray-sdk, docker, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, responses, social-auth-core, sphinx, stripe, twilio
responses==0.9.0 # via moto responses==0.9.0 # via moto
rsa==3.4.2 rsa==3.4.2
s3transfer==0.1.11 # via boto3 s3transfer==0.1.11 # via boto3

6
requirements/prod.txt
View File

@@ -12,7 +12,7 @@
git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1 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/ultrajson@70ac02bec#egg=ujson==1.35+git
git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip==0.4.7_git&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip==0.4.7_git&subdirectory=zulip
git+https://github.com/zulip/python-zulip-api.git@0.4.7#egg=zulip_bots==0.4.7+git&subdirectory=zulip_bots git+https://github.com/zulip/python-zulip-api.git@e7e9059cb812914d2760bdb6c5032d17d95ee8df#egg=zulip_bots==0.4.7+git&subdirectory=zulip_bots
apns2==0.4.1 apns2==0.4.1
argon2-cffi==18.1.0 argon2-cffi==18.1.0
asn1crypto==0.23.0 # via cryptography asn1crypto==0.23.0 # via cryptography
@@ -88,7 +88,7 @@ pygments==2.2.0
pyjwt==1.6.4 pyjwt==1.6.4
pylibmc==1.5.2 pylibmc==1.5.2
pyoembed==0.1.2 pyoembed==0.1.2
pyopenssl==17.3.0 # via ndg-httpsclient pyopenssl==17.3.0 # via ndg-httpsclient, requests
pysocks==1.6.7 # via twilio pysocks==1.6.7 # via twilio
python-dateutil==2.6.1 python-dateutil==2.6.1
python-gcm==0.4 python-gcm==0.4
@@ -101,7 +101,7 @@ qrcode==4.0.4 # via django-two-factor-auth
redis==2.10.6 redis==2.10.6
regex==2017.11.9 regex==2017.11.9
requests-oauthlib==0.8.0 requests-oauthlib==0.8.0
requests==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio requests[security]==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio
rsa==3.4.2 rsa==3.4.2
simplegeneric==0.8.1 # via ipython simplegeneric==0.8.1 # via ipython
six==1.11.0 six==1.11.0

2
version.py
View File

@@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.1+git"
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '20.6' PROVISION_VERSION = '20.7'