From e4e0d7effd3e7b7e2659337e303a022f71c01737 Mon Sep 17 00:00:00 2001 From: rht Date: Tue, 22 Aug 2017 00:16:18 +0200 Subject: [PATCH] requirements: Squash common.txt into py3_common.txt. --- requirements/README.md | 6 +- requirements/common.txt | 172 ----------------------------------- requirements/py3_common.txt | 173 +++++++++++++++++++++++++++++++++++- 3 files changed, 175 insertions(+), 176 deletions(-) delete mode 100644 requirements/common.txt diff --git a/requirements/README.md b/requirements/README.md index 198081b188..1bee7bcef5 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -8,9 +8,9 @@ py3_dev py3_prod | | | v | | |py3_socialauth | v | -| dev +--->common -| + + -| v +-->emailmirror +| dev | +| + | +| v +---------->emailmirror | docs,moto,py3k,twisted | v diff --git a/requirements/common.txt b/requirements/common.txt deleted file mode 100644 index abea90c5e8..0000000000 --- a/requirements/common.txt +++ /dev/null @@ -1,172 +0,0 @@ -# Django itself; we use a slightly patched version -Django==1.11.4 - -# Needed for rendering backend templates -Jinja2==2.9.6 - -# Needed for markdown processing -Markdown==2.6.9 -MarkupSafe==1.0 -Pygments==2.2.0 - -# Needed for manage.py -ipython==6.1.0 - -# Needed for Image Processing -Pillow==4.2.1 - -# Needed for building complex DB queries -SQLAlchemy==1.1.13 - -# Needed for password hashing -argon2-cffi==16.3.0 - -# Needed for Tornado >3.2 compatibility -backports-abc==0.5 - -# Needed for Tornado 4 compatibility -backports.ssl-match-hostname==3.5.0.1 - -# Needed for S3 file uploads -boto==2.48.0 - -certifi==2017.7.27.1 - -# Used for scrapy as well as argon2 -cffi==1.10.0 - -chardet==3.0.4 - -# Pinned version because older versions don't compile on newer Linux. -# Not actually a direct dependency. -cryptography==2.0.3 - -# Needed for integrations -defusedxml==0.5.0 - -# Needed to generate diffs for edits -diff-match-patch==20121119 - -# Needed for LDAP support -django-auth-ldap==1.2.12 - -# Django extension providing bitfield support -django-bitfield==1.9.3 - -# Django extension for sending data to statsd -django-statsd-mozilla==0.3.16 - -docopt==0.6.2 -fonttools==3.15.0 - -# Needed for Android push notifications -python-gcm==0.4 - -gitdb==0.6.4 - -# Needed for Google Apps mobile auth -google-api-python-client==1.6.2 - -# Needed for the email mirror -html2text==2016.9.19 -httplib2==0.10.3 - -# Needed for JWT-based auth -PyJWT==1.5.2 - -# Needed for including other markdown files for user docs -markdown-include==0.5.1 - -# Needed for mock objects in decorators -mock==2.0.0 - -oauth2client==4.1.2 -oauthlib==2.0.2 - -# Enhanced HTTPS support for httplib and urllib2 using PyOpenSSL -# Needed by requests to send https request to some sites. -ndg-httpsclient==0.4.2 - -# Needed to access rabbitmq -pika==0.10.0 - -# Needed to access our database -psycopg2==2.7.3 - -pyasn1==0.3.2 -pyasn1-modules==0.0.11 -pycrypto==2.6.1 - -# Needed for memcached usage -pylibmc==1.5.2 - -# Needed for timezone work -pytz==2017.2 - -# Needed for redis -redis==2.10.6 - -# Dependencies of our API -requests==2.18.4 -idna==2.6 -urllib3==1.22 - -requests_oauthlib==0.8.0 -rsa==3.4.2 - -# Dependencies of our API -simplejson==3.11.1 - -# Needed for Python 2+3 compatibility -six==1.10.0 -smmap==0.9.0 - -# Needed for Tornado websockets support -sockjs-tornado==1.0.3 - -# Needed to parse source maps for error reporting -sourcemap==0.2.1 - -# Tornado used for server->client push system -tornado==4.5.1 - -# Needed for Python static typing -typing==3.6.2 - -# Fast JSON parser -ujson==1.35 - -uritemplate==3.0.0 - -# Django extension for static asset pipeline -django-pipeline==1.6.13 - -# Django extension for serving webpack modules -django-webpack-loader==0.5.0 - -# Needed for iOS push notifications --e git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1 - -python-twitter==3.3 - -# Needed for the email mirror --r emailmirror.txt - -# To parse po files -polib==1.0.8 - -# Needed for cloning virtual environments --e git+https://github.com/umairwaheed/virtualenv-clone.git@short-version#egg=virtualenv-clone==0.2.6 - -# Needed for reading json as stream -ijson==2.3 - -# Needed for link preview -beautifulsoup4==4.6.0 --e git+https://github.com/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed - -# The Zulip API bindings, from its own repository. -# We integrate with these tightly, so often it makes sense to pin a -# version from Git rather than a release. --e "git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip==0.3.2&subdirectory=zulip" --e "git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip_bots==0.3.2&subdirectory=zulip_bots" diff --git a/requirements/py3_common.txt b/requirements/py3_common.txt index 3651c4c87a..2f397c951b 100644 --- a/requirements/py3_common.txt +++ b/requirements/py3_common.txt @@ -1,4 +1,175 @@ --r common.txt +# Django itself; we use a slightly patched version +Django==1.11.4 + +# Needed for rendering backend templates +Jinja2==2.9.6 + +# Needed for markdown processing +Markdown==2.6.9 +MarkupSafe==1.0 +Pygments==2.2.0 + +# Needed for manage.py +ipython==6.1.0 + +# Needed for Image Processing +Pillow==4.2.1 + +# Needed for building complex DB queries +SQLAlchemy==1.1.13 + +# Needed for password hashing +argon2-cffi==16.3.0 + +# Needed for Tornado >3.2 compatibility +backports-abc==0.5 + +# Needed for Tornado 4 compatibility +backports.ssl-match-hostname==3.5.0.1 + +# Needed for S3 file uploads +boto==2.48.0 + +certifi==2017.7.27.1 + +# Used for scrapy as well as argon2 +cffi==1.10.0 + +chardet==3.0.4 + +# Pinned version because older versions don't compile on newer Linux. +# Not actually a direct dependency. +cryptography==2.0.3 + +# Needed for integrations +defusedxml==0.5.0 + +# Needed to generate diffs for edits +diff-match-patch==20121119 + +# Needed for LDAP support +django-auth-ldap==1.2.12 + +# Django extension providing bitfield support +django-bitfield==1.9.3 + +# Django extension for sending data to statsd +django-statsd-mozilla==0.3.16 + +docopt==0.6.2 +fonttools==3.15.0 + +# Needed for Android push notifications +python-gcm==0.4 + +gitdb==0.6.4 + +# Needed for Google Apps mobile auth +google-api-python-client==1.6.2 + +# Needed for the email mirror +html2text==2016.9.19 +httplib2==0.10.3 + +# Needed for JWT-based auth +PyJWT==1.5.2 + +# Needed for including other markdown files for user docs +markdown-include==0.5.1 + +# Needed for mock objects in decorators +mock==2.0.0 + +oauth2client==4.1.2 +oauthlib==2.0.2 + +# Enhanced HTTPS support for httplib and urllib2 using PyOpenSSL +# Needed by requests to send https request to some sites. +ndg-httpsclient==0.4.2 + +# Needed to access rabbitmq +pika==0.10.0 + +# Needed to access our database +psycopg2==2.7.3 + +pyasn1==0.3.2 +pyasn1-modules==0.0.11 +pycrypto==2.6.1 + +# Needed for memcached usage +pylibmc==1.5.2 + +# Needed for timezone work +pytz==2017.2 + +# Needed for redis +redis==2.10.6 + +# Dependencies of our API +requests==2.18.4 +idna==2.6 +urllib3==1.22 + +requests_oauthlib==0.8.0 +rsa==3.4.2 + +# Dependencies of our API +simplejson==3.11.1 + +# Needed for Python 2+3 compatibility +six==1.10.0 +smmap==0.9.0 + +# Needed for Tornado websockets support +sockjs-tornado==1.0.3 + +# Needed to parse source maps for error reporting +sourcemap==0.2.1 + +# Tornado used for server->client push system +tornado==4.5.1 + +# Needed for Python static typing +typing==3.6.2 + +# Fast JSON parser +ujson==1.35 + +uritemplate==3.0.0 + +# Django extension for static asset pipeline +django-pipeline==1.6.13 + +# Django extension for serving webpack modules +django-webpack-loader==0.5.0 + +# Needed for iOS push notifications +-e git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1 + +python-twitter==3.3 + +# Needed for the email mirror +-r emailmirror.txt + +# To parse po files +polib==1.0.8 + +# Needed for cloning virtual environments +-e git+https://github.com/umairwaheed/virtualenv-clone.git@short-version#egg=virtualenv-clone==0.2.6 + +# Needed for reading json as stream +ijson==2.3 + +# Needed for link preview +beautifulsoup4==4.6.0 +-e git+https://github.com/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed + +# The Zulip API bindings, from its own repository. +# We integrate with these tightly, so often it makes sense to pin a +# version from Git rather than a release. +-e "git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip==0.3.2&subdirectory=zulip" +-e "git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip_bots==0.3.2&subdirectory=zulip_bots" # Used for Hesiod lookups, etc. py3dns==3.1.0