requirements: Remove unnecessary version bounds from *.in.

This makes no changes to the locked versions in *.txt, but it reduces
duplicate information and gives us sane workflows for

* upgrading packages: remove some or all lines from *.txt and re-run
  `update-locked-requirements`;
* marking packages as intentionally held back: add a version bound
  to *.in with an explanatory comment.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-09-22 16:34:04 -07:00 committed by Tim Abbott
parent 75e585b208
commit ec9bf6576a
11 changed files with 87 additions and 119 deletions

View File

@ -3,127 +3,126 @@
# and requirements/prod.txt. # and requirements/prod.txt.
# See requirements/README.md for more detail. # See requirements/README.md for more detail.
# Django itself # Django itself
Django==1.11.23 Django==1.11.* # https://github.com/zulip/zulip/issues/10835
# needed for Deque (in Python < 3.5.4) and TypedDict # needed for Deque (in Python < 3.5.4) and TypedDict
typing_extensions==3.7.4 typing-extensions
# Needed for rendering backend templates # Needed for rendering backend templates
Jinja2==2.10.1 Jinja2
# Needed for markdown processing # Needed for markdown processing
Markdown==3.1.1 Markdown
Pygments==2.4.2 Pygments
hyperlink==19.0.0 hyperlink
# Needed for manage.py # Needed for manage.py
ipython==6.5.0 ipython
# Needed for Image Processing # Needed for Image Processing
Pillow==6.1.0 Pillow
# Needed for building complex DB queries # Needed for building complex DB queries
SQLAlchemy==1.3.6 SQLAlchemy
# Needed for password hashing # Needed for password hashing
argon2-cffi==19.1.0 argon2-cffi
# Needed for S3 file uploads # Needed for S3 file uploads
boto==2.49.0 boto
# Needed for integrations # Needed for integrations
defusedxml==0.6.0 defusedxml
# Needed for LDAP support # Needed for LDAP support
django-auth-ldap==2.0.0 django-auth-ldap
# Django extension providing bitfield support # Django extension providing bitfield support
django-bitfield==1.9.6 django-bitfield
# Django extension for sending data to statsd # Django extension for sending data to statsd
django-statsd-mozilla==0.4.0 django-statsd-mozilla
# Needed for Android push notifications # Needed for Android push notifications
python-gcm==0.4 python-gcm
# Needed for the email mirror # Needed for the email mirror
html2text==2018.1.9 html2text
httplib2==0.13.0 httplib2
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
# Needed for hipchat import # Needed for hipchat import
hypchat==0.21 hypchat
# Needed for inlining the CSS in emails # Needed for inlining the CSS in emails
premailer==3.5.0 premailer
# Needed for JWT-based auth # Needed for JWT-based auth
PyJWT==1.7.1 PyJWT
# Needed for including other markdown files for user docs # Needed for including other markdown files for user docs
markdown-include==0.5.1 markdown-include
# Needed for mock objects in decorators # Needed for mock objects in decorators
mock==3.0.5 mock
# Needed to access rabbitmq # Needed to access rabbitmq
# See #8466 for why we're not using the latest version. pika==0.13.* # https://github.com/pika/pika/blob/1.0.0/CHANGELOG.rst#100-2019-03-26
pika==0.13.0
# Needed to access our database # Needed to access our database
psycopg2==2.8.3 --no-binary psycopg2 psycopg2 --no-binary psycopg2
# Needed for memcached usage # Needed for memcached usage
pylibmc==1.6.0 pylibmc
# Needed for compression support in memcached via pylibmc # Needed for compression support in memcached via pylibmc
django-pylibmc==0.6.1 django-pylibmc
# Needed for zerver/tests/test_timestamp.py # Needed for zerver/tests/test_timestamp.py
python-dateutil==2.8.0 python-dateutil
# Needed for timezone work # Needed for timezone work
pytz==2019.1 pytz
# Needed for redis # Needed for redis
redis==3.2.1 redis
# Needed for Python 2+3 compatibility # Needed for Python 2+3 compatibility
six==1.12.0 six
# Needed for Tornado websockets support # Needed for Tornado websockets support
sockjs-tornado==1.0.6 sockjs-tornado
# Needed to parse source maps for error reporting # Needed to parse source maps for error reporting
sourcemap==0.2.1 sourcemap
# Tornado used for server->client push system # Tornado used for server->client push system
tornado==4.5.3 tornado==4.* # https://github.com/zulip/zulip/issues/8913
# Fast JSON parser # Fast JSON parser
git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
# Django extension for serving webpack modules # Django extension for serving webpack modules
django-webpack-loader==0.6.0 django-webpack-loader
# Needed for iOS push notifications # Needed for iOS push notifications
apns2==0.5.0 apns2==0.5.* # https://github.com/Pr0Ger/PyAPNs2/issues/88
python-twitter==3.5 python-twitter
# To parse po files # To parse po files
polib==1.1.0 polib
# Needed for cloning virtual environments # Needed for cloning virtual environments
virtualenv-clone==0.5.3 virtualenv-clone
# Needed for reading json as stream # Needed for reading json as stream
ijson==2.4 ijson
# Needed for link preview # Needed for link preview
beautifulsoup4==4.8.0 beautifulsoup4
pyoembed==0.1.2 pyoembed
python-magic==0.4.15 python-magic
# The Zulip API bindings, from its own repository. We integrate with # The Zulip API bindings, from its own repository. We integrate with
# these tightly, including fetching content not included in the normal # these tightly, including fetching content not included in the normal
@ -133,44 +132,44 @@ git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca
git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca60acf650da#egg=zulip_bots==0.6.1+git&subdirectory=zulip_bots git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca60acf650da#egg=zulip_bots==0.6.1+git&subdirectory=zulip_bots
# Used for Hesiod lookups, etc. # Used for Hesiod lookups, etc.
py3dns==3.2.0 py3dns
# Install Python Social Auth # Install Python Social Auth
social-auth-app-django==3.1.0 social-auth-app-django
# Needed for messages' rendered content parsing in push notifications. # Needed for messages' rendered content parsing in push notifications.
lxml==4.3.4 lxml
# Needed for 2-factor authentication # Needed for 2-factor authentication
django-two-factor-auth==1.9.1 django-two-factor-auth
# Required by django-phonenumber-field which is a dependency of django-two-factor-auth. # Required by django-phonenumber-field which is a dependency of django-two-factor-auth.
# Developers can install either phonenumberslite or phonenumbers. Developers of # Developers can install either phonenumberslite or phonenumbers. Developers of
# django-two-factor-auth has not specified which package to install so we are going # django-two-factor-auth has not specified which package to install so we are going
# with phonenumberslite since it has less memory footprint. # with phonenumberslite since it has less memory footprint.
phonenumberslite==8.10.15 phonenumberslite
twilio==6.29.2 twilio
# Needed for processing payments (in corporate) # Needed for processing payments (in corporate)
stripe==2.35.0 stripe
# Needed for serving uploaded files from nginx but perform auth checks in django. # Needed for serving uploaded files from nginx but perform auth checks in django.
django-sendfile2==0.4.2 django-sendfile2
# For checking whether email of the user is from a disposable email provider. # For checking whether email of the user is from a disposable email provider.
disposable-email-domains==0.0.52 disposable-email-domains
# 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.6 yamole
# Needed for signing thumbnail requests so that they can be authenticated on the # Needed for signing thumbnail requests so that they can be authenticated on the
# other end. Using a fork to eliminate a really slow pkgresources import. # other end. Using a fork to eliminate a really slow pkgresources import.
git+https://github.com/zulip/libthumbor.git@60ed2431c07686a12f2770b2d852c5650f3ccfc6#egg=libthumbor==1.3.2zulip git+https://github.com/zulip/libthumbor.git@60ed2431c07686a12f2770b2d852c5650f3ccfc6#egg=libthumbor==1.3.2zulip
# Needed for string matching in AlertWordProcessor # Needed for string matching in AlertWordProcessor
pyahocorasick==1.4.0 pyahocorasick
# Needed for function decorators that don't break introspection. # Needed for function decorators that don't break introspection.
# Used for rate limiting authentication. # Used for rate limiting authentication.
decorator==4.4.0 decorator

View File

@ -5,56 +5,56 @@
-r docs.in -r docs.in
# moto s3 mock # moto s3 mock
moto==1.3.13 moto
# Needed for running tools/run-dev.py # Needed for running tools/run-dev.py
Twisted==19.7.0 Twisted
# Needed for documentation links test # Needed for documentation links test
Scrapy==1.7.2 Scrapy
# Needed to compute test coverage # Needed to compute test coverage
coverage==4.5.3 coverage
# fake for LDAP testing # fake for LDAP testing
fakeldap==0.6.1 fakeldap
# For testing mock http requests # For testing mock http requests
httpretty==0.9.6 httpretty
# For sorting imports # For sorting imports
isort==4.3.21 isort
# For doing highly usable Python profiling (temporary fork of # For doing highly usable Python profiling (temporary fork of
# line_profiler: https://github.com/rkern/line_profiler/issues/127) # line_profiler: https://github.com/rkern/line_profiler/issues/127)
lp37==2.1.1 lp37
# for pep8 linter # for pep8 linter
pycodestyle==2.5.0 pycodestyle
# Needed to run pyflakes linter # Needed to run pyflakes linter
pyflakes==2.1.1 pyflakes
# Needed for watching file changes # Needed for watching file changes
pyinotify==0.9.6 pyinotify
# Needed to run tests in parallel # Needed to run tests in parallel
tblib==1.4.0 tblib
# Needed to lint Git commit messages # Needed to lint Git commit messages
gitlint==0.12.0 gitlint
# Needed for visualising cprofile reports # Needed for visualising cprofile reports
snakeviz==2.0.1 snakeviz
# Needed to sync translations from transifex # Needed to sync translations from transifex
transifex-client==0.12.5 transifex-client
# Needed for creating digital ocean droplets # Needed for creating digital ocean droplets
python-digitalocean==1.14.0 python-digitalocean
# Needed for updating the locked pip dependencies # Needed for updating the locked pip dependencies
pip-tools==4.1.0 pip-tools
# zulip's linting framework - zulint # zulip's linting framework - zulint
git+https://github.com/zulip/zulint@aaed679f1ad38b230090eadd3870b7682500f60c#egg=zulint==0.0.1 git+https://github.com/zulip/zulint@aaed679f1ad38b230090eadd3870b7682500f60c#egg=zulint==0.0.1

View File

@ -31,7 +31,7 @@ cffi==1.12.3 # via argon2-cffi, cryptography
cfn-lint==0.22.3 # via moto cfn-lint==0.22.3 # via moto
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
click==7.0 # via gitlint, pip-tools click==7.0 # via gitlint, pip-tools
commonmark==0.9.0 commonmark==0.9.0 # via recommonmark
constantly==15.1.0 # via twisted constantly==15.1.0 # via twisted
coverage==4.5.3 coverage==4.5.3
cryptography==2.6.1 # via apns2, moto, pyopenssl, requests, service-identity, sshpubkeys cryptography==2.6.1 # via apns2, moto, pyopenssl, requests, service-identity, sshpubkeys

View File

@ -8,13 +8,8 @@
# See requirements/README.md for more detail. # See requirements/README.md for more detail.
# Needed to build RTD docs # Needed to build RTD docs
sphinx==1.8.4 sphinx
sphinx-rtd-theme==0.4.3 sphinx-rtd-theme
# Needed to build markdown docs # Needed to build markdown docs
recommonmark==0.5.0 recommonmark==0.5.* # https://github.com/zulip/zulip/issues/11395
# Upgrading to the latest version of CommonMark breaks the
# compatibility with recommonmark. See
# https://github.com/rtfd/recommonmark/issues/24
CommonMark==0.9.0

View File

@ -11,7 +11,7 @@ alabaster==0.7.12 # via sphinx
babel==2.5.3 # via sphinx babel==2.5.3 # via sphinx
certifi==2019.6.16 # via requests certifi==2019.6.16 # via requests
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
commonmark==0.9.0 commonmark==0.9.0 # via recommonmark
docutils==0.14 # via recommonmark, sphinx docutils==0.14 # via recommonmark, sphinx
# future==0.17.1 # via commonmark # future==0.17.1 # via commonmark
idna==2.8 # via requests idna==2.8 # via requests

View File

@ -2,4 +2,4 @@
# /tools/update-locked-requirements to update requirements/dev.txt # /tools/update-locked-requirements to update requirements/dev.txt
# and requirements/mypy.txt. # and requirements/mypy.txt.
# See requirements/README.md for more detail. # See requirements/README.md for more detail.
mypy==0.720 mypy

View File

@ -3,4 +3,4 @@
# See requirements/README.md for more detail. # See requirements/README.md for more detail.
-r common.in -r common.in
# Used for running the Zulip production Django server # Used for running the Zulip production Django server
uWSGI==2.0.17.1 uWSGI

View File

@ -110,7 +110,7 @@ git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#
tornado==4.5.3 tornado==4.5.3
traitlets==4.3.2 # via ipython traitlets==4.3.2 # via ipython
twilio==6.29.2 twilio==6.29.2
typing_extensions==3.7.4 typing-extensions==3.7.4
git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
urllib3==1.25.3 # via requests urllib3==1.25.3 # via requests
uwsgi==2.0.17.1 uwsgi==2.0.17.1

View File

@ -1,2 +1,2 @@
-r thumbor.in -r thumbor.in
pip-tools==4.1.0 pip-tools

View File

@ -1,10 +1,10 @@
tc-aws==6.2.10 tc-aws
thumbor==6.5.1 thumbor
# Required for just importing settings from our main django app. # Required for just importing settings from our main django app.
django-auth-ldap==1.7.0 django-auth-ldap
Django==1.11.23 Django==1.11.*
typing==3.6.6 typing
# Needed for cloning virtual environments # Needed for cloning virtual environments
virtualenv-clone==0.5.1 virtualenv-clone

View File

@ -1,26 +0,0 @@
{
"CommonMark": {
"issue": "https://github.com/zulip/zulip/issues/10800"
},
"tornado": {
"issue": "https://github.com/zulip/zulip/issues/8913"
},
"Django": {
"issue": "https://github.com/zulip/zulip/pull/8231"
},
"ipython": {
"issue": "https://github.com/zulip/zulip/issues/10801"
},
"transifex-client": {
"issue": "https://github.com/zulip/zulip/issues/8914"
},
"defusedxml": {
"issue": "https://github.com/zulip/zulip/issues/12191"
},
"Markdown": {
"issue": "https://github.com/zulip/zulip/issues/12192"
},
"Pillow": {
"issue": "https://github.com/zulip/zulip/issues/12193"
}
}