Merge pull request #600 from kuba/subdirs-rename

Subdirs rename

Dockerfile

@@ -44,8 +44,8 @@ COPY setup.py README.rst CHANGES.rst MANIFEST.in /opt/letsencrypt/src/
 
 COPY letsencrypt /opt/letsencrypt/src/letsencrypt/
 COPY acme /opt/letsencrypt/src/acme/
-COPY letsencrypt_apache /opt/letsencrypt/src/letsencrypt_apache/
-COPY letsencrypt_nginx /opt/letsencrypt/src/letsencrypt_nginx/
+COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/
+COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
 
 
 # requirements.txt not installed!
@@ -53,8 +53,8 @@ RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
     /opt/letsencrypt/venv/bin/pip install \
     -e /opt/letsencrypt/src/acme \
     -e /opt/letsencrypt/src \
-    -e /opt/letsencrypt/src/letsencrypt_apache \
-    -e /opt/letsencrypt/src/letsencrypt_nginx
+    -e /opt/letsencrypt/src/letsencrypt-apache \
+    -e /opt/letsencrypt/src/letsencrypt-nginx
 
 # install in editable mode (-e) to save space: it's not possible to
 # "rm -rf /opt/letsencrypt/src" (it's stays in the underlaying image);

Vagrantfile

@@ -10,7 +10,7 @@ cd /vagrant
 sudo ./bootstrap/ubuntu.sh
 if [ ! -d "venv" ]; then
   virtualenv --no-site-packages -p python2 venv
-  ./venv/bin/pip install -r requirements.txt -e acme -e .[dev,docs,testing] -e letsencrypt_apache -e letsencrypt_nginx
+  ./venv/bin/pip install -r requirements.txt -e acme -e .[dev,docs,testing] -e letsencrypt-apache -e letsencrypt-nginx
 fi
 SETUP_SCRIPT
 

docs/conf.py

@@ -36,7 +36,7 @@ with codecs.open(init_fn, encoding='utf8') as fd:
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath(os.path.join(here, '..')))
-for pkg in 'acme', 'letsencrypt_apache', 'letsencrypt_nginx':
+for pkg in 'acme', 'letsencrypt-apache', 'letsencrypt-nginx':
     sys.path.insert(0, os.path.abspath(os.path.join(here, '..', pkg)))
 
 # -- General configuration ------------------------------------------------

docs/contributing.rst

@@ -26,7 +26,7 @@ Install the development packages:
 
 .. code-block:: shell
 
-   pip install -r requirements.txt -e acme -e .[dev,docs,testing] -e letsencrypt_apache -e letsencrypt_nginx
+   pip install -r requirements.txt -e acme -e .[dev,docs,testing] -e letsencrypt-apache -e letsencrypt-nginx
 
 .. note:: `-e` (short for `--editable`) turns on *editable mode* in
           which any source code changes in the current working

docs/using.rst

@@ -108,7 +108,7 @@ Installation
 .. code-block:: shell
 
    virtualenv --no-site-packages -p python2 venv
-   ./venv/bin/pip install -r requirements.txt acme . letsencrypt_apache letsencrypt_nginx
+   ./venv/bin/pip install -r requirements.txt acme . letsencrypt-apache letsencrypt-nginx
 
 .. warning:: Please do **not** use ``python setup.py install``. Please
              do **not** attempt the installation commands as

letsencrypt_apache

@@ -0,0 +1 @@
+letsencrypt-apache

letsencrypt_nginx

@@ -0,0 +1 @@
+letsencrypt-nginx/

tox.ini

@@ -14,7 +14,7 @@ envlist = py26,py27,cover,lint
 # {toxinidir}/venv as it will destroy existing dev venv
 envdir = {toxinidir}/tox.venv
 commands =
-    pip install -r requirements.txt -e acme -e .[testing] -e letsencrypt_apache -e letsencrypt_nginx
+    pip install -r requirements.txt -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx
     # -q does not suppress errors
     python setup.py test -q
     python setup.py test -q -s acme
@@ -29,7 +29,7 @@ setenv =
 [testenv:cover]
 basepython = python2.7
 commands =
-    pip install -r requirements.txt -e acme -e .[testing] -e letsencrypt_apache -e letsencrypt_nginx
+    pip install -r requirements.txt -e acme -e .[testing] -e letsencrypt-apache -e letsencrypt-nginx
     ./tox.cover.sh
 
 [testenv:lint]
@@ -39,8 +39,8 @@ basepython = python2.7
 # duplicate code checking; if one of the commands fails, others will
 # continue, but tox return code will reflect previous error
 commands =
-    pip install -r requirements.txt -e acme -e .[dev] -e letsencrypt_apache -e letsencrypt_nginx
+    pip install -r requirements.txt -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx
     pylint --rcfile=.pylintrc letsencrypt
     pylint --rcfile=.pylintrc acme/acme
-    pylint --rcfile=.pylintrc letsencrypt_apache/letsencrypt_apache
-    pylint --rcfile=.pylintrc letsencrypt_nginx/letsencrypt_nginx
+    pylint --rcfile=.pylintrc letsencrypt-apache/letsencrypt_apache
+    pylint --rcfile=.pylintrc letsencrypt-nginx/letsencrypt_nginx