From fb48a4688833c50d6e52b59300f1bcc232237085 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 9 May 2019 16:34:37 -0400 Subject: [PATCH] Add note for docutils, unpin runner dependency --- requirements/README.md | 2 ++ requirements/requirements.in | 1 - requirements/requirements.txt | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/README.md b/requirements/README.md index f9d31c93eb5d..3aeede1db21e 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -12,6 +12,8 @@ pip-compile -U -r --allow-unsafe --output-file requirements/requirements.txt req pip-compile -U -r --allow-unsafe --output-file requirements/requirements_ansible_py3.txt requirements/requirements_ansible.in ``` +Remove the `docutils` line from `requirements/requirements.txt`. + The Ansible venv requirements file needs to start with the python 2 version as a base. Then we can run the tool again to get the python 3 version. Consult the output of the `diff` command and add a conditional switch in those cases. diff --git a/requirements/requirements.in b/requirements/requirements.in index 05853a486f0f..747d18b07983 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -35,7 +35,6 @@ psutil==5.4.3 psycopg2==2.7.3.2 # problems with Segmentation faults / wheels on upgrade pygerduty==0.37.0 pyparsing==2.2.0 -python-daemon==2.2.0 python-dateutil==2.7.2 # contains support for TZINFO= parsing python-memcached==1.59 python-radius==1.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 10254944b3a9..81571fb5f97e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -U -r --allow-unsafe --output-file requirements/requirements.txt requirements/requirements.in +# pip-compile --allow-unsafe --output-file=requirements/requirements.txt requirements/requirements.in # adal==1.2.1 # via msrestazure amqp==2.4.2 # via kombu @@ -15,7 +15,7 @@ asn1crypto==0.24.0 # via cryptography attrs==19.1.0 # via automat, service-identity, twisted autobahn==19.3.3 # via daphne automat==0.7.0 # via twisted -azure-common==1.1.19 # via azure-keyvault +azure-common==1.1.20 # via azure-keyvault azure-keyvault==1.1.0 azure-nspkg==3.0.2 # via azure-keyvault billiard==3.6.0.0 # via celery @@ -44,7 +44,6 @@ django-taggit==0.22.2 django==1.11.20 djangorestframework-yaml==1.0.3 djangorestframework==3.7.7 -docutils==0.14 # via python-daemon future==0.16.0 # via django-radius hyperlink==19.0.0 # via twisted idna==2.8 # via hyperlink, requests, twisted @@ -90,7 +89,7 @@ pyopenssl==19.0.0 # via twisted pyparsing==2.2.0 pyrad==2.1 # via django-radius pysocks==1.6.8 # via twilio -python-daemon==2.2.0 +python-daemon==2.2.3 # via ansible-runner python-dateutil==2.7.2 python-ldap==3.2.0 # via django-auth-ldap python-memcached==1.59