2021.4 #19

Merged
edraft merged 237 commits from 2021.4 into master 2021-04-01 10:13:33 +02:00
5 changed files with 61 additions and 58 deletions
Showing only changes of commit 1bbbb2d8e1 - Show all commits

View File

@ -22,9 +22,12 @@
<select />
</component>
<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$/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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -74,7 +77,7 @@
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" 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" />
</component>
<component name="ReaderModeSettings">
@ -463,13 +466,6 @@
<option name="presentableId" value="Default" />
<updated>1605881914521</updated>
</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">
<created>1608139067953</created>
<option name="number" value="00057" />
@ -806,7 +802,14 @@
<option name="project" value="LOCAL" />
<updated>1615231929106</updated>
</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 />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -822,7 +825,6 @@
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Bugfixes and improved tests" />
<MESSAGE value="Removed unused packages" />
<MESSAGE value="Removed publish package" />
<MESSAGE value="Refactored code" />
@ -847,7 +849,8 @@
<MESSAGE value="Added argument handling to spinner" />
<MESSAGE value="Added publish logic" />
<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 name="XDebuggerManager">
<breakpoint-manager>

View File

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

View File

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

View File

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

View File

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