Simplify package structure

Dockerfile

@@ -54,10 +54,10 @@ COPY supervisor/components/ ${TFW_SUPERVISORD_COMPONENTS}
 COPY nginx/nginx.conf ${TFW_NGINX_CONF}
 COPY nginx/default.conf ${TFW_NGINX_DEFAULT}
 COPY nginx/components/ ${TFW_NGINX_COMPONENTS}
-COPY lib ${TFW_LIB_DIR}/
+COPY tfw ${TFW_LIB_DIR}/tfw
 COPY supervisor/tfw_server.py ${TFW_SERVER_DIR}/
 
-RUN for dir in "${TFW_LIB_DIR}"/{tfw,tao,envvars} "/etc/nginx" "/etc/supervisor"; do \
+RUN for dir in "${TFW_LIB_DIR}"/tfw "/etc/nginx" "/etc/supervisor"; do \
         chown -R root:root "$dir" && chmod -R 700 "$dir";                            \
     done
 
@@ -70,7 +70,7 @@ ONBUILD COPY ${BUILD_CONTEXT}/supervisor/ ${TFW_SUPERVISORD_COMPONENTS}
 ONBUILD RUN for f in "${TFW_NGINX_DEFAULT}" ${TFW_NGINX_COMPONENTS}/*.conf; do                               \
                 envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" < $f > $f~ && mv $f~ $f ;\
             done
-ONBUILD VOLUME ["/etc/nginx", "/var/lib/nginx", "/var/log/nginx", "${TFW_LIB_DIR}/envvars", "${TFW_LIB_DIR}/tfw"]
+ONBUILD VOLUME ["/etc/nginx", "/var/lib/nginx", "/var/log/nginx", "${TFW_LIB_DIR}/tfw"]
 
 ONBUILD COPY ${BUILD_CONTEXT}/frontend /data/
 ONBUILD RUN test -z "${NOFRONTEND}" && cd /data && yarn install --frozen-lockfile || :

lib/tao/config/__init__.py

@@ -1 +0,0 @@
-from .envvars import TAOENV

lib/tao/config/envvars.py

@@ -1,3 +0,0 @@
-from envvars import LazyEnvironment
-
-TAOENV = LazyEnvironment('AVATAO_', 'taoenvtuple').environment

lib/tfw/config/__init__.py

@@ -1 +0,0 @@
-from .envvars import TFWENV

lib/tfw/config/envvars.py

@@ -1,3 +0,0 @@
-from envvars import LazyEnvironment
-
-TFWENV = LazyEnvironment('TFW_', 'tfwenvtuple').environment

setup.py

@@ -1,6 +1,6 @@
 from os.path import dirname, realpath, join
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 here = dirname(realpath(__file__))
 
@@ -10,20 +10,20 @@ with open(join(here, 'requirements.txt'), 'r') as ifile:
     requirements = ifile.read().splitlines()
 
 setup(
-    name = 'tfw',
-    version = version,
-    description = 'Avatao tutorial-framework',
-    url = 'https://github.com/avatao-content/baseimage-tutorial-framework',
-    author = 'Avatao.com Innovative Learning Kft.',
-    author_email = 'support@avatao.com',
-    license = 'custom',
-    packages = find_packages('lib'),
-    package_dir = {'': 'lib'},
-    install_requires = requirements,
-    extras_require = {
+    name='tfw',
+    version=version,
+    description='Avatao tutorial-framework',
+    url='https://github.com/avatao-content/baseimage-tutorial-framework',
+    author='Avatao.com Innovative Learning Kft.',
+    author_email='support@avatao.com',
+    license='custom',
+    packages=['tfw'],
+    package_dir={'tfw': 'tfw'},
+    install_requires=requirements,
+    extras_require={
         'docs': [
             'sphinx >= 1.7.0',
         ],
     },
-    zip_safe = False,
+    zip_safe=False,
 )

tfw/config/__init__.py

@@ -0,0 +1 @@
+from .envvars import TFWENV, TAOENV

tfw/config/envvars.py

@@ -0,0 +1,5 @@
+from .lazy_environment import LazyEnvironment
+
+
+TFWENV = LazyEnvironment('TFW_', 'tfwenvtuple').environment
+TAOENV = LazyEnvironment('AVATAO_', 'taoenvtuple').environment