Merge remote-tracking branch 'origin/master' into devdocs

This commit is contained in:
Peter Eckersley
2015-10-23 16:44:30 -07:00
6 changed files with 10 additions and 4 deletions
+2 -3
View File
@@ -324,9 +324,8 @@ Now run tests inside the Docker image:
tox -e py27 tox -e py27
Notes on OS dependencies
Notes on OS depedencies ========================
=======================
OS level dependencies are managed by scripts in ``bootstrap``. Some notes OS level dependencies are managed by scripts in ``bootstrap``. Some notes
are provided here mainly for the :ref:`developers <hacking>` reference. are provided here mainly for the :ref:`developers <hacking>` reference.
@@ -7,4 +7,6 @@
# in --editable mode (-e), just "pip install .[docs]" does not work as # in --editable mode (-e), just "pip install .[docs]" does not work as
# expected and "pip install -e .[docs]" must be used instead # expected and "pip install -e .[docs]" must be used instead
-e acme
-e .
-e letsencrypt-apache[docs] -e letsencrypt-apache[docs]
@@ -7,4 +7,7 @@
# in --editable mode (-e), just "pip install .[docs]" does not work as # in --editable mode (-e), just "pip install .[docs]" does not work as
# expected and "pip install -e .[docs]" must be used instead # expected and "pip install -e .[docs]" must be used instead
-e acme
-e .
-e letsencrypt-apache
-e letsencrypt-compatibility-test[docs] -e letsencrypt-compatibility-test[docs]
-1
View File
@@ -9,7 +9,6 @@ version = '0.1.0.dev0'
install_requires = [ install_requires = [
'letsencrypt=={0}'.format(version), 'letsencrypt=={0}'.format(version),
'letsencrypt-apache=={0}'.format(version), 'letsencrypt-apache=={0}'.format(version),
'letsencrypt-nginx=={0}'.format(version),
'docker-py', 'docker-py',
'zope.interface', 'zope.interface',
] ]
@@ -7,4 +7,6 @@
# in --editable mode (-e), just "pip install .[docs]" does not work as # in --editable mode (-e), just "pip install .[docs]" does not work as
# expected and "pip install -e .[docs]" must be used instead # expected and "pip install -e .[docs]" must be used instead
-e acme
-e .
-e letsencrypt-nginx[docs] -e letsencrypt-nginx[docs]
+1
View File
@@ -7,4 +7,5 @@
# in --editable mode (-e), just "pip install .[docs]" does not work as # in --editable mode (-e), just "pip install .[docs]" does not work as
# expected and "pip install -e .[docs]" must be used instead # expected and "pip install -e .[docs]" must be used instead
-e acme
-e .[docs] -e .[docs]