mirror of
https://github.com/certbot/certbot.git
synced 2026-08-03 03:32:13 +02:00
Remove py26reqs.txt
ConfigArgParse 0.10 from PyPI supports Python 2.6, so there's no more need to install a fixed version directly from a git branch.
This commit is contained in:
@@ -49,7 +49,6 @@ COPY letsencrypt-apache /opt/letsencrypt/src/letsencrypt-apache/
|
|||||||
COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
|
COPY letsencrypt-nginx /opt/letsencrypt/src/letsencrypt-nginx/
|
||||||
|
|
||||||
|
|
||||||
# py26reqs.txt not installed!
|
|
||||||
RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
|
RUN virtualenv --no-site-packages -p python2 /opt/letsencrypt/venv && \
|
||||||
/opt/letsencrypt/venv/bin/pip install \
|
/opt/letsencrypt/venv/bin/pip install \
|
||||||
-e /opt/letsencrypt/src/acme \
|
-e /opt/letsencrypt/src/acme \
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ RUN /opt/letsencrypt/src/ubuntu.sh && \
|
|||||||
# the above is not likely to change, so by putting it further up the
|
# the above is not likely to change, so by putting it further up the
|
||||||
# Dockerfile we make sure we cache as much as possible
|
# Dockerfile we make sure we cache as much as possible
|
||||||
|
|
||||||
# py26reqs.txt not installed!
|
|
||||||
COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/
|
COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/
|
||||||
|
|
||||||
# all above files are necessary for setup.py, however, package source
|
# all above files are necessary for setup.py, however, package source
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
include py26reqs.txt
|
|
||||||
include README.rst
|
include README.rst
|
||||||
include CHANGES.rst
|
include CHANGES.rst
|
||||||
include CONTRIBUTING.md
|
include CONTRIBUTING.md
|
||||||
|
|||||||
+2
-2
@@ -2,6 +2,6 @@ This directory contains scripts that install necessary OS-specific
|
|||||||
prerequisite dependencies (see docs/using.rst).
|
prerequisite dependencies (see docs/using.rst).
|
||||||
|
|
||||||
General dependencies:
|
General dependencies:
|
||||||
- git-core: py26reqs.txt git+https://*
|
- git-core: git+https://*
|
||||||
- ca-certificates: communication with demo ACMO server at
|
- ca-certificates: communication with demo ACMO server at
|
||||||
https://www.letsencrypt-demo.org, py26reqs.txt git+https://*
|
https://www.letsencrypt-demo.org, git+https://*
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
export VENV_ARGS="--python python2"
|
export VENV_ARGS="--python python2"
|
||||||
|
|
||||||
./bootstrap/dev/_venv_common.sh \
|
./bootstrap/dev/_venv_common.sh \
|
||||||
-r py26reqs.txt \
|
|
||||||
-e acme[testing] \
|
-e acme[testing] \
|
||||||
-e .[dev,docs,testing] \
|
-e .[dev,docs,testing] \
|
||||||
-e letsencrypt-apache \
|
-e letsencrypt-apache \
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ fi
|
|||||||
pip install -U setuptools
|
pip install -U setuptools
|
||||||
pip install -U pip
|
pip install -U pip
|
||||||
|
|
||||||
pip install -U -r py26reqs.txt letsencrypt letsencrypt-apache # letsencrypt-nginx
|
pip install -U letsencrypt letsencrypt-apache # letsencrypt-nginx
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Congratulations, Let's Encrypt has been successfully installed/updated!"
|
echo "Congratulations, Let's Encrypt has been successfully installed/updated!"
|
||||||
|
|||||||
+1
-3
@@ -175,7 +175,7 @@ if [ "$VERBOSE" = 1 ] ; then
|
|||||||
echo
|
echo
|
||||||
$VENV_BIN/pip install -U setuptools
|
$VENV_BIN/pip install -U setuptools
|
||||||
$VENV_BIN/pip install -U pip
|
$VENV_BIN/pip install -U pip
|
||||||
$VENV_BIN/pip install -r "$LEA_PATH"/py26reqs.txt -U letsencrypt letsencrypt-apache
|
$VENV_BIN/pip install -U letsencrypt letsencrypt-apache
|
||||||
# nginx is buggy / disabled for now, but upgrade it if the user has
|
# nginx is buggy / disabled for now, but upgrade it if the user has
|
||||||
# installed it manually
|
# installed it manually
|
||||||
if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
|
if $VENV_BIN/pip freeze | grep -q letsencrypt-nginx ; then
|
||||||
@@ -187,8 +187,6 @@ else
|
|||||||
$VENV_BIN/pip install -U pip > /dev/null
|
$VENV_BIN/pip install -U pip > /dev/null
|
||||||
printf .
|
printf .
|
||||||
# nginx is buggy / disabled for now...
|
# nginx is buggy / disabled for now...
|
||||||
$VENV_BIN/pip install -r "$LEA_PATH"/py26reqs.txt > /dev/null
|
|
||||||
printf .
|
|
||||||
$VENV_BIN/pip install -U letsencrypt > /dev/null
|
$VENV_BIN/pip install -U letsencrypt > /dev/null
|
||||||
printf .
|
printf .
|
||||||
$VENV_BIN/pip install -U letsencrypt-apache > /dev/null
|
$VENV_BIN/pip install -U letsencrypt-apache > /dev/null
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# https://github.com/bw2/ConfigArgParse/issues/17
|
|
||||||
git+https://github.com/kuba/ConfigArgParse.git@python2.6-0.9.3#egg=ConfigArgParse
|
|
||||||
@@ -17,7 +17,7 @@ envlist = py26,py27,py33,py34,py35,cover,lint
|
|||||||
commands =
|
commands =
|
||||||
pip install -e acme[testing]
|
pip install -e acme[testing]
|
||||||
nosetests -v acme
|
nosetests -v acme
|
||||||
pip install -r py26reqs.txt -e .[testing]
|
pip install -e .[testing]
|
||||||
nosetests -v letsencrypt
|
nosetests -v letsencrypt
|
||||||
pip install -e letsencrypt-apache
|
pip install -e letsencrypt-apache
|
||||||
nosetests -v letsencrypt_apache
|
nosetests -v letsencrypt_apache
|
||||||
|
|||||||
Reference in New Issue
Block a user