From 16dce0355e885a720d941fcb787ac9710e92a798 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Mon, 2 Jul 2018 09:32:19 +0400 Subject: [PATCH] Move urllib3 to src/urllib3 When tests are outside the main package, tox recommends putting the main package under an 'src' directory to ensure that the installed package is tested, not the source[0] . This layout has other benefits, too. [1] [0]: https://docs.pytest.org/en/latest/goodpractices.html [1]: https://blog.ionelmc.ro/2014/05/25/python-packaging/#the-structure --- setup.py | 3 ++- {urllib3 => src/urllib3}/__init__.py | 0 {urllib3 => src/urllib3}/_collections.py | 0 {urllib3 => src/urllib3}/connection.py | 0 {urllib3 => src/urllib3}/connectionpool.py | 0 {urllib3 => src/urllib3}/contrib/__init__.py | 0 {urllib3 => src/urllib3}/contrib/_securetransport/__init__.py | 0 {urllib3 => src/urllib3}/contrib/_securetransport/bindings.py | 0 {urllib3 => src/urllib3}/contrib/_securetransport/low_level.py | 0 {urllib3 => src/urllib3}/contrib/appengine.py | 0 {urllib3 => src/urllib3}/contrib/ntlmpool.py | 0 {urllib3 => src/urllib3}/contrib/pyopenssl.py | 0 {urllib3 => src/urllib3}/contrib/securetransport.py | 0 {urllib3 => src/urllib3}/contrib/socks.py | 0 {urllib3 => src/urllib3}/exceptions.py | 0 {urllib3 => src/urllib3}/fields.py | 0 {urllib3 => src/urllib3}/filepost.py | 0 {urllib3 => src/urllib3}/packages/__init__.py | 0 {urllib3 => src/urllib3}/packages/backports/__init__.py | 0 {urllib3 => src/urllib3}/packages/backports/makefile.py | 0 {urllib3 => src/urllib3}/packages/ordered_dict.py | 0 {urllib3 => src/urllib3}/packages/six.py | 0 .../urllib3}/packages/ssl_match_hostname/__init__.py | 0 .../urllib3}/packages/ssl_match_hostname/_implementation.py | 0 {urllib3 => src/urllib3}/poolmanager.py | 0 {urllib3 => src/urllib3}/request.py | 0 {urllib3 => src/urllib3}/response.py | 0 {urllib3 => src/urllib3}/util/__init__.py | 0 {urllib3 => src/urllib3}/util/connection.py | 0 {urllib3 => src/urllib3}/util/queue.py | 0 {urllib3 => src/urllib3}/util/request.py | 0 {urllib3 => src/urllib3}/util/response.py | 0 {urllib3 => src/urllib3}/util/retry.py | 0 {urllib3 => src/urllib3}/util/ssl_.py | 0 {urllib3 => src/urllib3}/util/timeout.py | 0 {urllib3 => src/urllib3}/util/url.py | 0 {urllib3 => src/urllib3}/util/wait.py | 0 37 files changed, 2 insertions(+), 1 deletion(-) rename {urllib3 => src/urllib3}/__init__.py (100%) rename {urllib3 => src/urllib3}/_collections.py (100%) rename {urllib3 => src/urllib3}/connection.py (100%) rename {urllib3 => src/urllib3}/connectionpool.py (100%) rename {urllib3 => src/urllib3}/contrib/__init__.py (100%) rename {urllib3 => src/urllib3}/contrib/_securetransport/__init__.py (100%) rename {urllib3 => src/urllib3}/contrib/_securetransport/bindings.py (100%) rename {urllib3 => src/urllib3}/contrib/_securetransport/low_level.py (100%) rename {urllib3 => src/urllib3}/contrib/appengine.py (100%) rename {urllib3 => src/urllib3}/contrib/ntlmpool.py (100%) rename {urllib3 => src/urllib3}/contrib/pyopenssl.py (100%) rename {urllib3 => src/urllib3}/contrib/securetransport.py (100%) rename {urllib3 => src/urllib3}/contrib/socks.py (100%) rename {urllib3 => src/urllib3}/exceptions.py (100%) rename {urllib3 => src/urllib3}/fields.py (100%) rename {urllib3 => src/urllib3}/filepost.py (100%) rename {urllib3 => src/urllib3}/packages/__init__.py (100%) rename {urllib3 => src/urllib3}/packages/backports/__init__.py (100%) rename {urllib3 => src/urllib3}/packages/backports/makefile.py (100%) rename {urllib3 => src/urllib3}/packages/ordered_dict.py (100%) rename {urllib3 => src/urllib3}/packages/six.py (100%) rename {urllib3 => src/urllib3}/packages/ssl_match_hostname/__init__.py (100%) rename {urllib3 => src/urllib3}/packages/ssl_match_hostname/_implementation.py (100%) rename {urllib3 => src/urllib3}/poolmanager.py (100%) rename {urllib3 => src/urllib3}/request.py (100%) rename {urllib3 => src/urllib3}/response.py (100%) rename {urllib3 => src/urllib3}/util/__init__.py (100%) rename {urllib3 => src/urllib3}/util/connection.py (100%) rename {urllib3 => src/urllib3}/util/queue.py (100%) rename {urllib3 => src/urllib3}/util/request.py (100%) rename {urllib3 => src/urllib3}/util/response.py (100%) rename {urllib3 => src/urllib3}/util/retry.py (100%) rename {urllib3 => src/urllib3}/util/ssl_.py (100%) rename {urllib3 => src/urllib3}/util/timeout.py (100%) rename {urllib3 => src/urllib3}/util/url.py (100%) rename {urllib3 => src/urllib3}/util/wait.py (100%) diff --git a/setup.py b/setup.py index 770b427d5c..17f3377682 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ base_path = os.path.dirname(__file__) # Get the version (borrowed from SQLAlchemy) -with open(os.path.join(base_path, 'urllib3', '__init__.py')) as fp: +with open(os.path.join(base_path, 'src', 'urllib3', '__init__.py')) as fp: VERSION = re.compile(r".*__version__ = '(.*?)'", re.S).match(fp.read()).group(1) @@ -58,6 +58,7 @@ 'urllib3.packages.backports', 'urllib3.contrib', 'urllib3.contrib._securetransport', 'urllib3.util', ], + package_dir={'': 'src'}, requires=[], python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4", tests_require=[ diff --git a/urllib3/__init__.py b/src/urllib3/__init__.py similarity index 100% rename from urllib3/__init__.py rename to src/urllib3/__init__.py diff --git a/urllib3/_collections.py b/src/urllib3/_collections.py similarity index 100% rename from urllib3/_collections.py rename to src/urllib3/_collections.py diff --git a/urllib3/connection.py b/src/urllib3/connection.py similarity index 100% rename from urllib3/connection.py rename to src/urllib3/connection.py diff --git a/urllib3/connectionpool.py b/src/urllib3/connectionpool.py similarity index 100% rename from urllib3/connectionpool.py rename to src/urllib3/connectionpool.py diff --git a/urllib3/contrib/__init__.py b/src/urllib3/contrib/__init__.py similarity index 100% rename from urllib3/contrib/__init__.py rename to src/urllib3/contrib/__init__.py diff --git a/urllib3/contrib/_securetransport/__init__.py b/src/urllib3/contrib/_securetransport/__init__.py similarity index 100% rename from urllib3/contrib/_securetransport/__init__.py rename to src/urllib3/contrib/_securetransport/__init__.py diff --git a/urllib3/contrib/_securetransport/bindings.py b/src/urllib3/contrib/_securetransport/bindings.py similarity index 100% rename from urllib3/contrib/_securetransport/bindings.py rename to src/urllib3/contrib/_securetransport/bindings.py diff --git a/urllib3/contrib/_securetransport/low_level.py b/src/urllib3/contrib/_securetransport/low_level.py similarity index 100% rename from urllib3/contrib/_securetransport/low_level.py rename to src/urllib3/contrib/_securetransport/low_level.py diff --git a/urllib3/contrib/appengine.py b/src/urllib3/contrib/appengine.py similarity index 100% rename from urllib3/contrib/appengine.py rename to src/urllib3/contrib/appengine.py diff --git a/urllib3/contrib/ntlmpool.py b/src/urllib3/contrib/ntlmpool.py similarity index 100% rename from urllib3/contrib/ntlmpool.py rename to src/urllib3/contrib/ntlmpool.py diff --git a/urllib3/contrib/pyopenssl.py b/src/urllib3/contrib/pyopenssl.py similarity index 100% rename from urllib3/contrib/pyopenssl.py rename to src/urllib3/contrib/pyopenssl.py diff --git a/urllib3/contrib/securetransport.py b/src/urllib3/contrib/securetransport.py similarity index 100% rename from urllib3/contrib/securetransport.py rename to src/urllib3/contrib/securetransport.py diff --git a/urllib3/contrib/socks.py b/src/urllib3/contrib/socks.py similarity index 100% rename from urllib3/contrib/socks.py rename to src/urllib3/contrib/socks.py diff --git a/urllib3/exceptions.py b/src/urllib3/exceptions.py similarity index 100% rename from urllib3/exceptions.py rename to src/urllib3/exceptions.py diff --git a/urllib3/fields.py b/src/urllib3/fields.py similarity index 100% rename from urllib3/fields.py rename to src/urllib3/fields.py diff --git a/urllib3/filepost.py b/src/urllib3/filepost.py similarity index 100% rename from urllib3/filepost.py rename to src/urllib3/filepost.py diff --git a/urllib3/packages/__init__.py b/src/urllib3/packages/__init__.py similarity index 100% rename from urllib3/packages/__init__.py rename to src/urllib3/packages/__init__.py diff --git a/urllib3/packages/backports/__init__.py b/src/urllib3/packages/backports/__init__.py similarity index 100% rename from urllib3/packages/backports/__init__.py rename to src/urllib3/packages/backports/__init__.py diff --git a/urllib3/packages/backports/makefile.py b/src/urllib3/packages/backports/makefile.py similarity index 100% rename from urllib3/packages/backports/makefile.py rename to src/urllib3/packages/backports/makefile.py diff --git a/urllib3/packages/ordered_dict.py b/src/urllib3/packages/ordered_dict.py similarity index 100% rename from urllib3/packages/ordered_dict.py rename to src/urllib3/packages/ordered_dict.py diff --git a/urllib3/packages/six.py b/src/urllib3/packages/six.py similarity index 100% rename from urllib3/packages/six.py rename to src/urllib3/packages/six.py diff --git a/urllib3/packages/ssl_match_hostname/__init__.py b/src/urllib3/packages/ssl_match_hostname/__init__.py similarity index 100% rename from urllib3/packages/ssl_match_hostname/__init__.py rename to src/urllib3/packages/ssl_match_hostname/__init__.py diff --git a/urllib3/packages/ssl_match_hostname/_implementation.py b/src/urllib3/packages/ssl_match_hostname/_implementation.py similarity index 100% rename from urllib3/packages/ssl_match_hostname/_implementation.py rename to src/urllib3/packages/ssl_match_hostname/_implementation.py diff --git a/urllib3/poolmanager.py b/src/urllib3/poolmanager.py similarity index 100% rename from urllib3/poolmanager.py rename to src/urllib3/poolmanager.py diff --git a/urllib3/request.py b/src/urllib3/request.py similarity index 100% rename from urllib3/request.py rename to src/urllib3/request.py diff --git a/urllib3/response.py b/src/urllib3/response.py similarity index 100% rename from urllib3/response.py rename to src/urllib3/response.py diff --git a/urllib3/util/__init__.py b/src/urllib3/util/__init__.py similarity index 100% rename from urllib3/util/__init__.py rename to src/urllib3/util/__init__.py diff --git a/urllib3/util/connection.py b/src/urllib3/util/connection.py similarity index 100% rename from urllib3/util/connection.py rename to src/urllib3/util/connection.py diff --git a/urllib3/util/queue.py b/src/urllib3/util/queue.py similarity index 100% rename from urllib3/util/queue.py rename to src/urllib3/util/queue.py diff --git a/urllib3/util/request.py b/src/urllib3/util/request.py similarity index 100% rename from urllib3/util/request.py rename to src/urllib3/util/request.py diff --git a/urllib3/util/response.py b/src/urllib3/util/response.py similarity index 100% rename from urllib3/util/response.py rename to src/urllib3/util/response.py diff --git a/urllib3/util/retry.py b/src/urllib3/util/retry.py similarity index 100% rename from urllib3/util/retry.py rename to src/urllib3/util/retry.py diff --git a/urllib3/util/ssl_.py b/src/urllib3/util/ssl_.py similarity index 100% rename from urllib3/util/ssl_.py rename to src/urllib3/util/ssl_.py diff --git a/urllib3/util/timeout.py b/src/urllib3/util/timeout.py similarity index 100% rename from urllib3/util/timeout.py rename to src/urllib3/util/timeout.py diff --git a/urllib3/util/url.py b/src/urllib3/util/url.py similarity index 100% rename from urllib3/util/url.py rename to src/urllib3/util/url.py diff --git a/urllib3/util/wait.py b/src/urllib3/util/wait.py similarity index 100% rename from urllib3/util/wait.py rename to src/urllib3/util/wait.py