diff --git a/letsencrypt-compatibility-test/MANIFEST.in b/letsencrypt-compatibility-test/MANIFEST.in index 7d73674fb..29862fc12 100644 --- a/letsencrypt-compatibility-test/MANIFEST.in +++ b/letsencrypt-compatibility-test/MANIFEST.in @@ -1 +1 @@ -include compatibility/testdata/rsa1024_key.pem +include letsencrypt_compatibility_test/testdata/rsa1024_key.pem diff --git a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/apache24.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/apache24.py index 44150e7fe..2ffc44976 100644 --- a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/apache24.py +++ b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/apache24.py @@ -2,9 +2,9 @@ import zope.interface -from tests.compatibility import errors -from tests.compatibility import interfaces -from tests.compatibility.configurators.apache import common as apache_common +from letsencrypt_compatibility_test import errors +from letsencrypt_compatibility_test import interfaces +from letsencrypt_compatibility_test.configurators.apache import common as apache_common # The docker image doesn't actually have the watchdog module, but unless the diff --git a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/common.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/common.py index 036654844..995c469bf 100644 --- a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/common.py +++ b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/common.py @@ -8,10 +8,10 @@ import zope.interface from letsencrypt import configuration from letsencrypt_apache import configurator -from tests.compatibility import errors -from tests.compatibility import interfaces -from tests.compatibility import util -from tests.compatibility.configurators import common as configurators_common +from letsencrypt_compatibility_test import errors +from letsencrypt_compatibility_test import interfaces +from letsencrypt_compatibility_test import util +from letsencrypt_compatibility_test.configurators import common as configurators_common APACHE_VERSION_REGEX = re.compile(r"Apache/([0-9\.]*)", re.IGNORECASE) diff --git a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/common.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/common.py index f7385b8bb..e5309b770 100644 --- a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/common.py +++ b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/common.py @@ -8,8 +8,8 @@ import threading import docker from letsencrypt import constants -from tests.compatibility import errors -from tests.compatibility import util +from letsencrypt_compatibility_test import errors +from letsencrypt_compatibility_test import util logger = logging.getLogger(__name__) diff --git a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/test_driver.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/test_driver.py index 65ad36f18..34b6da689 100644 --- a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/test_driver.py +++ b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/test_driver.py @@ -16,9 +16,10 @@ from letsencrypt import achallenges from letsencrypt import errors as le_errors from letsencrypt import validator from letsencrypt.tests import acme_util -from tests.compatibility import errors -from tests.compatibility import util -from tests.compatibility.configurators.apache import apache24 + +from letsencrypt_compatibility_test import errors +from letsencrypt_compatibility_test import util +from letsencrypt_compatibility_test.configurators.apache import apache24 DESCRIPTION = """ diff --git a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py index 728850c75..03b15d217 100644 --- a/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py +++ b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py @@ -11,7 +11,8 @@ import tarfile from acme import jose from acme import test_util from letsencrypt import constants -from tests.compatibility import errors + +from letsencrypt_compatibility_test import errors _KEY_BASE = "rsa1024_key.pem" diff --git a/letsencrypt-compatibility-test/setup.py b/letsencrypt-compatibility-test/setup.py index 5810b66f9..f02041e55 100644 --- a/letsencrypt-compatibility-test/setup.py +++ b/letsencrypt-compatibility-test/setup.py @@ -12,12 +12,12 @@ install_requires = [ ] setup( - name='compatibility-test', + name='letsencrypt-compatibility-test', packages=find_packages(), install_requires=install_requires, entry_points={ 'console_scripts': [ - 'compatibility-test = compatibility.test_driver:main', + 'letsencrypt-compatibility-test = letsencrypt_compatibility_test.test_driver:main', ], }, )