mirror of
https://github.com/certbot/certbot.git
synced 2025-08-08 04:02:10 +03:00
[Apache v2] Add apacheconfig as a dependency (#7643)
* Add apacheconfig as a dependency. * Change apacheconfig to a dev dependency * Bump apacheconfig dep to 0.3.1
This commit is contained in:
@@ -57,7 +57,7 @@ matrix:
|
|||||||
# cryptography we support cannot be compiled against the version of
|
# cryptography we support cannot be compiled against the version of
|
||||||
# OpenSSL in Xenial or newer.
|
# OpenSSL in Xenial or newer.
|
||||||
dist: trusty
|
dist: trusty
|
||||||
env: TOXENV='py27-{acme,apache,certbot,dns,nginx}-oldest'
|
env: TOXENV='py27-{acme,apache,apache-v2,certbot,dns,nginx}-oldest'
|
||||||
<<: *not-on-master
|
<<: *not-on-master
|
||||||
- python: "3.4"
|
- python: "3.4"
|
||||||
env: TOXENV=py34
|
env: TOXENV=py34
|
||||||
|
@@ -18,6 +18,9 @@ install_requires = [
|
|||||||
'zope.interface',
|
'zope.interface',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
dev_extras = [
|
||||||
|
'apacheconfig>=0.3.1',
|
||||||
|
]
|
||||||
|
|
||||||
class PyTest(TestCommand):
|
class PyTest(TestCommand):
|
||||||
user_options = []
|
user_options = []
|
||||||
@@ -69,6 +72,9 @@ setup(
|
|||||||
packages=find_packages(),
|
packages=find_packages(),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
install_requires=install_requires,
|
install_requires=install_requires,
|
||||||
|
extras_require={
|
||||||
|
'dev': dev_extras,
|
||||||
|
},
|
||||||
entry_points={
|
entry_points={
|
||||||
'certbot.plugins': [
|
'certbot.plugins': [
|
||||||
'apache = certbot_apache._internal.entrypoint:ENTRYPOINT',
|
'apache = certbot_apache._internal.entrypoint:ENTRYPOINT',
|
||||||
|
@@ -3,6 +3,7 @@
|
|||||||
# Some dev package versions specified here may be overridden by higher level constraints
|
# Some dev package versions specified here may be overridden by higher level constraints
|
||||||
# files during tests (eg. letsencrypt-auto-source/pieces/dependency-requirements.txt).
|
# files during tests (eg. letsencrypt-auto-source/pieces/dependency-requirements.txt).
|
||||||
alabaster==0.7.10
|
alabaster==0.7.10
|
||||||
|
apacheconfig==0.3.1
|
||||||
apipkg==1.4
|
apipkg==1.4
|
||||||
appnope==0.1.0
|
appnope==0.1.0
|
||||||
asn1crypto==0.22.0
|
asn1crypto==0.22.0
|
||||||
@@ -64,6 +65,7 @@ pexpect==4.7.0
|
|||||||
pickleshare==0.7.4
|
pickleshare==0.7.4
|
||||||
pkginfo==1.4.2
|
pkginfo==1.4.2
|
||||||
pluggy==0.13.0
|
pluggy==0.13.0
|
||||||
|
ply==3.4
|
||||||
prompt-toolkit==1.0.15
|
prompt-toolkit==1.0.15
|
||||||
ptyprocess==0.6.0
|
ptyprocess==0.6.0
|
||||||
py==1.8.0
|
py==1.8.0
|
||||||
|
@@ -40,6 +40,7 @@ pytz==2012rc0
|
|||||||
google-api-python-client==1.5.5
|
google-api-python-client==1.5.5
|
||||||
|
|
||||||
# Our setup.py constraints
|
# Our setup.py constraints
|
||||||
|
apacheconfig==0.3.1
|
||||||
cloudflare==1.5.1
|
cloudflare==1.5.1
|
||||||
cryptography==1.2.3
|
cryptography==1.2.3
|
||||||
parsedatetime==1.3
|
parsedatetime==1.3
|
||||||
|
6
tox.ini
6
tox.ini
@@ -90,6 +90,12 @@ commands =
|
|||||||
setenv =
|
setenv =
|
||||||
{[testenv:py27-oldest]setenv}
|
{[testenv:py27-oldest]setenv}
|
||||||
|
|
||||||
|
[testenv:py27-apache-v2-oldest]
|
||||||
|
commands =
|
||||||
|
{[base]install_and_test} certbot-apache[dev]
|
||||||
|
setenv =
|
||||||
|
{[testenv:py27-oldest]setenv}
|
||||||
|
|
||||||
[testenv:py27-certbot-oldest]
|
[testenv:py27-certbot-oldest]
|
||||||
commands =
|
commands =
|
||||||
{[base]install_and_test} certbot[dev]
|
{[base]install_and_test} certbot[dev]
|
||||||
|
Reference in New Issue
Block a user