From 547e0d278da46b5ae966db87e53302b8c3a05d76 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Fri, 23 Oct 2015 01:48:25 +0200 Subject: [PATCH 1/4] Typo --- docs/contributing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index 60e7f35c2..26694ff0b 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -293,8 +293,8 @@ directory. .. _prerequisites: -Notes on OS depedencies -======================= +Notes on OS dependencies +======================== OS level dependencies are managed by scripts in ``bootstrap``. Some notes are provided here mainly for the :ref:`developers ` reference. From 5deba95423b05ad013e3464d9efa7d13528c0852 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Fri, 23 Oct 2015 19:01:06 +0000 Subject: [PATCH 2/4] RTD: install local deps for subpkgs (fixes #1086). --- letsencrypt-apache/readthedocs.org.requirements.txt | 2 ++ letsencrypt-compatibility-test/readthedocs.org.requirements.txt | 2 ++ letsencrypt-nginx/readthedocs.org.requirements.txt | 2 ++ readthedocs.org.requirements.txt | 1 + 4 files changed, 7 insertions(+) diff --git a/letsencrypt-apache/readthedocs.org.requirements.txt b/letsencrypt-apache/readthedocs.org.requirements.txt index 9e782a01e..7855b5ce2 100644 --- a/letsencrypt-apache/readthedocs.org.requirements.txt +++ b/letsencrypt-apache/readthedocs.org.requirements.txt @@ -7,4 +7,6 @@ # in --editable mode (-e), just "pip install .[docs]" does not work as # expected and "pip install -e .[docs]" must be used instead +-e acme +-e . -e letsencrypt-apache[docs] diff --git a/letsencrypt-compatibility-test/readthedocs.org.requirements.txt b/letsencrypt-compatibility-test/readthedocs.org.requirements.txt index 86d680426..208677a35 100644 --- a/letsencrypt-compatibility-test/readthedocs.org.requirements.txt +++ b/letsencrypt-compatibility-test/readthedocs.org.requirements.txt @@ -7,4 +7,6 @@ # in --editable mode (-e), just "pip install .[docs]" does not work as # expected and "pip install -e .[docs]" must be used instead +-e acme +-e . -e letsencrypt-compatibility-test[docs] diff --git a/letsencrypt-nginx/readthedocs.org.requirements.txt b/letsencrypt-nginx/readthedocs.org.requirements.txt index 9a36ed259..3b55df408 100644 --- a/letsencrypt-nginx/readthedocs.org.requirements.txt +++ b/letsencrypt-nginx/readthedocs.org.requirements.txt @@ -7,4 +7,6 @@ # in --editable mode (-e), just "pip install .[docs]" does not work as # expected and "pip install -e .[docs]" must be used instead +-e acme +-e . -e letsencrypt-nginx[docs] diff --git a/readthedocs.org.requirements.txt b/readthedocs.org.requirements.txt index 27cccb0a6..94a81e788 100644 --- a/readthedocs.org.requirements.txt +++ b/readthedocs.org.requirements.txt @@ -7,4 +7,5 @@ # in --editable mode (-e), just "pip install .[docs]" does not work as # expected and "pip install -e .[docs]" must be used instead +-e acme -e .[docs] From 08618466166b0909a1c9d06a6fd4eeae29aab92b Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Fri, 23 Oct 2015 19:15:54 +0000 Subject: [PATCH 3/4] RTD: proper deps for compatibility-test --- letsencrypt-compatibility-test/readthedocs.org.requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/letsencrypt-compatibility-test/readthedocs.org.requirements.txt b/letsencrypt-compatibility-test/readthedocs.org.requirements.txt index 208677a35..49fab4066 100644 --- a/letsencrypt-compatibility-test/readthedocs.org.requirements.txt +++ b/letsencrypt-compatibility-test/readthedocs.org.requirements.txt @@ -9,4 +9,6 @@ -e acme -e . +-e letsencrypt-apache +-e letsencrypt-nginx -e letsencrypt-compatibility-test[docs] From 41891512c2cf4f50ef342905cc1e8fddc69e1c7c Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Fri, 23 Oct 2015 19:22:05 +0000 Subject: [PATCH 4/4] compatibility-test doesn't need nginx --- letsencrypt-compatibility-test/readthedocs.org.requirements.txt | 1 - letsencrypt-compatibility-test/setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/letsencrypt-compatibility-test/readthedocs.org.requirements.txt b/letsencrypt-compatibility-test/readthedocs.org.requirements.txt index 49fab4066..957a8a157 100644 --- a/letsencrypt-compatibility-test/readthedocs.org.requirements.txt +++ b/letsencrypt-compatibility-test/readthedocs.org.requirements.txt @@ -10,5 +10,4 @@ -e acme -e . -e letsencrypt-apache --e letsencrypt-nginx -e letsencrypt-compatibility-test[docs] diff --git a/letsencrypt-compatibility-test/setup.py b/letsencrypt-compatibility-test/setup.py index 3bd8f274e..1608769e2 100644 --- a/letsencrypt-compatibility-test/setup.py +++ b/letsencrypt-compatibility-test/setup.py @@ -9,7 +9,6 @@ version = '0.1.0.dev0' install_requires = [ 'letsencrypt=={0}'.format(version), 'letsencrypt-apache=={0}'.format(version), - 'letsencrypt-nginx=={0}'.format(version), 'docker-py', 'zope.interface', ]