diff --git a/requirements/README.md b/requirements/README.md index ddd4c2d60c..336255109c 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -11,7 +11,7 @@ py3_dev py3_prod | | | | | | | v +---------->emailmirror -| docs,moto,py3k,twisted +| docs,py3k | v mypy diff --git a/requirements/dev.txt b/requirements/dev.txt index c45bc1597d..a91e79875e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,10 +1,16 @@ -r py3_common.txt -r docs.txt --r moto.txt + +# moto s3 mock +moto==1.0.1 + -r py3k.txt # Needed for running tools/run-dev.py --r twisted.txt +Twisted==17.5.0 + +# Needed for documentation links test +Scrapy==1.4.0 # Needed to compute test coverage coverage==4.4.1 diff --git a/requirements/dev_lock.txt b/requirements/dev_lock.txt index a4dacd8d79..5cf7c4abd3 100644 --- a/requirements/dev_lock.txt +++ b/requirements/dev_lock.txt @@ -14,8 +14,8 @@ git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip_bots==0.3.2&su alabaster==0.7.10 argon2-cffi==16.3.0 arrow==0.10.0 # via gitlint -asn1crypto==0.22.0 -attrs==17.2.0 +asn1crypto==0.22.0 # via cryptography +attrs==17.2.0 # via automat, service-identity automat==0.6.0 # via twisted babel==2.5.0 backports-abc==0.5 @@ -23,15 +23,15 @@ backports.ssl-match-hostname==3.5.0.1 beautifulsoup4==4.6.0 boto3==1.4.6 # via moto boto==2.48.0 -botocore==1.6.3 +botocore==1.6.3 # via boto3, s3transfer cchardet==2.1.1 certifi==2017.7.27.1 cffi==1.10.0 chardet==3.0.4 -click==6.6 # via flask, gitlint, pip-tools, pydictionary -commonmark==0.5.4 # via recommonmark -constantly==15.1.0 -cookies==2.2.1 +click==6.6 # via gitlint, pip-tools, pydictionary +commonmark==0.5.4 +constantly==15.1.0 # via twisted +cookies==2.2.1 # via moto coverage==4.4.1 cryptography==2.0.3 cssselect==1.0.1 @@ -44,11 +44,10 @@ django-bitfield==1.9.3 django-pipeline==1.6.13 django-statsd-mozilla==0.3.16 django-webpack-loader==0.5.0 -django==1.11.4 # via django-auth-ldap, django-bitfield +django==1.11.4 docopt==0.6.2 docutils==0.14 first==2.0.1 -flask==0.12.2 fonttools==3.15.0 future==0.16.0 gitdb==0.6.4 @@ -57,22 +56,20 @@ google-api-python-client==1.6.2 goslate==1.5.1 # via pydictionary html2text==2016.9.19 httplib2==0.10.3 -httpretty==0.8.14 hyperlink==17.3.1 # via twisted idna==2.6 ijson==2.3 imagesize==0.7.1 -incremental==17.5.0 +incremental==17.5.0 # via twisted ipython-genutils==0.2.0 # via traitlets ipython==6.1.0 -itsdangerous==0.24 jedi==0.10.2 # via ipython -jinja2==2.9.6 # via flask, moto, sphinx +jinja2==2.9.6 jmespath==0.9.3 # via boto3, botocore lxml==3.8.0 markdown-include==0.5.1 markdown==2.6.9 # via markdown-include -markupsafe==1.0 # via jinja2 +markupsafe==1.0 mock==2.0.0 modernize==0.5 moto==1.0.1 @@ -81,7 +78,7 @@ oauth2client==4.1.2 oauthlib==2.0.2 olefile==0.44 # via pillow ordereddict==1.1 # via gitlint -parsel==1.2.0 +parsel==1.2.0 # via scrapy pathlib2==2.3.0 pbr==3.1.1 # via mock pexpect==4.2.1 # via ipython @@ -103,18 +100,18 @@ pycrypto==2.6.1 pydictionary==1.5.2 pydispatcher==2.0.5 # via scrapy pyflakes==1.6.0 -pygments==2.2.0 # via ipython, sphinx -pyjwt==1.5.2 # via social-auth-core +pygments==2.2.0 +pyjwt==1.5.2 pyldap==2.4.37 pylibmc==1.5.2 pyopenssl==17.0.0 # via ndg-httpsclient, scrapy, service-identity -python-dateutil==2.6.1 +python-dateutil==2.6.1 # via arrow, botocore, moto python-gcm==0.4 python-twitter==3.3 python3-openid==3.1.0 pytz==2017.2 pyyaml==3.12 # via pyaml -queuelib==1.4.2 +queuelib==1.4.2 # via scrapy recommonmark==0.4.0 redis==2.10.6 regex==2017.7.28 @@ -124,7 +121,7 @@ rsa==3.4.2 s3transfer==0.1.10 # via boto3 scandir==1.5 scrapy==1.4.0 -service-identity==17.0.0 +service-identity==17.0.0 # via scrapy sh==1.11 # via gitlint simplegeneric==0.8.1 # via ipython simplejson==3.11.1 @@ -144,13 +141,13 @@ tblib==1.3.2 tornado==4.5.1 traitlets==4.3.2 # via ipython transifex-client==0.12.4 -twisted==17.5.0 # via scrapy +twisted==17.5.0 typing==3.6.2 ujson==1.35 uritemplate==3.0.0 urllib3==1.22 -w3lib==1.18.0 +w3lib==1.18.0 # via parsel, scrapy wcwidth==0.1.7 # via prompt-toolkit -werkzeug==0.12.2 # via flask, moto -xmltodict==0.11.0 -zope.interface==4.4.2 +werkzeug==0.12.2 # via moto +xmltodict==0.11.0 # via moto +zope.interface==4.4.2 # via twisted diff --git a/requirements/ipython.txt b/requirements/ipython.txt deleted file mode 100644 index 61b34c01ca..0000000000 --- a/requirements/ipython.txt +++ /dev/null @@ -1,16 +0,0 @@ -ipython==6.1.0 - -# Dependencies of ipython -decorator==4.0.11 -ipython-genutils==0.2.0 -pathlib2==2.3.0 -pexpect==4.2.1 -pickleshare==0.7.4 -prompt_toolkit==1.0.14 -ptyprocess==0.5.1 -simplegeneric==0.8.1 -traitlets==4.3.2 -wcwidth==0.1.7 - -#Needed for pathlib2==2.3.0 -scandir==1.5 diff --git a/requirements/moto.txt b/requirements/moto.txt deleted file mode 100644 index bd4b517aa5..0000000000 --- a/requirements/moto.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Dependencies of moto s3 mock -Flask==0.12.2 -Werkzeug==0.12.2 -httpretty==0.8.14 -itsdangerous==0.24 -moto==1.0.1 -xmltodict==0.11.0 -python-dateutil==2.6.1 -cookies==2.2.1 -PyYAML==3.12 -botocore==1.6.3 diff --git a/requirements/scrapy.txt b/requirements/scrapy.txt deleted file mode 100644 index 1d3277093b..0000000000 --- a/requirements/scrapy.txt +++ /dev/null @@ -1,9 +0,0 @@ -Scrapy==1.4.0 -asn1crypto==0.22.0 - -parsel==1.2.0 -pyOpenSSL==17.0.0 -w3lib==1.18.0 -PyDispatcher==2.0.5 -queuelib==1.4.2 -service_identity==17.0.0 diff --git a/requirements/twisted.txt b/requirements/twisted.txt deleted file mode 100644 index cee6b68c72..0000000000 --- a/requirements/twisted.txt +++ /dev/null @@ -1,9 +0,0 @@ -Twisted==17.5.0 -zope.interface==4.4.2 -service-identity==17.0.0 -attrs==17.2.0 -constantly==15.1.0 -incremental==17.5.0 - -# Needed for documentation links test --r scrapy.txt