src/cpl_discord/application/__init__.py

@@ -21,7 +21,6 @@ from collections import namedtuple
 
 
 # imports
-from .discord_bot_application_abc import DiscordBotApplicationABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='7', micro='0')

src/cpl_discord/command/__init__.py

@@ -21,8 +21,6 @@ from collections import namedtuple
 
 
 # imports:
-from .discord_command_abc import DiscordCommandABC
-from .discord_commands_meta import DiscordCogMeta
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='7', micro='0')

src/cpl_discord/configuration/__init__.py

@@ -21,7 +21,6 @@ from collections import namedtuple
 
 
 # imports
-from .discord_bot_settings import DiscordBotSettings
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='7', micro='0')

src/cpl_discord/cpl-discord.json

@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.7.0.post1",
+      "cpl-core>=2022.7.0",
       "discord.py==1.7.3",
       "cpl-query==2022.6.0"
     ],
@@ -33,8 +33,8 @@
     "ProjectType": "library",
     "SourcePath": "",
     "OutputPath": "../../dist",
-    "Main": "",
-    "EntryPoint": "",
+    "Main": "cpl_discord.main",
+    "EntryPoint": "cpl-discord",
     "IncludePackageData": false,
     "Included": [],
     "Excluded": [

src/cpl_discord/events/__init__.py

@@ -21,55 +21,6 @@ from collections import namedtuple
 
 
 # imports:
-from .on_bulk_message_delete_abc import OnBulkMessageDeleteABC
-from .on_command_abc import OnCommandABC
-from .on_command_completion_abc import OnCommandCompletionABC
-from .on_command_error_abc import OnCommandErrorABC
-from .on_connect_abc import OnConnectABC
-from .on_disconnect_abc import OnDisconnectABC
-from .on_group_join_abc import OnGroupJoinABC
-from .on_group_remove_abc import OnGroupRemoveABC
-from .on_guild_available_abc import OnGuildAvailableABC
-from .on_guild_channel_create_abc import OnGuildChannelCreateABC
-from .on_guild_channel_delete_abc import OnGuildChannelDeleteABC
-from .on_guild_channel_pins_update_abc import OnGuildChannelPinsUpdateABC
-from .on_guild_channel_update_abc import OnGuildChannelUpdateABC
-from .on_guild_emojis_update_abc import OnGuildEmojisUpdateABC
-from .on_guild_integrations_update_abc import OnGuildIntegrationsUpdateABC
-from .on_guild_join_abc import OnGuildJoinABC
-from .on_guild_remove_abc import OnGuildRemoveABC
-from .on_guild_role_create_abc import OnGuildRoleCreateABC
-from .on_guild_role_delete_abc import OnGuildRoleDeleteABC
-from .on_guild_role_update_abc import OnGuildRoleUpdateABC
-from .on_guild_unavailable_abc import OnGuildUnavailableABC
-from .on_guild_update_abc import OnGuildUpdateABC
-from .on_invite_create_abc import OnInviteCreateABC
-from .on_invite_delete_abc import OnInviteDeleteABC
-from .on_member_ban_abc import OnMemberBanABC
-from .on_member_join_abc import OnMemberJoinABC
-from .on_member_remove_abc import OnMemberRemoveABC
-from .on_member_unban_abc import OnMemberUnbanABC
-from .on_member_update_abc import OnMemberUpdateABC
-from .on_message_abc import OnMessageABC
-from .on_message_delete_abc import OnMessageDeleteABC
-from .on_message_edit_abc import OnMessageEditABC
-from .on_private_channel_create_abc import OnPrivateChannelCreateABC
-from .on_private_channel_delete_abc import OnPrivateChannelDeleteABC
-from .on_private_channel_pins_update_abc import OnPrivateChannelPinsUpdateABC
-from .on_private_channel_update_abc import OnPrivateChannelUpdateABC
-from .on_reaction_add_abc import OnReactionAddABC
-from .on_reaction_clear_abc import OnReactionClearABC
-from .on_reaction_clear_emoji_abc import OnReactionClearEmojiABC
-from .on_reaction_remove_abc import OnReactionRemoveABC
-from .on_ready_abc import OnReadyABC
-from .on_relationship_add_abc import OnRelationshipAddABC
-from .on_relationship_remove_abc import OnRelationshipRemoveABC
-from .on_relationship_update_abc import OnRelationshipUpdateABC
-from .on_resume_abc import OnResumeABC
-from .on_typing_abc import OnTypingABC
-from .on_user_update_abc import OnUserUpdateABC
-from .on_voice_state_update_abc import OnVoiceStateUpdateABC
-from .on_webhooks_update_abc import OnWebhooksUpdateABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='7', micro='0')

src/cpl_discord/service/__init__.py

@@ -21,12 +21,6 @@ from collections import namedtuple
 
 
 # imports:
-from .command_error_handler_service import CommandErrorHandlerService
-from .discord_bot_service import DiscordBotService
-from .discord_bot_service_abc import DiscordBotServiceABC
-from .discord_collection import DiscordCollection
-from .discord_service import DiscordService
-from .discord_service_abc import DiscordServiceABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2022', minor='7', micro='0')

src/tests/custom/discord/src/discord_bot/application.py

@@ -3,7 +3,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.console import Console
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_core.logging import LoggerABC
-from cpl_discord.application.discord_bot_application_abc import DiscordBotApplicationABC
+from cpl_discord.application.discord_bot_abc import DiscordBotApplicationABC
 from cpl_discord.configuration.discord_bot_settings import DiscordBotSettings
 from cpl_discord.service.discord_bot_service import DiscordBotService
 from cpl_discord.service.discord_bot_service_abc import DiscordBotServiceABC

tools/set_version/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'set_version'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '2022.7.0'
+__version__ = '2022.6.0'
 
 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='6', micro='0')

tools/set_version/set-version.json

@@ -3,7 +3,7 @@
     "Name": "set-version",
     "Version": {
       "Major": "2022",
-      "Minor": "7",
+      "Minor": "6",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",

tools/set_version/version_setter_service.py

@@ -50,10 +50,9 @@ class VersionSetterService:
             if dep_name[len(dep_name)-1] not in ascii_letters:
                 dep_name = dep_name[:len(dep_name)-1]
 
-            if skipped is not None and (dep_name in skipped or String.convert_to_snake_case(dep_name) in skipped) or dep_version == '':
+            if skipped is not None and (dep_name in skipped or String.convert_to_snake_case(dep_name) in skipped):
                 new_deps.append(dependency)
                 continue
-
             new_deps.append(dependency.replace(dep_version, f'{version["Major"]}.{version["Minor"]}.{version["Micro"]}'))
 
         project_json['ProjectSettings'][key] = new_deps