jupyter-builder 0.1.0a2__py3-none-any.whl → 0.1.0a3__py3-none-any.whl

jupyter_builder/__init__.py

@@ -9,5 +9,5 @@ except ImportError:
     # the package from a stable release or in editable mode: https://pip.pypa.io/en/stable/topics/local-project-installs/#editable-installs
     import warnings
 
-    warnings.warn("Importing 'jupyter_builder' outside a proper installation.")
+    warnings.warn("Importing 'jupyter_builder' outside a proper installation.", stacklevel=1)
     __version__ = "dev"

jupyter_builder/base_extension_app.py

@@ -4,6 +4,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 from __future__ import annotations
+
 import os
 from copy import copy
 
@@ -15,9 +16,6 @@ from .debug_log_file_mixin import DebugLogFileMixin
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 
-
-# from .federated_labextensions import build_labextension, develop_labextension_py, watch_labextension
-
 flags = dict(base_flags)
 
 develop_flags = copy(flags)

jupyter_builder/commands.py

@@ -41,7 +41,8 @@ def _compare_ranges(spec1, spec2, drop_prerelease1=False, drop_prerelease2=False
     # Set return_value to a sentinel value
     return_value = False
 
-    # r1.set may be a list of ranges if the range involved an ||, so we need to test for overlaps between each pair.
+    # r1.set may be a list of ranges if the range involved an ||,
+    # so we need to test for overlaps between each pair.
     for r1set, r2set in itertools.product(r1.set, r2.set):
         x1 = r1set[0].semver
         x2 = r1set[-1].semver

jupyter_builder/debug_log_file_mixin.py

@@ -47,18 +47,18 @@ class DebugLogFileMixin(Configurable):
             for line in msg:
                 self.log.debug(line)
             if isinstance(ex, SystemExit):
-                warnings.warn(f"An error occurred. See the log file for details: {log_path}")
+                warnings.warn(
+                    f"An error occurred. See the log file for details: {log_path}", stacklevel=1
+                )
                 raise
-            warnings.warn("An error occurred.")
-            warnings.warn(msg[-1].strip())
-            warnings.warn(f"See the log file for details: {log_path}")
+            warnings.warn("An error occurred.", stacklevel=1)
+            warnings.warn(msg[-1].strip(), stacklevel=1)
+            warnings.warn(f"See the log file for details: {log_path}", stacklevel=1)
             self.exit(1)
         else:
             log.removeHandler(_debug_handler)
             _debug_handler.flush()
             _debug_handler.close()
-            try:
+            with contextlib.suppress(FileNotFoundError):
                 os.remove(log_path)
-            except FileNotFoundError:
-                pass
         log.removeHandler(_debug_handler)

jupyter_builder/extension_commands/build.py

@@ -5,9 +5,9 @@ import os
 
 from traitlets import Bool, Unicode
 
-from ..base_extension_app import BaseExtensionApp
-from ..core_path import default_core_path
-from ..federated_extensions import build_labextension
+from jupyter_builder.base_extension_app import BaseExtensionApp
+from jupyter_builder.core_path import default_core_path
+from jupyter_builder.federated_extensions import build_labextension
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 
@@ -27,7 +27,7 @@ class BuildLabExtensionApp(BaseExtensionApp):
         help="Directory containing core application package.json file",
     )
 
-    aliases = {
+    aliases = {  # noqa: RUF012
         "static-url": "BuildLabExtensionApp.static_url",
         "development": "BuildLabExtensionApp.development",
         "source-map": "BuildLabExtensionApp.source_map",

jupyter_builder/extension_commands/develop.py

@@ -7,8 +7,8 @@ from copy import copy
 from jupyter_core.application import base_flags
 from traitlets import Bool, Unicode
 
-from ..base_extension_app import BaseExtensionApp
-from ..federated_extensions import develop_labextension_py
+from jupyter_builder.base_extension_app import BaseExtensionApp
+from jupyter_builder.federated_extensions import develop_labextension_py
 
 flags = dict(base_flags)
 develop_flags = copy(flags)

jupyter_builder/extension_commands/watch.py

@@ -5,9 +5,9 @@ import os
 
 from traitlets import Bool, Unicode
 
-from ..base_extension_app import BaseExtensionApp
-from ..federated_extensions import watch_labextension
-from ..core_path import default_core_path
+from jupyter_builder.base_extension_app import BaseExtensionApp
+from jupyter_builder.core_path import default_core_path
+from jupyter_builder.federated_extensions import watch_labextension
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 
@@ -25,7 +25,7 @@ class WatchLabExtensionApp(BaseExtensionApp):
         help="Directory containing core application package.json file",
     )
 
-    aliases = {
+    aliases = {  # noqa: RUF012
         "core-path": "WatchLabExtensionApp.core_path",
         "development": "WatchLabExtensionApp.development",
         "source-map": "WatchLabExtensionApp.source_map",

jupyter_builder/federated_extensions.py

@@ -25,7 +25,6 @@ from jupyter_core.paths import ENV_JUPYTER_PATH, SYSTEM_JUPYTER_PATH, jupyter_da
 from jupyter_core.utils import ensure_dir_exists
 from jupyter_server.extension.serverextension import ArgumentConflict
 
-# from jupyterlab_server.config import get_federated_extensions
 from .federated_extensions_requirements import get_federated_extensions
 
 try:
@@ -33,6 +32,8 @@ try:
 except ImportError:
     from tomli import load
 
+from .core_path import default_core_path
+
 # from .commands import _test_overlap  TO BE DONE -----------------------------
 
 DEPRECATED_ARGUMENT = object()
@@ -95,7 +96,7 @@ def develop_labextension(  # noqa
     ensure_dir_exists(labext)
 
     if isinstance(path, (list, tuple)):
-        msg = "path must be a string pointing to a single extension to install; call this function multiple times to install multiple extensions"
+        msg = "path must be a string pointing to a single extension to install; call this function multiple times to install multiple extensions"  # noqa: E501
         raise TypeError(msg)
 
     if not destination:
@@ -104,7 +105,7 @@ def develop_labextension(  # noqa
     full_dest = normpath(pjoin(labext, destination))
     if overwrite and os.path.lexists(full_dest):
         if logger:
-            logger.info("Removing: %s" % full_dest)
+            logger.info("Removing: %s", full_dest)
         if os.path.isdir(full_dest) and not os.path.islink(full_dest):
             shutil.rmtree(full_dest)
         else:
@@ -124,14 +125,15 @@ def develop_labextension(  # noqa
                 if platform.platform().startswith("Windows"):
                     msg = (
                         "Symlinks can be activated on Windows 10 for Python version 3.8 or higher"
-                        " by activating the 'Developer Mode'. That may not be allowed by your administrators.\n"
+                        " by activating the 'Developer Mode'. That may not be allowed by your administrators.\n"  # noqa: E501
                         "See https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development"
                     )
                     raise OSError(msg) from e
                 raise
 
         elif not os.path.islink(full_dest):
-            raise ValueError("%s exists and is not a symlink" % full_dest)
+            msg = f"{full_dest} exists and is not a symlink"
+            raise ValueError(msg)
 
     elif os.path.isdir(path):
         path = pjoin(os.path.abspath(path), "")  # end in path separator
@@ -139,7 +141,7 @@ def develop_labextension(  # noqa
             dest_dir = pjoin(full_dest, parent[len(path) :])
             if not os.path.exists(dest_dir):
                 if logger:
-                    logger.info("Making directory: %s" % dest_dir)
+                    logger.info("Making directory: %s", dest_dir)
                 os.makedirs(dest_dir)
             for file_name in files:
                 src = pjoin(parent, file_name)
@@ -152,7 +154,7 @@ def develop_labextension(  # noqa
     return full_dest
 
 
-def develop_labextension_py(
+def develop_labextension_py(  # noqa: PLR0913
     module,
     user=False,
     sys_prefix=False,
@@ -195,10 +197,7 @@ def develop_labextension_py(
     return full_dests
 
 
-from .core_path import default_core_path
-
-
-def build_labextension(
+def build_labextension(  # noqa: PLR0913
     path, logger=None, development=False, static_url=None, source_map=False, core_path=None
 ):
     """Build a labextension in the given path"""
@@ -208,7 +207,7 @@ def build_labextension(
     ext_path = str(Path(path).resolve())
 
     if logger:
-        logger.info("Building extension in %s" % path)
+        logger.info("Building extension in %s", path)
 
     builder = _ensure_builder(ext_path, core_path)
 
@@ -223,7 +222,7 @@ def build_labextension(
     subprocess.check_call(arguments, cwd=ext_path)  # noqa S603
 
 
-def watch_labextension(
+def watch_labextension(  # noqa: PLR0913
     path, labextensions_path, logger=None, development=False, source_map=False, core_path=None
 ):
     """Watch a labextension in a given path"""
@@ -231,7 +230,7 @@ def watch_labextension(
     ext_path = str(Path(path).resolve())
 
     if logger:
-        logger.info("Building extension in %s" % path)
+        logger.info("Building extension in %s", path)
 
     # Check to see if we need to create a symlink
     federated_extensions = get_federated_extensions(labextensions_path)
@@ -274,9 +273,8 @@ def _ensure_builder(ext_path, core_path):
     dep_version2 = ext_data.get("devDependencies", {}).get("@jupyterlab/builder")
     dep_version2 = dep_version2 or ext_data.get("dependencies", {}).get("@jupyterlab/builder")
     if dep_version2 is None:
-        raise ValueError(
-            "Extensions require a devDependency on @jupyterlab/builder@%s" % dep_version1
-        )
+        msg = f"Extensions require a devDependency on @jupyterlab/builder@{dep_version1}"
+        raise ValueError(msg)
 
     # if we have installed from disk (version is a path), assume we know what
     # we are doing and do not check versions.
@@ -310,7 +308,7 @@ def _ensure_builder(ext_path, core_path):
     #     )
 
     # if not overlap:
-    #     msg = f"Extensions require a devDependency on @jupyterlab/builder@{dep_version1}, you have a dependency on {dep_version2}"
+    #     msg = f"Extensions require a devDependency on @jupyterlab/builder@{dep_version1}, you have a dependency on {dep_version2}"  # noqa: E501
     #     raise ValueError(msg)
 
     return osp.join(
@@ -339,10 +337,10 @@ def _should_copy(src, dest, logger=None):
         # we add a fudge factor to work around a bug in python 2.x
         # that was fixed in python 3.x: https://bugs.python.org/issue12904
         if logger:
-            logger.warning("Out of date: %s" % dest)
+            logger.warning("Out of date: %s", dest)
         return True
     if logger:
-        logger.info("Up to date: %s" % dest)
+        logger.info("Up to date: %s", dest)
     return False
 
 
@@ -388,9 +386,8 @@ def _get_labextension_dir(user=False, sys_prefix=False, prefix=None, labextensio
     ]
     conflicting_set = [f"{n}={v!r}" for n, v in conflicting if v]
     if len(conflicting_set) > 1:
-        msg = "cannot specify more than one of user, sys_prefix, prefix, or labextensions_dir, but got: {}".format(
-            ", ".join(conflicting_set)
-        )
+        conflict = ", ".join(conflicting_set)
+        msg = f"cannot specify more than one of user, sys_prefix, prefix, or labextensions_dir, but got: {conflict}"  # noqa: E501
         raise ArgumentConflict(msg)
     if user:
         labext = pjoin(jupyter_data_dir(), "labextensions")
@@ -449,8 +446,8 @@ def _get_labextension_metadata(module):  # noqa
     if not package:
         try:
             package = (
-                subprocess.check_output(
-                    [sys.executable, "setup.py", "--name"],  # noqa S603
+                subprocess.check_output(  # noqa: S603
+                    [sys.executable, "setup.py", "--name"],
                     cwd=mod_path,
                 )
                 .decode("utf8")

jupyter_builder/federated_extensions_requirements.py

@@ -50,21 +50,21 @@ def get_federated_extensions(labextensions_path: list[str]) -> dict[str, Any]:
             with open(ext_path, encoding="utf-8") as fid:
                 pkgdata = json.load(fid)
             if pkgdata["name"] not in federated_extensions:
-                data = dict(
-                    name=pkgdata["name"],
-                    version=pkgdata["version"],
-                    description=pkgdata.get("description", ""),
-                    url=get_package_url(pkgdata),
-                    ext_dir=ext_dir,
-                    ext_path=osp.dirname(ext_path),
-                    is_local=False,
-                    dependencies=pkgdata.get("dependencies", dict()),
-                    jupyterlab=pkgdata.get("jupyterlab", dict()),
-                )
+                data = {
+                    "name": pkgdata["name"],
+                    "version": pkgdata["version"],
+                    "description": pkgdata.get("description", ""),
+                    "url": get_package_url(pkgdata),
+                    "ext_dir": ext_dir,
+                    "ext_path": osp.dirname(ext_path),
+                    "is_local": False,
+                    "dependencies": pkgdata.get("dependencies", {}),
+                    "jupyterlab": pkgdata.get("jupyterlab", {}),
+                }
 
                 # Add repository info if available
                 if "repository" in pkgdata and "url" in pkgdata.get("repository", {}):
-                    data["repository"] = dict(url=pkgdata.get("repository").get("url"))
+                    data["repository"] = {"url": pkgdata.get("repository").get("url")}
 
                 install_path = osp.join(osp.dirname(ext_path), "install.json")
                 if osp.exists(install_path):

jupyter_builder/jupyterlab_semver.py

@@ -27,6 +27,329 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import logging
+import re
+
+logger = logging.getLogger(__name__)
+
+SEMVER_SPEC_VERSION = "2.0.0"
+
+string_type = str
+
+
+class _R:
+    def __init__(self, i):
+        self.i = i
+
+    def __call__(self):
+        v = self.i
+        self.i += 1
+        return v
+
+    def value(self):
+        return self.i
+
+
+class Extendlist(list):
+    def __setitem__(self, i, v):
+        try:
+            list.__setitem__(self, i, v)
+        except IndexError:
+            if len(self) == i:
+                self.append(v)
+            else:
+                raise
+
+
+def list_get(xs, i):
+    try:
+        return xs[i]
+    except IndexError:
+        return None
+
+
+R = _R(0)
+src = Extendlist()
+regexp = {}
+
+# The following Regular Expressions can be used for tokenizing,
+# validating, and parsing SemVer version strings.
+
+# ## Numeric Identifier
+# A single `0`, or a non-zero digit followed by zero or more digits.
+
+NUMERICIDENTIFIER = R()
+src[NUMERICIDENTIFIER] = "0|[1-9]\\d*"
+
+NUMERICIDENTIFIERLOOSE = R()
+src[NUMERICIDENTIFIERLOOSE] = "[0-9]+"
+
+
+# ## Non-numeric Identifier
+# Zero or more digits, followed by a letter or hyphen, and then zero or
+# more letters, digits, or hyphens.
+
+NONNUMERICIDENTIFIER = R()
+src[NONNUMERICIDENTIFIER] = "\\d*[a-zA-Z-][a-zA-Z0-9-]*"
+
+# ## Main Version
+# Three dot-separated numeric identifiers.
+
+MAINVERSION = R()
+src[MAINVERSION] = (
+    "("
+    + src[NUMERICIDENTIFIER]
+    + ")\\."
+    + "("
+    + src[NUMERICIDENTIFIER]
+    + ")\\."
+    + "("
+    + src[NUMERICIDENTIFIER]
+    + ")"
+)
+
+MAINVERSIONLOOSE = R()
+src[MAINVERSIONLOOSE] = (
+    "("
+    + src[NUMERICIDENTIFIERLOOSE]
+    + ")\\."
+    + "("
+    + src[NUMERICIDENTIFIERLOOSE]
+    + ")\\."
+    + "("
+    + src[NUMERICIDENTIFIERLOOSE]
+    + ")"
+)
+
+
+# ## Pre-release Version Identifier
+# A numeric identifier, or a non-numeric identifier.
+
+PRERELEASEIDENTIFIER = R()
+src[PRERELEASEIDENTIFIER] = "(?:" + src[NUMERICIDENTIFIER] + "|" + src[NONNUMERICIDENTIFIER] + ")"
+
+PRERELEASEIDENTIFIERLOOSE = R()
+src[PRERELEASEIDENTIFIERLOOSE] = (
+    "(?:" + src[NUMERICIDENTIFIERLOOSE] + "|" + src[NONNUMERICIDENTIFIER] + ")"
+)
+
+
+# ## Pre-release Version
+# Hyphen, followed by one or more dot-separated pre-release version
+# identifiers.
+
+PRERELEASE = R()
+src[PRERELEASE] = (
+    "(?:-(" + src[PRERELEASEIDENTIFIER] + "(?:\\." + src[PRERELEASEIDENTIFIER] + ")*))"
+)
+
+PRERELEASELOOSE = R()
+src[PRERELEASELOOSE] = (
+    "(?:-?(" + src[PRERELEASEIDENTIFIERLOOSE] + "(?:\\." + src[PRERELEASEIDENTIFIERLOOSE] + ")*))"
+)
+
+# ## Build Metadata Identifier
+# Any combination of digits, letters, or hyphens.
+
+BUILDIDENTIFIER = R()
+src[BUILDIDENTIFIER] = "[0-9A-Za-z-]+"
+
+# ## Build Metadata
+# Plus sign, followed by one or more period-separated build metadata
+# identifiers.
+
+BUILD = R()
+src[BUILD] = "(?:\\+(" + src[BUILDIDENTIFIER] + "(?:\\." + src[BUILDIDENTIFIER] + ")*))"
+
+#  ## Full Version String
+#  A main version, followed optionally by a pre-release version and
+#  build metadata.
+
+#  Note that the only major, minor, patch, and pre-release sections of
+#  the version string are capturing groups.  The build metadata is not a
+#  capturing group, because it should not ever be used in version
+#  comparison.
+
+FULL = R()
+FULLPLAIN = "v?" + src[MAINVERSION] + src[PRERELEASE] + "?" + src[BUILD] + "?"
+
+src[FULL] = "^" + FULLPLAIN + "$"
+
+#  like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+#  also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+#  common in the npm registry.
+LOOSEPLAIN = "[v=\\s]*" + src[MAINVERSIONLOOSE] + src[PRERELEASELOOSE] + "?" + src[BUILD] + "?"
+
+LOOSE = R()
+src[LOOSE] = "^" + LOOSEPLAIN + "$"
+
+GTLT = R()
+src[GTLT] = "((?:<|>)?=?)"
+
+#  Something like "2.*" or "1.2.x".
+#  Note that "x.x" is a valid xRange identifier, meaning "any version"
+#  Only the first item is strictly required.
+XRANGEIDENTIFIERLOOSE = R()
+src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + "|x|X|\\*"
+XRANGEIDENTIFIER = R()
+src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + "|x|X|\\*"
+
+XRANGEPLAIN = R()
+src[XRANGEPLAIN] = (
+    "[v=\\s]*("
+    + src[XRANGEIDENTIFIER]
+    + ")"
+    + "(?:\\.("
+    + src[XRANGEIDENTIFIER]
+    + ")"
+    + "(?:\\.("
+    + src[XRANGEIDENTIFIER]
+    + ")"
+    + "(?:"
+    + src[PRERELEASE]
+    + ")?"
+    + src[BUILD]
+    + "?"
+    + ")?)?"
+)
+
+XRANGEPLAINLOOSE = R()
+src[XRANGEPLAINLOOSE] = (
+    "[v=\\s]*("
+    + src[XRANGEIDENTIFIERLOOSE]
+    + ")"
+    + "(?:\\.("
+    + src[XRANGEIDENTIFIERLOOSE]
+    + ")"
+    + "(?:\\.("
+    + src[XRANGEIDENTIFIERLOOSE]
+    + ")"
+    + "(?:"
+    + src[PRERELEASELOOSE]
+    + ")?"
+    + src[BUILD]
+    + "?"
+    + ")?)?"
+)
+
+XRANGE = R()
+src[XRANGE] = "^" + src[GTLT] + "\\s*" + src[XRANGEPLAIN] + "$"
+XRANGELOOSE = R()
+src[XRANGELOOSE] = "^" + src[GTLT] + "\\s*" + src[XRANGEPLAINLOOSE] + "$"
+
+#  Tilde ranges.
+#  Meaning is "reasonably at or greater than"
+LONETILDE = R()
+src[LONETILDE] = "(?:~>?)"
+
+TILDETRIM = R()
+src[TILDETRIM] = "(\\s*)" + src[LONETILDE] + "\\s+"
+regexp[TILDETRIM] = re.compile(src[TILDETRIM], re.M)
+tildeTrimReplace = r"\1~"
+
+TILDE = R()
+src[TILDE] = "^" + src[LONETILDE] + src[XRANGEPLAIN] + "$"
+TILDELOOSE = R()
+src[TILDELOOSE] = "^" + src[LONETILDE] + src[XRANGEPLAINLOOSE] + "$"
+
+#  Caret ranges.
+#  Meaning is "at least and backwards compatible with"
+LONECARET = R()
+src[LONECARET] = "(?:\\^)"
+
+CARETTRIM = R()
+src[CARETTRIM] = "(\\s*)" + src[LONECARET] + "\\s+"
+regexp[CARETTRIM] = re.compile(src[CARETTRIM], re.M)
+caretTrimReplace = r"\1^"
+
+CARET = R()
+src[CARET] = "^" + src[LONECARET] + src[XRANGEPLAIN] + "$"
+CARETLOOSE = R()
+src[CARETLOOSE] = "^" + src[LONECARET] + src[XRANGEPLAINLOOSE] + "$"
+
+#  A simple gt/lt/eq thing, or just "" to indicate "any version"
+COMPARATORLOOSE = R()
+src[COMPARATORLOOSE] = "^" + src[GTLT] + "\\s*(" + LOOSEPLAIN + ")$|^$"
+COMPARATOR = R()
+src[COMPARATOR] = "^" + src[GTLT] + "\\s*(" + FULLPLAIN + ")$|^$"
+
+
+#  An expression to strip any whitespace between the gtlt and the thing
+#  it modifies, so that `> 1.2.3` ==> `>1.2.3`
+COMPARATORTRIM = R()
+src[COMPARATORTRIM] = "(\\s*)" + src[GTLT] + "\\s*(" + LOOSEPLAIN + "|" + src[XRANGEPLAIN] + ")"
+
+#  this one has to use the /g flag
+regexp[COMPARATORTRIM] = re.compile(src[COMPARATORTRIM], re.M)
+comparatorTrimReplace = r"\1\2\3"
+
+
+#  Something like `1.2.3 - 1.2.4`
+#  Note that these all use the loose form, because they'll be
+#  checked against either the strict or loose comparator form
+#  later.
+HYPHENRANGE = R()
+src[HYPHENRANGE] = (
+    "^\\s*(" + src[XRANGEPLAIN] + ")" + "\\s+-\\s+" + "(" + src[XRANGEPLAIN] + ")" + "\\s*$"
+)
+
+HYPHENRANGELOOSE = R()
+src[HYPHENRANGELOOSE] = (
+    "^\\s*("
+    + src[XRANGEPLAINLOOSE]
+    + ")"
+    + "\\s+-\\s+"
+    + "("
+    + src[XRANGEPLAINLOOSE]
+    + ")"
+    + "\\s*$"
+)
+
+#  Star ranges basically just allow anything at all.
+STAR = R()
+src[STAR] = "(<|>)?=?\\s*\\*"
+
+# version name recovery for convenient
+RECOVERYVERSIONNAME = R()
+_n = src[NUMERICIDENTIFIER]
+_pre = src[PRERELEASELOOSE]
+src[RECOVERYVERSIONNAME] = f"v?({_n})(?:\\.({_n}))?{_pre}?"
+
+#  Compile to actual regexp objects.
+#  All are flag-free, unless they were created above with a flag.
+for i in range(R.value()):
+    logger.debug("genregxp %s %s", i, src[i])
+    if i not in regexp:
+        regexp[i] = re.compile(src[i])
+
+
+def parse(version, loose):
+    r = regexp[LOOSE] if loose else regexp[FULL]
+    m = r.search(version)
+    if m:
+        return semver(version, loose)
+    else:
+        return None
+
+
+def valid(version, loose):
+    v = parse(version, loose)
+    if v.version:
+        return v
+    else:
+        return None
+
+
+def clean(version, loose):
+    s = parse(version, loose)
+    if s:
+        return s.version
+    else:
+        return None
+
+
+NUMERIC = re.compile(r"^\d+$")
+
 
 def semver(version, loose):
     if isinstance(version, SemVer):
@@ -65,7 +388,7 @@ class SemVer:
                 self.prerelease = []
             else:
                 self.prerelease = [
-                    (int(id) if NUMERIC.search(id) else id) for id in m.group(3).split(".")
+                    (int(id_) if NUMERIC.search(id_) else id_) for id_ in m.group(3).split(".")
                 ]
         else:
             #  these are actually numbers
@@ -77,7 +400,7 @@ class SemVer:
                 self.prerelease = []
             else:
                 self.prerelease = [
-                    (int(id) if NUMERIC.search(id) else id) for id in m.group(4).split(".")
+                    (int(id_) if NUMERIC.search(id_) else id_) for id_ in m.group(4).split(".")
                 ]
             if m.group(5):
                 self.build = m.group(5).split(".")
@@ -116,7 +439,7 @@ class SemVer:
             or compare_identifiers(str(self.patch), str(other.patch))
         )
 
-    def compare_pre(self, other):
+    def compare_pre(self, other):  # noqa PLR0911
         if not isinstance(other, SemVer):
             other = make_semver(other, self.loose)
 
@@ -226,16 +549,88 @@ class SemVer:
                 else:
                     self.prerelease = [identifier, 0]
         else:
-            raise ValueError(f"invalid increment argument: {release}")
+            msg = f"invalid increment argument: {release}"
+            raise ValueError(msg)
         self.format()
         self.raw = self.version
         return self
 
 
+def inc(version, release, loose, identifier=None):  # wow!
+    try:
+        return make_semver(version, loose).inc(release, identifier=identifier).version
+    except Exception as e:
+        logger.debug(e, exc_info=5)
+        return None
+
+
+def compare_identifiers(a, b):
+    anum = NUMERIC.search(a)
+    bnum = NUMERIC.search(b)
+
+    if anum and bnum:
+        a = int(a)
+        b = int(b)
+
+    if anum and not bnum:
+        return -1
+    elif bnum and not anum:
+        return 1
+    elif a < b:
+        return -1
+    elif a > b:
+        return 1
+    else:
+        return 0
+
+
+def rcompare_identifiers(a, b):
+    return compare_identifiers(b, a)
+
+
 def compare(a, b, loose):
     return make_semver(a, loose).compare(b)
 
 
+def compare_loose(a, b):
+    return compare(a, b, True)
+
+
+def rcompare(a, b, loose):
+    return compare(b, a, loose)
+
+
+def make_key_function(loose):
+    def key_function(version):
+        v = make_semver(version, loose)
+        key = (v.major, v.minor, v.patch)
+        if v.prerelease:  # noqa SIM108
+            key = key + tuple(v.prerelease)
+        else:
+            #  NOT having a prerelease is > having one
+            key = (*key, float("inf"))
+
+        return key
+
+    return key_function
+
+
+loose_key_function = make_key_function(True)
+full_key_function = make_key_function(True)
+
+
+def sort(list_, loose):
+    keyf = loose_key_function if loose else full_key_function
+    list_.sort(key=keyf)
+    return list_
+
+
+def rsort(list_, loose):
+    keyf = loose_key_function if loose else full_key_function
+    list_.sort(key=keyf, reverse=True)
+    return list_
+
+
 def gt(a, b, loose):
     return compare(a, b, loose) > 0
 

{jupyter_builder-0.1.0a2.dist-info → jupyter_builder-0.1.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jupyter_builder
-Version: 0.1.0a2
+Version: 0.1.0a3
 Summary: JupyterLab build tools
 Project-URL: Homepage, https://jupyter.org
 Project-URL: Source, https://github.com/jupyterlab/jupyterlab_builder
@@ -58,7 +58,7 @@ Requires-Dist: build; extra == 'dev'
 Requires-Dist: hatch; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
-Requires-Dist: ruff==0.4.7; extra == 'dev'
+Requires-Dist: ruff==0.5.5; extra == 'dev'
 Provides-Extra: test
 Requires-Dist: copier<10,>=9.2; extra == 'test'
 Requires-Dist: coverage; extra == 'test'

jupyter_builder-0.1.0a3.dist-info/RECORD

@@ -0,0 +1,20 @@
+jupyter_builder/__init__.py,sha256=i9jPM1fNuaGMXu7HCFm6KbNkedsu1J-LqVIcDeeoUCc,582
+jupyter_builder/base_extension_app.py,sha256=w82d89smSMulUGlPDI_A4PVxRz2Zg7myC7NXcEevX4Y,1622
+jupyter_builder/commands.py,sha256=DgG1GGBQ_NEKVreOX2JAnNjOtR-znxs-u56ZiokPvOo,3446
+jupyter_builder/core_path.py,sha256=8cFbRg81aZj8LQiHFkXuHtlDffwDu4IlUypyaiI1gH8,245
+jupyter_builder/debug_log_file_mixin.py,sha256=EVc25sTNjYRnHf9sPQHffR8O5apqG7SJlZq5T9EAfMM,2256
+jupyter_builder/federated_extensions.py,sha256=VnrCOgG31Ed_m18gLsxWV5diU2vpj8lXSZpHzXoBoWQ,17226
+jupyter_builder/federated_extensions_requirements.py,sha256=t3sD-WiO0Y4SOmn113-1aGhMzOqoQLCZAMnhliIM5vk,2997
+jupyter_builder/jlpm.py,sha256=kYE6Pk9TADEhcxKkUXr6V0AhNdGDr5XnYO-D679R580,1233
+jupyter_builder/jupyterlab_semver.py,sha256=8wQusESSz_3rmnJsWVVn13C4mM5mt5HAdAsAUCjrD8c,18563
+jupyter_builder/main.py,sha256=PGZ4MGYG20yDqonoQg_vKkeCzCkKKnrCOtU056Wdvr4,2231
+jupyter_builder/yarn.js,sha256=8EYGlNp3NZisReCOECOR_8DMDfMWLkfeZ-URewpzhq4,2221431
+jupyter_builder/extension_commands/__init__.py,sha256=eXcK7cn7Qj8A1SBiMJ4ptlf2WFErhSxG9QSKFtENyhU,101
+jupyter_builder/extension_commands/build.py,sha256=u_RQGl5_Pt2A7I2SdTk4tZ3hUNR83X4pFqigOzWXA6g,1638
+jupyter_builder/extension_commands/develop.py,sha256=2B9jrjceulO9sE7-TqcyVtTrjKkk713LqRbN5oMmxYU,1724
+jupyter_builder/extension_commands/watch.py,sha256=QIfIxX__6NfXeIla7BCr0doqqxA9rkd4ApKuCMk709A,1521
+jupyter_builder-0.1.0a3.dist-info/METADATA,sha256=Il2z55hJFeIusPAATRJ0Wkn6NN3uXv0RmBqQqzmswUM,5300
+jupyter_builder-0.1.0a3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+jupyter_builder-0.1.0a3.dist-info/entry_points.txt,sha256=pQlwFs3R6-sOlkEDXzXwxu0tVNn4aBkaDJ8qRebDZko,95
+jupyter_builder-0.1.0a3.dist-info/licenses/LICENSE,sha256=T4GK8L2cxFmaXUe48VaSUF3T6pnn14gWtH1rXdz5VkI,1532
+jupyter_builder-0.1.0a3.dist-info/RECORD,,

jupyter_builder/jupyterlab_server_req.py

@@ -1,66 +0,0 @@
-"""JupyterLab Server config"""
-
-# Copyright (c) Jupyter Development Team.
-# Distributed under the terms of the Modified BSD License.
-from __future__ import annotations
-
-import json
-import os.path as osp
-from glob import iglob
-from itertools import chain
-from os.path import join as pjoin
-from typing import Any
-
-# -----------------------------------------------------------------------------
-# Module globals
-# -----------------------------------------------------------------------------
-
-DEFAULT_TEMPLATE_PATH = osp.join(osp.dirname(__file__), "templates")
-
-
-def get_package_url(data: dict[str, Any]) -> str:
-    """Get the url from the extension data"""
-    # homepage, repository  are optional
-    if "homepage" in data:
-        url = data["homepage"]
-    elif "repository" in data and isinstance(data["repository"], dict):
-        url = data["repository"].get("url", "")
-    else:
-        url = ""
-    return url
-
-
-def get_federated_extensions(labextensions_path: list[str]) -> dict[str, Any]:
-    """Get the metadata about federated extensions"""
-    federated_extensions = {}
-    for ext_dir in labextensions_path:
-        # extensions are either top-level directories, or two-deep in @org directories
-        for ext_path in chain(
-            iglob(pjoin(ext_dir, "[!@]*", "package.json")),
-            iglob(pjoin(ext_dir, "@*", "*", "package.json")),
-        ):
-            with open(ext_path, encoding="utf-8") as fid:
-                pkgdata = json.load(fid)
-            if pkgdata["name"] not in federated_extensions:
-                data = dict(
-                    name=pkgdata["name"],
-                    version=pkgdata["version"],
-                    description=pkgdata.get("description", ""),
-                    url=get_package_url(pkgdata),
-                    ext_dir=ext_dir,
-                    ext_path=osp.dirname(ext_path),
-                    is_local=False,
-                    dependencies=pkgdata.get("dependencies", dict()),
-                    jupyterlab=pkgdata.get("jupyterlab", dict()),
-                )
-
-                # Add repository info if available
-                if "repository" in pkgdata and "url" in pkgdata.get("repository", {}):
-                    data["repository"] = dict(url=pkgdata.get("repository").get("url"))
-
-                install_path = osp.join(osp.dirname(ext_path), "install.json")
-                if osp.exists(install_path):
-                    with open(install_path, encoding="utf-8") as fid:
-                        data["install"] = json.load(fid)
-                federated_extensions[data["name"]] = data
-    return federated_extensions

jupyter_builder-0.1.0a2.dist-info/RECORD

@@ -1,21 +0,0 @@
-jupyter_builder/__init__.py,sha256=ucoo7W6O_PAP5ESIJ1klJViiKWeJbUqFCuc_QrW3XV8,568
-jupyter_builder/base_extension_app.py,sha256=NTtICU1zbc8n64Hd9tJ86FuYX7q5xqDVHhbmBAEINjw,1726
-jupyter_builder/commands.py,sha256=-h9brmCXhrKRMtefcqHEv4VnMREgWOkfU2PZmaxNraI,3440
-jupyter_builder/core_path.py,sha256=8cFbRg81aZj8LQiHFkXuHtlDffwDu4IlUypyaiI1gH8,245
-jupyter_builder/debug_log_file_mixin.py,sha256=816tIlPySoCbJak9Cj6eE57VjeQjz2jdySYsj4hqESw,2181
-jupyter_builder/federated_extensions.py,sha256=IaS7VIKlb09wgkIjjYhSXUJY8qYNpmCOMyLPWw3fKlI,17177
-jupyter_builder/federated_extensions_requirements.py,sha256=R-sAx1shGaGOwA9dIMPIc3kslEW2ih1w8RdrKWtZJ3c,2983
-jupyter_builder/jlpm.py,sha256=kYE6Pk9TADEhcxKkUXr6V0AhNdGDr5XnYO-D679R580,1233
-jupyter_builder/jupyterlab_semver.py,sha256=E7SKvf9ca4uDBWf_oSji5OHurycAIF8cUt4rwafHQto,9330
-jupyter_builder/jupyterlab_server_req.py,sha256=LKn_merwDkCT17OCsqTuOoRaX4uGGhyz-25wwiDkE2c,2613
-jupyter_builder/main.py,sha256=PGZ4MGYG20yDqonoQg_vKkeCzCkKKnrCOtU056Wdvr4,2231
-jupyter_builder/yarn.js,sha256=8EYGlNp3NZisReCOECOR_8DMDfMWLkfeZ-URewpzhq4,2221431
-jupyter_builder/extension_commands/__init__.py,sha256=eXcK7cn7Qj8A1SBiMJ4ptlf2WFErhSxG9QSKFtENyhU,101
-jupyter_builder/extension_commands/build.py,sha256=Px55wxLrOgh_OGzUebHw2cplepOn8WyU38gbqKvHTWk,1580
-jupyter_builder/extension_commands/develop.py,sha256=Ztl9qniWlxE86imNOpcNOLbPsZGRMhYQ3c_-_ozUICI,1696
-jupyter_builder/extension_commands/watch.py,sha256=OKuFk3N1vk2Yb-Cmy2yLOECCsNNn-qC0DcwSAkeyGGs,1463
-jupyter_builder-0.1.0a2.dist-info/METADATA,sha256=hBwpgheUzkezL5-z7yJALfmd3Y1ZpIPjnkeZHwQYZtQ,5300
-jupyter_builder-0.1.0a2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-jupyter_builder-0.1.0a2.dist-info/entry_points.txt,sha256=pQlwFs3R6-sOlkEDXzXwxu0tVNn4aBkaDJ8qRebDZko,95
-jupyter_builder-0.1.0a2.dist-info/licenses/LICENSE,sha256=T4GK8L2cxFmaXUe48VaSUF3T6pnn14gWtH1rXdz5VkI,1532
-jupyter_builder-0.1.0a2.dist-info/RECORD,,