Try once again in stapled, so lib is not a main module and does come …

…with the application.
greenhost · Nov 30, 2017 · 5ab0f5d · 5ab0f5d
1 parent d09c76b
commit 5ab0f5d
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "lib/certvalidator"]
-	path = lib/certvalidator
+	path = stapled/lib/certvalidator
 	url = https://github.com/wbond/certvalidator.git
 [submodule "lib/ocspbuilder"]
-	path = lib/ocspbuilder
+	path = stapled/lib/ocspbuilder
 	url = https://github.com/wbond/ocspbuilder.git
 [submodule "lib/asn1crypto"]
-	path = lib/asn1crypto
+	path = stapled/lib/asn1crypto
 	url = https://github.com/wbond/asn1crypto.git
 [submodule "lib/oscrypto"]
-	path = lib/oscrypto
+	path = stapled/lib/oscrypto
 	url = https://github.com/wbond/oscrypto.git
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -15,7 +15,7 @@
 import sys
 import sphinx_rtd_theme
 sys.path.insert(0, os.path.abspath('../..'))
-from lib import add_paths
+from stapled.lib import add_paths
 add_paths()
 
 # -- General configuration ------------------------------------------------

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import setup
 from setuptools import find_packages
 from stapled.version import __version__
-from lib import find_lib_paths, find_lib_path_dict
+from stapled.lib import find_lib_paths, find_lib_path_dict
 
 
 def all_packages():

diff --git a/stapled/__init__.py b/stapled/__init__.py
@@ -8,7 +8,7 @@
 import sys
 import os
 from stapled.version import __version__, __app_name__
-from lib import add_paths
+from stapled.lib import add_paths
 
 if add_paths():
     LOCAL_LIB_MODE = True

diff --git a/lib/__init__.py → stapled/lib/__init__.py b/lib/__init__.py → stapled/lib/__init__.py
diff --git a/lib/asn1crypto → stapled/lib/asn1crypto b/lib/asn1crypto → stapled/lib/asn1crypto
diff --git a/lib/certvalidator → stapled/lib/certvalidator b/lib/certvalidator → stapled/lib/certvalidator
diff --git a/lib/ocspbuilder → stapled/lib/ocspbuilder b/lib/ocspbuilder → stapled/lib/ocspbuilder
diff --git a/lib/oscrypto → stapled/lib/oscrypto b/lib/oscrypto → stapled/lib/oscrypto