From f1b91e577e5356ac9beb1ceaad85881c2f5af431 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 25 Aug 2019 16:04:18 -0700 Subject: [PATCH] requirements: Include packages that pip-tools considers unsafe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s unclear why pip-tools considers these packages unsafe, and excluding them from being pinned has resulted in nondeterministic output that makes our test suite unhappy. Signed-off-by: Anders Kaseorg --- requirements/dev.txt | 4 ++-- requirements/docs.txt | 2 +- requirements/prod.txt | 4 ++-- tools/update-locked-requirements | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index d3a3362319..7d63ba635e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -191,5 +191,5 @@ 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 # The following packages are considered to be unsafe in a requirements file: -# pip==19.2.3 -# setuptools==41.2.0 # via cfn-lint, ipython, jsonschema, markdown, pyhamcrest, sphinx, zope.interface +pip==19.1.1 +setuptools==41.0.1 # via cfn-lint, ipython, jsonschema, markdown, pyhamcrest, sphinx, zope.interface diff --git a/requirements/docs.txt b/requirements/docs.txt index 6d955e57d8..cf2bdc409b 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -32,4 +32,4 @@ sphinxcontrib-websupport==1.1.2 # via sphinx urllib3==1.25.3 # via requests # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.2.0 # via sphinx +setuptools==41.0.1 # via sphinx diff --git a/requirements/prod.txt b/requirements/prod.txt index 21b0e1a602..c10df59d0d 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -122,5 +122,5 @@ 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 # The following packages are considered to be unsafe in a requirements file: -# pip==19.2.3 -# setuptools==41.2.0 # via ipython, markdown +pip==19.1.1 +setuptools==41.0.1 # via ipython, markdown diff --git a/tools/update-locked-requirements b/tools/update-locked-requirements index 2bf4034db0..be346d2f07 100755 --- a/tools/update-locked-requirements +++ b/tools/update-locked-requirements @@ -12,7 +12,7 @@ compile_requirements () { output="$2" python_version="$3" - pip-compile --quiet --no-header --output-file "$output" "$source" + pip-compile --quiet --allow-unsafe --no-header --output-file "$output" "$source" if [ "$python_version" != "py2" ]; then # Remove an unnecessary future requirement declared by commonmark,