ciel 2.0.1__tar.gz → 2.0.2__tar.gz

{ciel-2.0.1 → ciel-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciel
-Version: 2.0.1
+Version: 2.0.2
 Summary: An PDK builder/version manager for PDKs in the open_pdks format
 Home-page: https://github.com/fossi-foundation/ciel
 License: Apache-2.0
@@ -31,7 +31,7 @@ Description-Content-Type: text/markdown
 <p align="center">
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License: Apache 2.0"/></a>
     <img src="https://github.com/fossi-foundation/ciel/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI Status" />
-    <a href="https://fossi-chat.org"><img src="https://img.shields.io/badge/Community-FOSSi%20Chat-1bb378?logo=element" alt="Invite to the Skywater PDK Slack"/></a>
+    <a href="https://fossi-chat.org"><img src="https://img.shields.io/badge/Community-FOSSi%20Chat-1bb378?logo=element" alt="Invite to FOSSi Chat"/></a>
     <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style: Black"/></a>
 </p>
 

{ciel-2.0.1 → ciel-2.0.2}/Readme.md

@@ -2,7 +2,7 @@
 <p align="center">
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License: Apache 2.0"/></a>
     <img src="https://github.com/fossi-foundation/ciel/actions/workflows/ci.yml/badge.svg?branch=main" alt="CI Status" />
-    <a href="https://fossi-chat.org"><img src="https://img.shields.io/badge/Community-FOSSi%20Chat-1bb378?logo=element" alt="Invite to the Skywater PDK Slack"/></a>
+    <a href="https://fossi-chat.org"><img src="https://img.shields.io/badge/Community-FOSSi%20Chat-1bb378?logo=element" alt="Invite to FOSSi Chat"/></a>
     <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style: Black"/></a>
 </p>
 

{ciel-2.0.1 → ciel-2.0.2}/ciel/build/__init__.py

@@ -50,7 +50,7 @@ from ..families import Family
 
 def build(
     pdk_root: str,
-    pdk: str,
+    pdk_family: str,
     version: str,
     jobs: int = 1,
     sram: bool = True,  # Deprecated
@@ -64,8 +64,8 @@ def build(
             name, path = repo.split("=")
             use_repos[name] = os.path.abspath(path)
 
-    if pdk not in Family.by_name:
-        raise Exception(f"Unsupported PDK family '{pdk}'.")
+    if pdk_family not in Family.by_name:
+        raise Exception(f"Unsupported PDK family '{pdk_family}'.")
 
     kwargs = {
         "pdk_root": pdk_root,
@@ -76,7 +76,7 @@ def build(
         "using_repos": use_repos,
     }
 
-    build_module = importlib.import_module(f".{pdk}", package=__name__)
+    build_module = importlib.import_module(f".{pdk_family}", package=__name__)
     build_function = build_module.build
     build_function(**kwargs)
 
@@ -97,7 +97,7 @@ def build_cmd(
     include_libraries,
     jobs,
     pdk_root,
-    pdk,
+    pdk_family,
     clear_build_artifacts,
     tool_metadata_file_path,
     version,
@@ -124,7 +124,7 @@ def build_cmd(
 
     build(
         pdk_root=pdk_root,
-        pdk=pdk,
+        pdk_family=pdk_family,
         version=version,
         jobs=jobs,
         clear_build_artifacts=clear_build_artifacts,
@@ -135,7 +135,7 @@ def build_cmd(
 
 def push(
     pdk_root,
-    pdk,
+    pdk_family,
     version,
     *,
     owner,
@@ -143,7 +143,7 @@ def push(
     pre=False,
     push_libraries=None,
 ):
-    family = Family.by_name[pdk]
+    family = Family.by_name[pdk_family]
 
     session = GitHubSession()
     if session.github_token is None:
@@ -155,7 +155,7 @@ def push(
         push_libraries = family.all_libraries
     library_list = set(push_libraries)
 
-    version_object = Version(version, pdk)
+    version_object = Version(version, pdk_family)
     version_directory = version_object.get_dir(pdk_root)
     if not os.path.isdir(version_directory):
         raise FileNotFoundError(f"Version {version} not found.")
@@ -196,15 +196,15 @@ def push(
             progress.remove_task(task)
             final_tarballs.append(tarball_path)
 
-    tag = f"{pdk}-{version}"
+    tag = f"{pdk_family}-{version}"
 
     # If someone wants to rewrite this to not use ghr, please, by all means.
     console.log("Starting upload…")
 
-    body = f"{pdk} variants built using ciel"
+    body = f"{pdk_family} variants built using ciel"
     date = get_commit_date(version, family.repo, session)
     if date is not None:
-        body = f"{pdk} variants (released on {date_to_iso8601(date)})"
+        body = f"{pdk_family} variants (released on {date_to_iso8601(date)})"
 
     for tarball_path in final_tarballs:
         subprocess.check_call(
@@ -221,9 +221,7 @@ def push(
                 "-commitish",
                 "releases",
                 "-replace",
-            ]
-            + (["-prerelease"] if pre else [])
-            + [
+                *(["-prerelease"] * pre),  # https://discuss.python.org/t/the-precedence-of-unpack-operators/25854/2
                 tag,
                 tarball_path,
             ]
@@ -241,7 +239,7 @@ def push_cmd(
     repository,
     pre,
     pdk_root,
-    pdk,
+    pdk_family,
     version,
     push_libraries,
 ):
@@ -256,7 +254,7 @@ def push_cmd(
     try:
         push(
             pdk_root,
-            pdk,
+            pdk_family,
             version,
             owner=owner,
             repository=repository,

{ciel-2.0.1 → ciel-2.0.2}/ciel/build/git_multi_clone.py

@@ -64,6 +64,7 @@ class Repository(object):
             ["git", "clone", "--progress", self.url, self.path],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            text=True,
         )
         assert process.stderr is not None
 
@@ -72,10 +73,9 @@ class Repository(object):
         # Python Moment
         buffer = ""
         while True:
-            bytes_read = process.stderr.read(1)
-            if len(bytes_read) == 0:
+            char_read = process.stderr.read(1)
+            if len(char_read) == 0:
                 break
-            char_read = bytes_read.decode("utf8")
             if char_read in ["\n", "\r"]:
                 match = ro_rx.search(buffer)
                 if match is not None:
@@ -107,6 +107,7 @@ class Repository(object):
             cwd=self.path,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            text=True,
         )
         assert process.stderr is not None
         callback(0, f"Updating {self.name} at {self.path}…")
@@ -116,10 +117,9 @@ class Repository(object):
         # Python Moment #2
         buffer = ""
         while True:
-            bytes_read = process.stderr.read(1)
-            if len(bytes_read) == 0:
+            char_read = process.stderr.read(1)
+            if len(char_read) == 0:
                 break
-            char_read = bytes_read.decode("utf8")
             if char_read in ["\n", "\r"]:
                 match = ro_rx.search(buffer)
                 if match is not None:
@@ -162,6 +162,7 @@ class Repository(object):
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             cwd=self.path,
+            text=True,
         )
 
         ro_rx = re.compile(r"Receiving objects:\s*(\d+)%")
@@ -171,10 +172,9 @@ class Repository(object):
         # Python Moment #3
         buffer = ""
         while True:
-            bytes_read = process.stderr.read(1)
-            if len(bytes_read) == 0:
+            char_read = process.stderr.read(1)
+            if len(char_read) == 0:
                 break
-            char_read = bytes_read.decode("utf8")
             if char_read in ["\n", "\r"]:
                 match = ro_rx.search(buffer)
                 if match is not None:

{ciel-2.0.1 → ciel-2.0.2}/ciel/click_common.py

@@ -100,10 +100,18 @@ def opt_build(function: Callable):
 
 
 def opt_push(function: Callable):
-    function = opt("-o", "--owner", default="efabless", help="Repository Owner")(
-        function
-    )
-    function = opt("-r", "--repository", default="volare", help="Repository")(function)
+    function = opt(
+        "-o",
+        "--owner",
+        default="fossi-foundation",
+        help="Artifact Upload Repository Owner",
+    )(function)
+    function = opt(
+        "-r",
+        "--repository",
+        default="ciel-releases",
+        help="Artifact Upload Repository",
+    )(function)
     function = opt(
         "--pre/--prod", default=False, help="Push as pre-release or production"
     )(function)

{ciel-2.0.1 → ciel-2.0.2}/ciel/manage.py

@@ -231,7 +231,7 @@ def fetch(
                 )
                 build(
                     pdk_root=pdk_root,
-                    pdk=pdk,
+                    pdk_family=pdk,
                     version=version,
                     **build_kwargs,
                 )
@@ -242,7 +242,7 @@ def fetch(
                         ].default_includes.copy()
                     push(
                         pdk_root=pdk_root,
-                        pdk=pdk,
+                        pdk_family=pdk,
                         version=version,
                         **push_kwargs,
                     )

{ciel-2.0.1 → ciel-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ciel"
-version = "2.0.1"
+version = "2.0.2"
 description = "An PDK builder/version manager for PDKs in the open_pdks format"
 authors = ["Mohamed Gaber <me@donn.website>", "Efabless Corporation"]
 readme = "Readme.md"