Move project to src/ layout

68 files changed, 12 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 0b90429..3b7faab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 /build
 /dist
 /M2Crypto/*_m2crypto*.so
-/M2Crypto.egg-info
+M2Crypto.egg-info
 /.eggs/
 /EGG-INFO
 /tests/randpool.dat
diff --git a/setup.py b/setup.py
index 42eb589..38b5117 100644
--- a/setup.py
+++ b/setup.py
@@ -214,8 +214,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
         # distutils would be in the run phase, when extension name and path are
         # known.
         self.swig_opts.extend(['-outdir',
-                              os.path.join(os.getcwd(), 'M2Crypto')])
-        self.include_dirs.append(os.path.join(os.getcwd(), 'SWIG'))
+                              os.path.join(os.getcwd(), 'src', 'M2Crypto')])
+        self.include_dirs.append(os.path.join(os.getcwd(), 'src', 'SWIG'))
 
         if sys.platform == 'cygwin' and self.openssl is not None:
             # Cygwin SHOULD work (there's code in distutils), but
@@ -272,7 +272,7 @@ else:
     x_comp_args.update(['-DTHREADING', '-Wno-deprecated-declarations'])
 
 m2crypto = setuptools.Extension(name='M2Crypto._m2crypto',
-                                sources=['SWIG/_m2crypto.i'],
+                                sources=['src/SWIG/_m2crypto.i'],
                                 extra_compile_args=list(x_comp_args),
                                 # Uncomment to build Universal Mac binaries
                                 # extra_link_args =
@@ -294,9 +294,9 @@ class Clean(clean):
     def run(self):
         clean.run(self)
         garbage_list = [
-            os.path.join('M2Crypto', '*.so'),
-            os.path.join('M2Crypto', '*.pyd'),
-            os.path.join('M2Crypto', '*.dll')
+            os.path.join('src', 'M2Crypto', '*.so'),
+            os.path.join('src', 'M2Crypto', '*.pyd'),
+            os.path.join('src', 'M2Crypto', '*.dll')
         ]
         for p in garbage_list:
             for f in glob.glob(p):
@@ -305,7 +305,7 @@ class Clean(clean):
 
 
 def __get_version():  # noqa
-    with open('M2Crypto/__init__.py') as init_file:
+    with open('src/M2Crypto/__init__.py') as init_file:
         for line in init_file:
             if line.startswith('__version__ ='):
                 # Originally string.whitespace, but it is deprecated
@@ -352,11 +352,14 @@ setuptools.setup(
         'Programming Language :: Python :: 3.8',
     ],
     keywords='cryptography openssl',
-    packages=setuptools.find_packages(exclude=['contrib', 'docs', 'tests']),
+    packages=setuptools.find_packages('src', exclude=['contrib', 'docs', 'tests']),
+    package_dir={'': 'src'},
     ext_modules=[m2crypto],
     test_suite='tests.alltests.suite',
     install_requires=requires_list,
     package_data=package_data,
+    zip_safe=False,
+    include_package_data=True,
     cmdclass={
         'build_ext': _M2CryptoBuildExt,
         'build': _M2CryptoBuild,
diff --git a/M2Crypto/ASN1.py b/src/M2Crypto/ASN1.py
index 37fd7a0..37fd7a0 100644
--- a/M2Crypto/ASN1.py
+++ b/src/M2Crypto/ASN1.py
diff --git a/M2Crypto/AuthCookie.py b/src/M2Crypto/AuthCookie.py
index ff6df2b..ff6df2b 100644
--- a/M2Crypto/AuthCookie.py
+++ b/src/M2Crypto/AuthCookie.py
diff --git a/M2Crypto/BIO.py b/src/M2Crypto/BIO.py
index 090064b..090064b 100644
--- a/M2Crypto/BIO.py
+++ b/src/M2Crypto/BIO.py
diff --git a/M2Crypto/BN.py b/src/M2Crypto/BN.py
index 0d8c3b2..0d8c3b2 100644
--- a/M2Crypto/BN.py
+++ b/src/M2Crypto/BN.py
diff --git a/M2Crypto/DH.py b/src/M2Crypto/DH.py
index 38ea0d5..38ea0d5 100644
--- a/M2Crypto/DH.py
+++ b/src/M2Crypto/DH.py
diff --git a/M2Crypto/DSA.py b/src/M2Crypto/DSA.py
index d4f2073..d4f2073 100644
--- a/M2Crypto/DSA.py
+++ b/src/M2Crypto/DSA.py
diff --git a/M2Crypto/EC.py b/src/M2Crypto/EC.py
index 522092a..522092a 100644
--- a/M2Crypto/EC.py
+++ b/src/M2Crypto/EC.py
diff --git a/M2Crypto/EVP.py b/src/M2Crypto/EVP.py
index c48b670..c48b670 100644
--- a/M2Crypto/EVP.py
+++ b/src/M2Crypto/EVP.py
diff --git a/M2Crypto/Engine.py b/src/M2Crypto/Engine.py
index 46b76a4..46b76a4 100644
--- a/M2Crypto/Engine.py
+++ b/src/M2Crypto/Engine.py
diff --git a/M2Crypto/Err.py b/src/M2Crypto/Err.py
index dd55991..dd55991 100644
--- a/M2Crypto/Err.py
+++ b/src/M2Crypto/Err.py
diff --git a/M2Crypto/RC4.py b/src/M2Crypto/RC4.py
index 26e1079..26e1079 100644
--- a/M2Crypto/RC4.py
+++ b/src/M2Crypto/RC4.py
diff --git a/M2Crypto/RSA.py b/src/M2Crypto/RSA.py
index d6e5c64..d6e5c64 100644
--- a/M2Crypto/RSA.py
+++ b/src/M2Crypto/RSA.py
diff --git a/M2Crypto/Rand.py b/src/M2Crypto/Rand.py
index a178b1b..a178b1b 100644
--- a/M2Crypto/Rand.py
+++ b/src/M2Crypto/Rand.py
diff --git a/M2Crypto/SMIME.py b/src/M2Crypto/SMIME.py
index 1b7564a..1b7564a 100644
--- a/M2Crypto/SMIME.py
+++ b/src/M2Crypto/SMIME.py
diff --git a/M2Crypto/SSL/Checker.py b/src/M2Crypto/SSL/Checker.py
index 46d397a..46d397a 100644
--- a/M2Crypto/SSL/Checker.py
+++ b/src/M2Crypto/SSL/Checker.py
diff --git a/M2Crypto/SSL/Cipher.py b/src/M2Crypto/SSL/Cipher.py
index 06f2dbf..06f2dbf 100644
--- a/M2Crypto/SSL/Cipher.py
+++ b/src/M2Crypto/SSL/Cipher.py
diff --git a/M2Crypto/SSL/Connection.py b/src/M2Crypto/SSL/Connection.py
index c5693c9..c5693c9 100644
--- a/M2Crypto/SSL/Connection.py
+++ b/src/M2Crypto/SSL/Connection.py
diff --git a/M2Crypto/SSL/Context.py b/src/M2Crypto/SSL/Context.py
index d7cb7bc..d7cb7bc 100644
--- a/M2Crypto/SSL/Context.py
+++ b/src/M2Crypto/SSL/Context.py
diff --git a/M2Crypto/SSL/SSLServer.py b/src/M2Crypto/SSL/SSLServer.py
index a44c9c7..a44c9c7 100644
--- a/M2Crypto/SSL/SSLServer.py
+++ b/src/M2Crypto/SSL/SSLServer.py
diff --git a/M2Crypto/SSL/Session.py b/src/M2Crypto/SSL/Session.py
index c364d4e..c364d4e 100644
--- a/M2Crypto/SSL/Session.py
+++ b/src/M2Crypto/SSL/Session.py
diff --git a/M2Crypto/SSL/TwistedProtocolWrapper.py b/src/M2Crypto/SSL/TwistedProtocolWrapper.py
index 5e94503..5e94503 100644
--- a/M2Crypto/SSL/TwistedProtocolWrapper.py
+++ b/src/M2Crypto/SSL/TwistedProtocolWrapper.py
diff --git a/M2Crypto/SSL/__init__.py b/src/M2Crypto/SSL/__init__.py
index 33bf1b9..33bf1b9 100644
--- a/M2Crypto/SSL/__init__.py
+++ b/src/M2Crypto/SSL/__init__.py
diff --git a/M2Crypto/SSL/cb.py b/src/M2Crypto/SSL/cb.py
index 47f102e..47f102e 100644
--- a/M2Crypto/SSL/cb.py
+++ b/src/M2Crypto/SSL/cb.py
diff --git a/M2Crypto/SSL/ssl_dispatcher.py b/src/M2Crypto/SSL/ssl_dispatcher.py
index 73a4b82..73a4b82 100644
--- a/M2Crypto/SSL/ssl_dispatcher.py
+++ b/src/M2Crypto/SSL/ssl_dispatcher.py
diff --git a/M2Crypto/SSL/timeout.py b/src/M2Crypto/SSL/timeout.py
index 42b0291..42b0291 100644
--- a/M2Crypto/SSL/timeout.py
+++ b/src/M2Crypto/SSL/timeout.py
diff --git a/M2Crypto/X509.py b/src/M2Crypto/X509.py
index b27af13..b27af13 100644
--- a/M2Crypto/X509.py
+++ b/src/M2Crypto/X509.py
diff --git a/M2Crypto/__init__.py b/src/M2Crypto/__init__.py
index 4fc489f..4fc489f 100644
--- a/M2Crypto/__init__.py
+++ b/src/M2Crypto/__init__.py
diff --git a/M2Crypto/callback.py b/src/M2Crypto/callback.py
index c6f54d8..c6f54d8 100644
--- a/M2Crypto/callback.py
+++ b/src/M2Crypto/callback.py
diff --git a/M2Crypto/ftpslib.py b/src/M2Crypto/ftpslib.py
index e996981..e996981 100644
--- a/M2Crypto/ftpslib.py
+++ b/src/M2Crypto/ftpslib.py
diff --git a/M2Crypto/httpslib.py b/src/M2Crypto/httpslib.py
index 0deee64..0deee64 100644
--- a/M2Crypto/httpslib.py
+++ b/src/M2Crypto/httpslib.py
diff --git a/M2Crypto/m2.py b/src/M2Crypto/m2.py
index 81e4315..81e4315 100644
--- a/M2Crypto/m2.py
+++ b/src/M2Crypto/m2.py
diff --git a/M2Crypto/m2crypto.py b/src/M2Crypto/m2crypto.py
index 1323547..1323547 100644
--- a/M2Crypto/m2crypto.py
+++ b/src/M2Crypto/m2crypto.py
diff --git a/M2Crypto/m2urllib.py b/src/M2Crypto/m2urllib.py
index 06641b2..06641b2 100644
--- a/M2Crypto/m2urllib.py
+++ b/src/M2Crypto/m2urllib.py
diff --git a/M2Crypto/m2urllib2.py b/src/M2Crypto/m2urllib2.py
index 1849051..1849051 100644
--- a/M2Crypto/m2urllib2.py
+++ b/src/M2Crypto/m2urllib2.py
diff --git a/M2Crypto/m2xmlrpclib.py b/src/M2Crypto/m2xmlrpclib.py
index 8d8aa3e..8d8aa3e 100644
--- a/M2Crypto/m2xmlrpclib.py
+++ b/src/M2Crypto/m2xmlrpclib.py
diff --git a/M2Crypto/six.py b/src/M2Crypto/six.py
index 83f6978..83f6978 100644
--- a/M2Crypto/six.py
+++ b/src/M2Crypto/six.py
diff --git a/M2Crypto/threading.py b/src/M2Crypto/threading.py
index f9f2683..f9f2683 100644
--- a/M2Crypto/threading.py
+++ b/src/M2Crypto/threading.py
diff --git a/M2Crypto/util.py b/src/M2Crypto/util.py
index 97f5d29..97f5d29 100644
--- a/M2Crypto/util.py
+++ b/src/M2Crypto/util.py
diff --git a/SWIG/Makefile b/src/SWIG/Makefile
index 9a3bd56..9a3bd56 100644
--- a/SWIG/Makefile
+++ b/src/SWIG/Makefile
diff --git a/SWIG/_aes.i b/src/SWIG/_aes.i
index ea36167..ea36167 100644
--- a/SWIG/_aes.i
+++ b/src/SWIG/_aes.i
diff --git a/SWIG/_asn1.i b/src/SWIG/_asn1.i
index b51b33f..b51b33f 100644
--- a/SWIG/_asn1.i
+++ b/src/SWIG/_asn1.i
diff --git a/SWIG/_bio.i b/src/SWIG/_bio.i
index 84b76b3..84b76b3 100644
--- a/SWIG/_bio.i
+++ b/src/SWIG/_bio.i
diff --git a/SWIG/_bn.i b/src/SWIG/_bn.i
index 18dc154..18dc154 100644
--- a/SWIG/_bn.i
+++ b/src/SWIG/_bn.i
diff --git a/SWIG/_dh.i b/src/SWIG/_dh.i
index 398f418..398f418 100644
--- a/SWIG/_dh.i
+++ b/src/SWIG/_dh.i
diff --git a/SWIG/_dsa.i b/src/SWIG/_dsa.i
index 2c15c4f..2c15c4f 100644
--- a/SWIG/_dsa.i
+++ b/src/SWIG/_dsa.i
diff --git a/SWIG/_ec.i b/src/SWIG/_ec.i
index f47d593..f47d593 100644
--- a/SWIG/_ec.i
+++ b/src/SWIG/_ec.i
diff --git a/SWIG/_engine.i b/src/SWIG/_engine.i
index 4ba93f3..4ba93f3 100644
--- a/SWIG/_engine.i
+++ b/src/SWIG/_engine.i
diff --git a/SWIG/_evp.i b/src/SWIG/_evp.i
index 758f11b..758f11b 100644
--- a/SWIG/_evp.i
+++ b/src/SWIG/_evp.i
diff --git a/SWIG/_lib.h b/src/SWIG/_lib.h
index f1973b4..f1973b4 100644
--- a/SWIG/_lib.h
+++ b/src/SWIG/_lib.h
diff --git a/SWIG/_lib.i b/src/SWIG/_lib.i
index 954e99b..954e99b 100644
--- a/SWIG/_lib.i
+++ b/src/SWIG/_lib.i
diff --git a/SWIG/_lib11_compat.i b/src/SWIG/_lib11_compat.i
index 1ec42dd..1ec42dd 100644
--- a/SWIG/_lib11_compat.i
+++ b/src/SWIG/_lib11_compat.i
diff --git a/SWIG/_m2crypto.def b/src/SWIG/_m2crypto.def
index 3e9d5bc..3e9d5bc 100644
--- a/SWIG/_m2crypto.def
+++ b/src/SWIG/_m2crypto.def
diff --git a/SWIG/_m2crypto.i b/src/SWIG/_m2crypto.i
index e300a10..e300a10 100644
--- a/SWIG/_m2crypto.i
+++ b/src/SWIG/_m2crypto.i
diff --git a/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c
index 6ed5429..6ed5429 100644
--- a/SWIG/_m2crypto_wrap.c
+++ b/src/SWIG/_m2crypto_wrap.c
diff --git a/SWIG/_objects.i b/src/SWIG/_objects.i
index b389d7f..b389d7f 100644
--- a/SWIG/_objects.i
+++ b/src/SWIG/_objects.i
diff --git a/SWIG/_pkcs7.i b/src/SWIG/_pkcs7.i
index d1fddfb..d1fddfb 100644
--- a/SWIG/_pkcs7.i
+++ b/src/SWIG/_pkcs7.i
diff --git a/SWIG/_py3k_compat.i b/src/SWIG/_py3k_compat.i
index 7c90bb4..7c90bb4 100644
--- a/SWIG/_py3k_compat.i
+++ b/src/SWIG/_py3k_compat.i
diff --git a/SWIG/_rand.i b/src/SWIG/_rand.i
index 01ab4ef..01ab4ef 100644
--- a/SWIG/_rand.i
+++ b/src/SWIG/_rand.i
diff --git a/SWIG/_rc4.i b/src/SWIG/_rc4.i
index eb4747e..eb4747e 100644
--- a/SWIG/_rc4.i
+++ b/src/SWIG/_rc4.i
diff --git a/SWIG/_rsa.i b/src/SWIG/_rsa.i
index 4ffae01..4ffae01 100644
--- a/SWIG/_rsa.i
+++ b/src/SWIG/_rsa.i
diff --git a/SWIG/_ssl.i b/src/SWIG/_ssl.i
index 4f723ea..4f723ea 100644
--- a/SWIG/_ssl.i
+++ b/src/SWIG/_ssl.i
diff --git a/SWIG/_threads.i b/src/SWIG/_threads.i
index 69adb9f..69adb9f 100644
--- a/SWIG/_threads.i
+++ b/src/SWIG/_threads.i
diff --git a/SWIG/_util.i b/src/SWIG/_util.i
index bc2ee61..bc2ee61 100644
--- a/SWIG/_util.i
+++ b/src/SWIG/_util.i
diff --git a/SWIG/_x509.i b/src/SWIG/_x509.i
index b6334df..b6334df 100644
--- a/SWIG/_x509.i
+++ b/src/SWIG/_x509.i
diff --git a/SWIG/libcrypto-compat.h b/src/SWIG/libcrypto-compat.h
index 7c4c913..7c4c913 100644
--- a/SWIG/libcrypto-compat.h
+++ b/src/SWIG/libcrypto-compat.h
diff --git a/SWIG/py3k_compat.h b/src/SWIG/py3k_compat.h
index 2e914a5..2e914a5 100644
--- a/SWIG/py3k_compat.h
+++ b/src/SWIG/py3k_compat.h