Fixed async init error & Fixed pip install

This commit is contained in:
Sven Heidemann 2022-07-14 16:29:08 +02:00
parent c0be380f69
commit 2ab1576230
29 changed files with 60 additions and 69 deletions

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -28,4 +28,4 @@ from .main import main
from .startup import Startup
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.build'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.generate'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.console'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.console.source'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.console.source.name'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -33,8 +33,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent(f"""\
@ -94,8 +93,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent(f"""\
@ -149,8 +147,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent("""\
@ -215,8 +212,7 @@ class MainWithDependencyInjection(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent("""\

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.console.source.tests'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.library'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.library.source'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.library.source.name'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -33,8 +33,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent(f"""\
@ -95,8 +94,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent(f"""\
@ -147,8 +145,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent("""\
@ -210,8 +207,7 @@ class MainWithDependencyInjection(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent("""\

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.library.source.tests'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.unittest'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.unittest.source'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.new.unittest.source.name'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -31,8 +31,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
if __name__ == '__main__':
ml = asyncio.get_event_loop()
ml.run_until_complete(main())
asyncio.run(main())
""")
else:
self._value = textwrap.dedent(f"""\

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli._templates.publish'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -29,4 +29,4 @@ from .publish_service import PublishService
from .version_service import VersionService
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings
from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -4,7 +4,7 @@
"Version": {
"Major": "2022",
"Minor": "7",
"Micro": "0"
"Micro": "0.post1"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.live_server'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC
from .publisher_service import PublisherService
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.source_creator'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -15,7 +15,7 @@ __title__ = 'cpl_cli.validators'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.7.0'
__version__ = '2022.7.0.post1'
from collections import namedtuple
@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='7', micro='0')
version_info = VersionInfo(major='2022', minor='7', micro='0.post1')

View File

@ -121,11 +121,11 @@ class Pip:
for arg in args:
pip_args.append(arg)
pip_args.append(package)
if source is not None:
pip_args.append(f'--extra-index-url')
pip_args.append(source)
pip_args.append(package)
subprocess.run(pip_args, stdout=stdout, stderr=stderr, env=cls._env)
@classmethod

View File

@ -31,8 +31,8 @@
"ProjectType": "library",
"SourcePath": "",
"OutputPath": "../../dist",
"Main": "cpl_translation.main",
"EntryPoint": "cpl-translation",
"Main": "",
"EntryPoint": "n",
"IncludePackageData": false,
"Included": [],
"Excluded": [