From 67de329f157b97a2eef5f7b0987c5c2ac38644af Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 2 May 2020 14:37:42 +0200
Subject: [PATCH] split flask and base utils
---
TheCodeLabs_BaseUtils/README.md | 2 +-
.../TheCodeLabs_BaseUtils/DefaultLogger.py | 2 +-
.../TheCodeLabs_BaseUtils/__init__.py | 2 +-
TheCodeLabs_BaseUtils/setup.py | 2 +-
TheCodeLabs_FlaskUtils/LICENSE.txt | 21 ++++++++++++++
TheCodeLabs_FlaskUtils/README.md | 3 ++
.../TheCodeLabs_FlaskUtils}/FlaskBaseApp.py | 0
.../TheCodeLabs_FlaskUtils/__init__.py | 1 +
TheCodeLabs_FlaskUtils/setup.cfg | 2 ++
TheCodeLabs_FlaskUtils/setup.py | 28 +++++++++++++++++++
10 files changed, 59 insertions(+), 4 deletions(-)
create mode 100644 TheCodeLabs_FlaskUtils/LICENSE.txt
create mode 100644 TheCodeLabs_FlaskUtils/README.md
rename {TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils => TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils}/FlaskBaseApp.py (100%)
create mode 100644 TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils/__init__.py
create mode 100644 TheCodeLabs_FlaskUtils/setup.cfg
create mode 100644 TheCodeLabs_FlaskUtils/setup.py
diff --git a/TheCodeLabs_BaseUtils/README.md b/TheCodeLabs_BaseUtils/README.md
index 72a78af..19464c4 100644
--- a/TheCodeLabs_BaseUtils/README.md
+++ b/TheCodeLabs_BaseUtils/README.md
@@ -1,3 +1,3 @@
-# PythonLibs
+# TheCodeLabs-BaseUtils
Useful python classes.
\ No newline at end of file
diff --git a/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/DefaultLogger.py b/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/DefaultLogger.py
index c83cdbb..8edccd0 100644
--- a/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/DefaultLogger.py
+++ b/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/DefaultLogger.py
@@ -15,7 +15,7 @@ class DefaultLogger:
logger = logging.getLogger(appName)
if logging.getLogger(appName).hasHandlers():
logger.debug(f'Skipping initialization of logger "{appName}" as it is already configured.')
- return
+ return logger
return cls.configure_logger(logger, logLevel, logFormat, dateFormat)
diff --git a/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/__init__.py b/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/__init__.py
index fd083e2..7b5c839 100644
--- a/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/__init__.py
+++ b/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/__init__.py
@@ -1,4 +1,4 @@
-from TheCodeLabs_BaseUtils.DefaultLogger import DefaultLogger
+from TheCodeLabsBaseUtils.DefaultLogger import DefaultLogger
from TheCodeLabs_BaseUtils.MailHandler import MailHandler
from TheCodeLabs_BaseUtils.CachedService import CachedService
from TheCodeLabs_BaseUtils.FlaskBaseApp import FlaskBaseApp
diff --git a/TheCodeLabs_BaseUtils/setup.py b/TheCodeLabs_BaseUtils/setup.py
index ddb48ef..ae6c7b7 100644
--- a/TheCodeLabs_BaseUtils/setup.py
+++ b/TheCodeLabs_BaseUtils/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
setup(
name='TheCodeLabs-BaseUtils',
- packages=['TheCodeLabs-BaseUtils'],
+ packages=['TheCodeLabs_BaseUtils'],
version='1.0.0',
license='MIT',
description='Useful python classes',
diff --git a/TheCodeLabs_FlaskUtils/LICENSE.txt b/TheCodeLabs_FlaskUtils/LICENSE.txt
new file mode 100644
index 0000000..63b4b68
--- /dev/null
+++ b/TheCodeLabs_FlaskUtils/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/TheCodeLabs_FlaskUtils/README.md b/TheCodeLabs_FlaskUtils/README.md
new file mode 100644
index 0000000..179e614
--- /dev/null
+++ b/TheCodeLabs_FlaskUtils/README.md
@@ -0,0 +1,3 @@
+# TheCodeLabs-FlaskUtils
+
+Useful python classes for flask environments.
\ No newline at end of file
diff --git a/TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/FlaskBaseApp.py b/TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils/FlaskBaseApp.py
similarity index 100%
rename from TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/FlaskBaseApp.py
rename to TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils/FlaskBaseApp.py
diff --git a/TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils/__init__.py b/TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils/__init__.py
new file mode 100644
index 0000000..490c0f6
--- /dev/null
+++ b/TheCodeLabs_FlaskUtils/TheCodeLabs_FlaskUtils/__init__.py
@@ -0,0 +1 @@
+from TheCodeLabs_Flask.FlaskBaseApp import FlaskBaseApp
diff --git a/TheCodeLabs_FlaskUtils/setup.cfg b/TheCodeLabs_FlaskUtils/setup.cfg
new file mode 100644
index 0000000..224a779
--- /dev/null
+++ b/TheCodeLabs_FlaskUtils/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
\ No newline at end of file
diff --git a/TheCodeLabs_FlaskUtils/setup.py b/TheCodeLabs_FlaskUtils/setup.py
new file mode 100644
index 0000000..2367b95
--- /dev/null
+++ b/TheCodeLabs_FlaskUtils/setup.py
@@ -0,0 +1,28 @@
+from setuptools import setup
+
+setup(
+ name='TheCodeLabs-FlaskUtils',
+ packages=['TheCodeLabs_FlaskUtils'],
+ version='1.0.0',
+ license='MIT',
+ description='Useful python classes',
+ author='TheCodeLabs',
+ author_email='spam@thecodelabs.de',
+ url='https://thecodelabs.de/TheCodeLabs/PythonLibs',
+ download_url='https://pypi.thecodedev.de',
+ keywords=[],
+ install_requires=[
+ 'flask',
+ 'gevent'
+ ],
+ setup_requires=[
+ 'wheel'
+ ],
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+ 'Topic :: Software Development :: Build Tools',
+ 'License :: OSI Approved :: MIT License',
+ 'Programming Language :: Python :: 3.7'
+ ]
+)
--
GitLab