cleepcli 1.43.8__tar.gz → 1.43.10__tar.gz

{cleepcli-1.43.8/cleepcli.egg-info → cleepcli-1.43.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.43.8
+Version: 1.43.10
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau

{cleepcli-1.43.8 → cleepcli-1.43.10}/bin/ccli

@@ -463,12 +463,26 @@ def corebuild():
 @click.option('--version', required=True, help='Version to publish.')
 @click.option('--prerelease', is_flag=True, default=False, help='Pre-release flag')
 @click.option('--tag', required=True, help='Release git tag.')
-def corepublish(version, prerelease, tag):
+@click.option(
+    '--force',
+    is_flag=True,
+    default=False,
+    help='If release already exists, replace .deb/.sha256 assets (keep git tag).',
+)
+@click.option(
+    '--skip-existing',
+    is_flag=True,
+    default=False,
+    help='If release already exists, exit 0 without uploading.',
+)
+def corepublish(version, prerelease, tag, force, skip_existing):
     """
     Publish built Cleep debian package
     """
     p = Package()
-    res = p.publish_cleep(version, prerelease, tag)
+    res = p.publish_cleep(
+        version, prerelease, tag, force=force, skip_existing=skip_existing
+    )
 
     if not res:
         sys.exit(1)

{cleepcli-1.43.8 → cleepcli-1.43.10}/bin/cleep-cli

@@ -463,12 +463,26 @@ def corebuild():
 @click.option('--version', required=True, help='Version to publish.')
 @click.option('--prerelease', is_flag=True, default=False, help='Pre-release flag')
 @click.option('--tag', required=True, help='Release git tag.')
-def corepublish(version, prerelease, tag):
+@click.option(
+    '--force',
+    is_flag=True,
+    default=False,
+    help='If release already exists, replace .deb/.sha256 assets (keep git tag).',
+)
+@click.option(
+    '--skip-existing',
+    is_flag=True,
+    default=False,
+    help='If release already exists, exit 0 without uploading.',
+)
+def corepublish(version, prerelease, tag, force, skip_existing):
     """
     Publish built Cleep debian package
     """
     p = Package()
-    res = p.publish_cleep(version, prerelease, tag)
+    res = p.publish_cleep(
+        version, prerelease, tag, force=force, skip_existing=skip_existing
+    )
 
     if not res:
         sys.exit(1)

{cleepcli-1.43.8 → cleepcli-1.43.10}/cleepcli/package.py

@@ -250,7 +250,9 @@ sha256sum $DEB > $SHA256
             self.logger.exception('Error deleting tag "%s"' % tag_name)
             return False
 
-    def publish_cleep(self, version, prerelease, tag):
+    def publish_cleep(
+        self, version, prerelease, tag, force=False, skip_existing=False
+    ):
         """
         Publish cleep version on github
 
@@ -258,9 +260,17 @@ sha256sum $DEB > $SHA256
             version (str): cleep version
             prerelease (bool): True to publish pre-release version
             tag (str): associated git tag
+            force (bool): If release already exists, replace .deb/.sha256 assets
+                without deleting the git tag (safe for CI replay)
+            skip_existing (bool): If release already exists, exit successfully
+                without uploading (mutually exclusive intent with force —
+                force wins if both are set)
         """
         label = "pre-release" if prerelease else "release"
-        token = os.environ["GITHUB_TOKEN"]
+        token = os.environ.get("GITHUB_TOKEN") or os.environ.get("GITHUB_ACCESS_TOKEN")
+        if not token:
+            self.logger.error("GITHUB_TOKEN is not set")
+            return False
         github = Github(token)
         repo = github.get_repo("%s/%s" % (config.GITHUB_ORG, config.GITHUB_REPO))
 
@@ -274,12 +284,18 @@ sha256sum $DEB > $SHA256
         changes = os.path.abspath(
             os.path.join(config.REPO_DIR, "..", "cleep_%s_armhf.changes" % version)
         )
+        missing = False
         if not os.path.exists(archive):
             self.logger.error('Archive file "%s" does not exist' % archive)
+            missing = True
         if not os.path.exists(sha256):
             self.logger.error('Checksum file "%s" does not exist' % sha256)
+            missing = True
         if not os.path.exists(changes):
             self.logger.error('Changes file "%s" does not exist' % changes)
+            missing = True
+        if missing:
+            return False
 
         # get changelog
         cmd = (
@@ -294,7 +310,7 @@ sha256sum $DEB > $SHA256
         changelog = "\n".join([line.strip() for line in result["stdout"]])
         self.logger.debug("Changelog:\n%s" % changelog)
 
-        # search existing release
+        # search existing release (by title = version name)
         release_found = None
         releases = repo.get_releases()
         for release in releases:
@@ -304,27 +320,50 @@ sha256sum $DEB > $SHA256
                 release_found = release
                 break
 
-        if release_found and (release_found.prerelease or release_found.draft):
-            # due to github limitation (bug or limitation?), draft assets are not downloadable
-            # so we create prerelease version instead of draft and delete it before creating it
-            # again when pushing new version
-            self.logger.info(
-                'Deleting existing %s "%s"...', label, release_found.tag_name
-            )
-            try:
-                release_found.delete_release()
-            except:
-                self.logger.exception("Error deleting existing %s:", label)
-                return False
+        if release_found:
+            if skip_existing and not force:
+                self.logger.info(
+                    'Release "%s" already exists — skip (--skip-existing)',
+                    version,
+                )
+                return True
+
+            if force:
+                return self.__replace_release_assets(
+                    release_found,
+                    version,
+                    changelog,
+                    prerelease,
+                    archive,
+                    sha256,
+                )
 
-            # delete tag
-            if not self.__delete_github_tag(release_found.tag_name, token):
+            if release_found.prerelease or release_found.draft:
+                # Legacy RC path: delete release + tag, then recreate.
+                # Prefer --force to replace assets without touching the tag.
+                self.logger.info(
+                    'Deleting existing %s "%s"...', label, release_found.tag_name
+                )
+                try:
+                    release_found.delete_release()
+                except Exception:
+                    self.logger.exception("Error deleting existing %s:", label)
+                    return False
+
+                if not self.__delete_github_tag(release_found.tag_name, token):
+                    return False
+                release_found = None
+            else:
+                self.logger.error(
+                    'Release "%s" already exists — use --force to replace '
+                    "assets or --skip-existing to no-op",
+                    version,
+                )
                 return False
 
         # create release
         self.logger.info('Creating new %s "%s"...', label, version)
         try:
-            commits = repo.get_commits()
             release_found = repo.create_git_release(
                 tag=tag,
                 name=version,
@@ -332,20 +371,53 @@ sha256sum $DEB > $SHA256
                 draft=False,
                 prerelease=prerelease,
             )
-        except:
+        except Exception:
             self.logger.exception("Error occured creating new %s:", label)
             return False
 
-        # upload assets
+        return self.__upload_release_assets(release_found, archive, sha256)
+
+    def __replace_release_assets(
+        self, release, version, changelog, prerelease, archive, sha256
+    ):
+        """Update existing release metadata and replace .deb / .sha256 assets."""
+        self.logger.info(
+            'Replacing assets on existing release "%s" (tag=%s)...',
+            version,
+            release.tag_name,
+        )
+        try:
+            release.update_release(
+                name=version,
+                message=changelog,
+                draft=False,
+                prerelease=prerelease,
+            )
+        except Exception:
+            self.logger.exception("Error updating release metadata:")
+            return False
+
+        wanted = {os.path.basename(archive), os.path.basename(sha256)}
+        try:
+            for asset in release.get_assets():
+                if asset.name in wanted:
+                    self.logger.info('Deleting existing asset "%s"...', asset.name)
+                    asset.delete_asset()
+        except Exception:
+            self.logger.exception("Error deleting existing assets:")
+            return False
+
+        return self.__upload_release_assets(release, archive, sha256)
+
+    def __upload_release_assets(self, release, archive, sha256):
         try:
             self.logger.info('Uploading asset "%s"...' % archive)
-            release_found.upload_asset(archive)
+            release.upload_asset(archive)
             self.logger.info('Uploading asset "%s"...' % sha256)
-            release_found.upload_asset(sha256)
-        except:
+            release.upload_asset(sha256)
+        except Exception:
             self.logger.exception("Error uploading assets:")
             return False
-
         return True
 
         # TODO code for draft release removed for problem downloading draft assets

{cleepcli-1.43.8 → cleepcli-1.43.10}/cleepcli/test.py

@@ -224,6 +224,9 @@ cd "%(path)s"
 
         # copy coverage file to standart location (in module tests directory) for coverage report tools
         if copy_to:
+            if not os.path.isfile(coverage_file_path):
+                self.logger.error('Coverage file missing: %s' % coverage_file_path)
+                return False
             shutil.copyfile(coverage_file_path, os.path.join(copy_to, '.coverage'))
 
         self.logger.debug('Return code: %s' % self.__endless_command_return_code)
@@ -238,7 +241,7 @@ cd "%(path)s"
         """
         return """
 cd "%s"
-COVERAGE_FILE=%s coverage run --omit="*/lib/python*/*","test_*" --source="../backend" --concurrency=gevent -m unittest discover
+COVERAGE_FILE=%s coverage run --omit="*/lib/python*/*","test_*" --source="../backend" --concurrency=thread -m unittest discover
         """ % (module_tests_path, coverage_file_path)
 
     def __get_tests_cmd_with_pattern(self, module_tests_path, pattern):

{cleepcli-1.43.8 → cleepcli-1.43.10}/cleepcli/version.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-VERSION = "1.43.8"
+VERSION = "1.43.10"

{cleepcli-1.43.8 → cleepcli-1.43.10/cleepcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cleepcli
-Version: 1.43.8
+Version: 1.43.10
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau