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.1 #11

Merged
edraft merged 172 commits from 2021.04.01 into 2021.04 2021-03-21 20:04:24 +01:00
Conversation 1 Commits 172 Files Changed 269 +61 -58
5 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1bbbb2d8e1 - Show all commits

27
.idea/workspace.xml
View File

@ -22,9 +22,12 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Bugfixes in build process"> <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Changed copyright date">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cpl.json" beforeDir="false" afterPath="$PROJECT_DIR$/cpl.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cpl.json" beforeDir="false" afterPath="$PROJECT_DIR$/cpl.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/build_settings_name.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/build_settings_name.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/project_settings_name.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/project_settings_name.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/version_settings_name.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/version_settings_name.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" />
@ -74,7 +77,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../sh_python_line_counter" />
<property name="settings.editor.selected.configurable" value="editing.templates" /> <property name="settings.editor.selected.configurable" value="editing.templates" />
</component> </component>
<component name="ReaderModeSettings"> <component name="ReaderModeSettings">
@ -463,13 +466,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1605881914521</updated> <updated>1605881914521</updated>
</task> </task>
<task id="LOCAL-00056" summary="Added imports to cli module">
<created>1608138986801</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1608138986801</updated>
</task>
<task id="LOCAL-00057" summary="Improved help command"> <task id="LOCAL-00057" summary="Improved help command">
<created>1608139067953</created> <created>1608139067953</created>
<option name="number" value="00057" /> <option name="number" value="00057" />
@ -806,7 +802,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1615231929106</updated> <updated>1615231929106</updated>
</task> </task>
<option name="localTasksCounter" value="105" /> <task id="LOCAL-00105" summary="Changed copyright date">
<created>1615232454844</created>
<option name="number" value="00105" />
<option name="presentableId" value="LOCAL-00105" />
<option name="project" value="LOCAL" />
<updated>1615232454844</updated>
</task>
<option name="localTasksCounter" value="106" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -822,7 +825,6 @@
<option name="oldMeFiltersMigrated" value="true" /> <option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<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" />
<MESSAGE value="Refactored code" /> <MESSAGE value="Refactored code" />
@ -847,7 +849,8 @@
<MESSAGE value="Added argument handling to spinner" /> <MESSAGE value="Added argument handling to spinner" />
<MESSAGE value="Added publish logic" /> <MESSAGE value="Added publish logic" />
<MESSAGE value="Bugfixes in build process" /> <MESSAGE value="Bugfixes in build process" />
<option name="LAST_COMMIT_MESSAGE" value="Bugfixes in build process" /> <MESSAGE value="Changed copyright date" />
<option name="LAST_COMMIT_MESSAGE" value="Changed copyright date" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

46
cpl.json
View File

@ -1,21 +1,21 @@
{ {
"ProjectSettings": { "ProjectSettings": {
"name": "sh_cpl", "Name": "sh_cpl",
"version": { "Version": {
"major": "2021", "Major": "2021",
"minor": "04", "Minor": "04",
"micro": "01" "Micro": "01"
}, },
"author": "Sven Heidemann", "Author": "Sven Heidemann",
"authorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"description": "sh-edraft Common Python library", "Description": "sh-edraft Common Python library",
"longDescription": "sh-edraft Common Python library", "LongDescription": "sh-edraft Common Python library",
"url": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"copyrightDate": "2020 - 2021", "CopyrightDate": "2020 - 2021",
"copyrightName": "sh-edraft.de", "CopyrightName": "sh-edraft.de",
"licenseName": "MIT", "LicenseName": "MIT",
"licenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"dependencies": [ "Dependencies": [
"discord.py", "discord.py",
"mysql-connector", "mysql-connector",
"SQLAlchemy", "SQLAlchemy",
@ -24,18 +24,18 @@
"tabulate", "tabulate",
"smtplib" "smtplib"
], ],
"pythonVersion": ">=3.8" "PythonVersion": ">=3.8"
}, },
"BuildSettings": { "BuildSettings": {
"sourcePath": "src/cpl", "SourcePath": "src/cpl",
"outputPath": "dist", "OutputPath": "dist",
"main": "cpl_cli.main", "Main": "cpl_cli.main",
"entryPoint": "cpl", "EntryPoint": "cpl",
"includePackageData": "False", "IncludePackageData": "False",
"included": [ "Included": [
"src/cpl_cli" "src/cpl_cli"
], ],
"excluded": [ "Excluded": [
"*/__pycache__", "*/__pycache__",
"*/logs" "*/logs"
] ]

14
src/cpl_cli/configuration/build_settings_name.py
View File

@ -3,10 +3,10 @@ from enum import Enum
class BuildSettingsName(Enum): class BuildSettingsName(Enum):
sourcePath = 'sourcePath' sourcePath = 'SourcePath'
outputPath = 'outputPath' outputPath = 'OutputPath'
main = 'main' main = 'Main'
entry_point = 'entryPoint' entry_point = 'EntryPoint'
include_package_data = 'includePackageData' include_package_data = 'IncludePackageData'
included = 'included' included = 'Included'
excluded = 'excluded' excluded = 'Excluded'

26
src/cpl_cli/configuration/project_settings_name.py
View File

@ -3,16 +3,16 @@ from enum import Enum
class ProjectSettingsName(Enum): class ProjectSettingsName(Enum):
name = 'name' name = 'Name'
version = 'version' version = 'Version'
author = 'author' author = 'Author'
author_email = 'authorEmail' author_email = 'AuthorEmail'
description = 'description' description = 'Description'
long_description = 'longDescription' long_description = 'LongDescription'
url = 'url' url = 'URL'
copyright_date = 'copyrightDate' copyright_date = 'CopyrightDate'
copyright_name = 'copyrightName' copyright_name = 'CopyrightName'
license_name = 'licenseName' license_name = 'LicenseName'
license_description = 'licenseDescription' license_description = 'LicenseDescription'
dependencies = 'dependencies' dependencies = 'Dependencies'
python_version = 'pythonVersion' python_version = 'PythonVersion'

6
src/cpl_cli/configuration/version_settings_name.py
View File

@ -3,6 +3,6 @@ from enum import Enum
class VersionSettingsName(Enum): class VersionSettingsName(Enum):
major = 'major' major = 'Major'
minor = 'minor' minor = 'Minor'
micro = 'micro' micro = 'Micro'