| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent e5f1f87 commit fff0310
4 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,7 +22,7 @@ | |||
| 22 | 22 | # or check out the docs for administrative controls: | |
| 23 | 23 | # https://docs.python.org/using/windows | |
| 24 | 24 | DEFAULT_SOURCE_URL = "https://www.python.org/ftp/python/index-windows.json" | |
| 25 | - DEFAULT_TAG = "3.14" | ||
| 25 | + DEFAULT_TAG = "3" | ||
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | 28 | # TODO: Remove the /dev/ for stable release | |
@@ -253,6 +253,7 @@ def execute(self): | |||
| 253 | 253 | "fallback_source": (str, None, "env", "path", "uri"), | |
| 254 | 254 | "enable_shortcut_kinds": (str, config_split_append), | |
| 255 | 255 | "disable_shortcut_kinds": (str, config_split_append), | |
| 256 | + "default_install_tag": (str, None), | ||
| 256 | 257 | }, | |
| 257 | 258 | ||
| 258 | 259 | "first_run": { | |
@@ -792,12 +793,15 @@ class InstallCommand(BaseCommand): | |||
| 792 | 793 | from_script = None | |
| 793 | 794 | enable_shortcut_kinds = None | |
| 794 | 795 | disable_shortcut_kinds = None | |
| 796 | + default_install_tag = None | ||
| 795 | 797 | ||
| 796 | 798 | def __init__(self, args, root=None): | |
| 797 | 799 | super().__init__(args, root) | |
| 798 | 800 | ||
| 799 | 801 | if not self.source: | |
| 800 | 802 | self.source = DEFAULT_SOURCE_URL | |
| 803 | + if not self.default_install_tag: | ||
| 804 | + self.default_install_tag = self.default_tag | ||
| 801 | 805 | if "://" not in str(self.source): | |
| 802 | 806 | try: | |
| 803 | 807 | self.source = Path(self.source).absolute().as_uri() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -208,6 +208,8 @@ def resolve_config(cfg, source, relative_to, key_so_far="", schema=None, error_u | |||
| 208 | 208 | ||
| 209 | 209 | def merge_config(into_cfg, from_cfg, schema, *, source="<unknown>", overwrite=False): | |
| 210 | 210 | for k, v in from_cfg.items(): | |
| 211 | + if k.startswith("#"): | ||
| 212 | + continue | ||
| 211 | 213 | try: | |
| 212 | 214 | into = into_cfg[k] | |
| 213 | 215 | except LookupError: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -621,16 +621,16 @@ def execute(cmd): | |||
| 621 | 621 | if not cmd.by_id: | |
| 622 | 622 | for arg in cmd.args: | |
| 623 | 623 | if arg.casefold() == "default".casefold(): | |
| 624 | - LOGGER.debug("Replacing 'default' with '%s'", cmd.default_tag) | ||
| 625 | - cmd.tags.append(tag_or_range(cmd.default_tag)) | ||
| 624 | + LOGGER.debug("Replacing 'default' with '%s'", cmd.default_install_tag) | ||
| 625 | + cmd.tags.append(tag_or_range(cmd.default_install_tag)) | ||
| 626 | 626 | else: | |
| 627 | 627 | try: | |
| 628 | 628 | cmd.tags.append(tag_or_range(arg)) | |
| 629 | 629 | except ValueError as ex: | |
| 630 | 630 | LOGGER.warn("%s", ex) | |
| 631 | 631 | ||
| 632 | 632 | if not cmd.tags and cmd.automatic: | |
| 633 | - cmd.tags = [tag_or_range(cmd.default_tag)] | ||
| 633 | + cmd.tags = [tag_or_range(cmd.default_install_tag)] | ||
| 634 | 634 | else: | |
| 635 | 635 | if cmd.from_script: | |
| 636 | 636 | raise ArgumentError("Cannot use --by-id and --from-script together") | |
@@ -646,9 +646,9 @@ def execute(cmd): | |||
| 646 | 646 | try: | |
| 647 | 647 | tag = cmd.tags[0] | |
| 648 | 648 | except IndexError: | |
| 649 | - if cmd.default_tag: | ||
| 650 | - LOGGER.debug("No tags provided, installing default tag %s", cmd.default_tag) | ||
| 651 | - tag = cmd.default_tag | ||
| 649 | + if cmd.default_install_tag: | ||
| 650 | + LOGGER.debug("No tags provided, installing default tag %s", cmd.default_install_tag) | ||
| 651 | + tag = cmd.default_install_tag | ||
| 652 | 652 | else: | |
| 653 | 653 | LOGGER.debug("No tags provided, installing first runtime in feed") | |
| 654 | 654 | tag = None | |
@@ -688,7 +688,7 @@ def execute(cmd): | |||
| 688 | 688 | if spec: | |
| 689 | 689 | cmd.tags.append(tag_or_range(spec)) | |
| 690 | 690 | else: | |
| 691 | - cmd.tags.append(tag_or_range(cmd.default_tag)) | ||
| 691 | + cmd.tags.append(tag_or_range(cmd.default_install_tag)) | ||
| 692 | 692 | ||
| 693 | 693 | installed = list(cmd.get_installs()) | |
| 694 | 694 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,7 +1,10 @@ | |||
| 1 | 1 | { | |
| 2 | 2 | "install": { | |
| 3 | 3 | "source": "%PYTHON_MANAGER_SOURCE_URL%", | |
| 4 | - "fallback_source": "./bundled/fallback-index.json" | ||
| 4 | + "fallback_source": "./bundled/fallback-index.json", | ||
| 5 | + | ||
| 6 | + "#": "Install 3.14 (prerelease) by default during prerelease PyManager", | ||
| 7 | + "default_install_tag": "3-dev" | ||
| 5 | 8 | }, | |
| 6 | 9 | "list": { | |
| 7 | 10 | "format": "%PYTHON_MANAGER_LIST_FORMAT%" | |
| Back | FazBrowse Home | New Git URL |
0 commit comments