diff --git a/Vagrantfile b/Vagrantfile index b4a06ea05..fa9195dd1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ cd /vagrant sudo ./bootstrap/ubuntu.sh if [ ! -d "venv" ]; then virtualenv --no-site-packages -p python2 venv - ./venv/bin/python setup.py dev + ./venv/bin/pip install -r requirements.txt -e .[dev] fi SETUP_SCRIPT diff --git a/docs/contributing.rst b/docs/contributing.rst index 0ed022724..bfe5216ae 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -15,7 +15,7 @@ Now you can install the development packages: .. code-block:: shell - ./venv/bin/python setup.py dev + ./venv/bin/pip install -r requirements.txt -e .[dev] The code base, including your pull requests, **must** have 100% test statement coverage **and** be compliant with the :ref:`coding style @@ -48,7 +48,7 @@ synced to ``/vagrant``, so you can get started with: vagrant ssh cd /vagrant - ./venv/bin/python setup.py install + ./venv/bin/pip install -r requirements.txt sudo ./venv/bin/letsencrypt Support for other Linux distributions coming soon. diff --git a/docs/using.rst b/docs/using.rst index 3a7940993..f10966602 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -53,7 +53,7 @@ Installation .. code-block:: shell virtualenv --no-site-packages -p python2 venv - ./venv/bin/python setup.py install + ./venv/bin/pip install -r requirements.txt sudo ./venv/bin/letsencrypt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..d7174f103 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +# https://github.com/bw2/ConfigArgParse/issues/17 +-e git+https://github.com/kuba/ConfigArgParse.git#egg=ConfigArgParse +-e . diff --git a/tox.ini b/tox.ini index 47b509203..cd6f3c7b0 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = py26,py27,cover,lint [testenv] commands = - pip install -e .[testing] + pip install -r requirements.txt -e .[testing] python setup.py test -q # -q does not suppress errors setenv =