From 9587a4f84d672d068a2b47134e9c217ebdb105f1 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 23 Jul 2015 14:37:41 +0000 Subject: [PATCH 1/3] Remove tests/__init__.py. --- tests/__init__.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/__init__.py diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index ea250d700..000000000 --- a/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Let's Encrypt tests""" From 645378d5dff90f6e7077a8b047ee6a894e660cdf Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 23 Jul 2015 14:37:00 +0000 Subject: [PATCH 2/3] Move compat testing files to subpkg directory. --- {tests => letsencrypt-compatibility-test}/MANIFEST.in | 0 .../letsencrypt_compatibility_test}/__init__.py | 0 .../letsencrypt_compatibility_test}/configurators/__init__.py | 0 .../configurators/apache/Dockerfile | 0 .../configurators/apache/__init__.py | 0 .../configurators/apache/a2enmod.sh | 0 .../configurators/apache/apache24.py | 0 .../configurators/apache/common.py | 0 .../letsencrypt_compatibility_test}/configurators/common.py | 0 .../letsencrypt_compatibility_test}/errors.py | 0 .../letsencrypt_compatibility_test}/interfaces.py | 0 .../letsencrypt_compatibility_test}/test_driver.py | 0 .../letsencrypt_compatibility_test}/testdata/rsa1024_key.pem | 0 .../letsencrypt_compatibility_test}/util.py | 0 {tests => letsencrypt-compatibility-test}/setup.py | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename {tests => letsencrypt-compatibility-test}/MANIFEST.in (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/__init__.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/__init__.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/apache/Dockerfile (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/apache/__init__.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/apache/a2enmod.sh (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/apache/apache24.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/apache/common.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/configurators/common.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/errors.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/interfaces.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/test_driver.py (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/testdata/rsa1024_key.pem (100%) rename {tests/compatibility => letsencrypt-compatibility-test/letsencrypt_compatibility_test}/util.py (100%) rename {tests => letsencrypt-compatibility-test}/setup.py (100%) diff --git a/tests/MANIFEST.in b/letsencrypt-compatibility-test/MANIFEST.in similarity index 100% rename from tests/MANIFEST.in rename to letsencrypt-compatibility-test/MANIFEST.in diff --git a/tests/compatibility/__init__.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/__init__.py similarity index 100% rename from tests/compatibility/__init__.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/__init__.py diff --git a/tests/compatibility/configurators/__init__.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/__init__.py similarity index 100% rename from tests/compatibility/configurators/__init__.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/__init__.py diff --git a/tests/compatibility/configurators/apache/Dockerfile b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/Dockerfile similarity index 100% rename from tests/compatibility/configurators/apache/Dockerfile rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/Dockerfile diff --git a/tests/compatibility/configurators/apache/__init__.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/__init__.py similarity index 100% rename from tests/compatibility/configurators/apache/__init__.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/__init__.py diff --git a/tests/compatibility/configurators/apache/a2enmod.sh b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/a2enmod.sh similarity index 100% rename from tests/compatibility/configurators/apache/a2enmod.sh rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/a2enmod.sh diff --git a/tests/compatibility/configurators/apache/apache24.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/apache24.py similarity index 100% rename from tests/compatibility/configurators/apache/apache24.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/apache24.py diff --git a/tests/compatibility/configurators/apache/common.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/common.py similarity index 100% rename from tests/compatibility/configurators/apache/common.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/apache/common.py diff --git a/tests/compatibility/configurators/common.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/common.py similarity index 100% rename from tests/compatibility/configurators/common.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/configurators/common.py diff --git a/tests/compatibility/errors.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/errors.py similarity index 100% rename from tests/compatibility/errors.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/errors.py diff --git a/tests/compatibility/interfaces.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/interfaces.py similarity index 100% rename from tests/compatibility/interfaces.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/interfaces.py diff --git a/tests/compatibility/test_driver.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/test_driver.py similarity index 100% rename from tests/compatibility/test_driver.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/test_driver.py diff --git a/tests/compatibility/testdata/rsa1024_key.pem b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/testdata/rsa1024_key.pem similarity index 100% rename from tests/compatibility/testdata/rsa1024_key.pem rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/testdata/rsa1024_key.pem diff --git a/tests/compatibility/util.py b/letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py similarity index 100% rename from tests/compatibility/util.py rename to letsencrypt-compatibility-test/letsencrypt_compatibility_test/util.py diff --git a/tests/setup.py b/letsencrypt-compatibility-test/setup.py similarity index 100% rename from tests/setup.py rename to letsencrypt-compatibility-test/setup.py From 34aa3b90f6aad27f673a34561b1f5ff804fb117e Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 23 Jul 2015 14:38:05 +0000 Subject: [PATCH 3/3] Post-rename subpkg updates. Fix compat testing imports, console script name, subpkg project name, MANIFEST. --- letsencrypt-compatibility-test/MANIFEST.in | 2 +- .../configurators/apache/apache24.py | 6 +++--- .../configurators/apache/common.py | 8 ++++---- .../configurators/common.py | 4 ++-- .../letsencrypt_compatibility_test/test_driver.py | 7 ++++--- .../letsencrypt_compatibility_test/util.py | 3 ++- letsencrypt-compatibility-test/setup.py | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) 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', ], }, )