sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

2021.4 #19

Merged
edraft merged 237 commits from 2021.4 into master 2021-04-01 10:13:33 +02:00
Conversation 0 Commits 237 Files Changed 325 +35 -30
19 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e33a8a773 - Show all commits

25
.idea/workspace.xml
View File

@ -22,8 +22,9 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Added publish logic"> <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Bugfixes in build process">
<change beforePath="$PROJECT_DIR$/src/cpl_cli/templates/build/init.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/templates/build/init.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -462,13 +463,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1605881914521</updated> <updated>1605881914521</updated>
</task> </task>
<task id="LOCAL-00054" summary="Improved publish process">
<created>1608137669182</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1608137669182</updated>
</task>
<task id="LOCAL-00055" summary="Added publish command to cli"> <task id="LOCAL-00055" summary="Added publish command to cli">
<created>1608138851088</created> <created>1608138851088</created>
<option name="number" value="00055" /> <option name="number" value="00055" />
@ -805,7 +799,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1615231748656</updated> <updated>1615231748656</updated>
</task> </task>
<option name="localTasksCounter" value="103" /> <task id="LOCAL-00103" summary="Bugfixes in build process">
<created>1615231794961</created>
<option name="number" value="00103" />
<option name="presentableId" value="LOCAL-00103" />
<option name="project" value="LOCAL" />
<updated>1615231794961</updated>
</task>
<option name="localTasksCounter" value="104" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -821,7 +822,6 @@
<option name="oldMeFiltersMigrated" value="true" /> <option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Improved tests" />
<MESSAGE value="Bugfixes and improved tests" /> <MESSAGE value="Bugfixes and improved tests" />
<MESSAGE value="Removed unused packages" /> <MESSAGE value="Removed unused packages" />
<MESSAGE value="Removed publish package" /> <MESSAGE value="Removed publish package" />
@ -846,7 +846,8 @@
<MESSAGE value="Fixed output when console is spinning" /> <MESSAGE value="Fixed output when console is spinning" />
<MESSAGE value="Added argument handling to spinner" /> <MESSAGE value="Added argument handling to spinner" />
<MESSAGE value="Added publish logic" /> <MESSAGE value="Added publish logic" />
<option name="LAST_COMMIT_MESSAGE" value="Added publish logic" /> <MESSAGE value="Bugfixes in build process" />
<option name="LAST_COMMIT_MESSAGE" value="Bugfixes in build process" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

2
src/cpl/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl' __title__ = 'sh_cpl.cpl'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/application/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.application' __title__ = 'cpl.application'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/configuration/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.configuration' __title__ = 'cpl.configuration'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/console/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.console' __title__ = 'cpl.console'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/database/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.database' __title__ = 'cpl.database'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/database/connection/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.database.connection' __title__ = 'cpl.database.connection'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/database/context/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.database.context' __title__ = 'cpl.database.context'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/dependency_injection/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.dependency_injection' __title__ = 'cpl.dependency_injection'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/environment/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.environment' __title__ = 'cpl.environment'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/logging/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.logging' __title__ = 'cpl.logging'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/mailing/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.mailing' __title__ = 'cpl.mailing'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/time/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.time' __title__ = 'cpl.time'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl/utils/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl.utils' __title__ = 'cpl.utils'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl_cli/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl_cli' __title__ = 'sh_cpl.cpl_cli'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl_cli/command/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl_cli.command' __title__ = 'cpl_cli.command'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl_cli/configuration/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl_cli.configuration' __title__ = 'cpl_cli.configuration'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

2
src/cpl_cli/publish/__init__.py
View File

@ -11,7 +11,7 @@ sh-edraft Common Python library
""" """
__title__ = 'src.cpl_cli.publish' __title__ = 'cpl_cli.publish'
__author__ = 'Sven Heidemann' __author__ = 'Sven Heidemann'
__license__ = 'MIT' __license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 sh-edraft.de' __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

6
src/cpl_cli/publish/publisher.py
View File

@ -38,6 +38,9 @@ class Publisher(PublisherABC):
@staticmethod @staticmethod
def _get_module_name_from_dirs(file: str) -> str: def _get_module_name_from_dirs(file: str) -> str:
if 'src/' in file:
file = file.replace('src/', '')
dirs = os.path.dirname(file).split('/') dirs = os.path.dirname(file).split('/')
for d in dirs: for d in dirs:
if d.__contains__('.'): if d.__contains__('.'):
@ -225,7 +228,8 @@ class Publisher(PublisherABC):
setup_string = stringTemplate(template_string).substitute( setup_string = stringTemplate(template_string).substitute(
Name=self._project_settings.name, Name=self._project_settings.name,
Version=self._project_settings.version.to_str(), Version=self._project_settings.version.to_str(),
Packages=setuptools.find_packages(where=self._build_settings.source_path, exclude=self._build_settings.excluded), Packages=setuptools.find_packages(where=self._build_settings.source_path,
exclude=self._build_settings.excluded),
URL=self._project_settings.url, URL=self._project_settings.url,
LicenseName=self._project_settings.license_name, LicenseName=self._project_settings.license_name,
Author=self._project_settings.author, Author=self._project_settings.author,