From 40f8d01c880de95929bbc1ff3eddc745d888642a Mon Sep 17 00:00:00 2001 From: Ryan Volz Date: Fri, 23 Jul 2021 15:50:26 -0400 Subject: [PATCH 1/2] Put installer-only packages in a package spec yaml. This also moves the radioconda_console_shortcut to the installer-only package list. --- radioconda.yaml | 2 -- radioconda_installer.yaml | 7 +++++++ rerender.py | 29 +++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 radioconda_installer.yaml diff --git a/radioconda.yaml b/radioconda.yaml index d8aa714..84142f7 100644 --- a/radioconda.yaml +++ b/radioconda.yaml @@ -1,7 +1,6 @@ name: radioconda channels: - conda-forge - - ryanvolz # [win] platforms: - linux-64 - osx-64 @@ -24,7 +23,6 @@ dependencies: - python # restrict to python 3.8 on Windows for Windows 7 compatibility - python 3.8.* # [win] - - radioconda_console_shortcut # [win] - rtl-sdr - scipy - soapysdr diff --git a/radioconda_installer.yaml b/radioconda_installer.yaml new file mode 100644 index 0000000..cb2940e --- /dev/null +++ b/radioconda_installer.yaml @@ -0,0 +1,7 @@ +name: radioconda_installer +channels: + - conda-forge + - ryanvolz # [win] +dependencies: + - mamba + - radioconda_console_shortcut # [win] diff --git a/rerender.py b/rerender.py index 4479cc6..7e76f7f 100755 --- a/rerender.py +++ b/rerender.py @@ -143,7 +143,7 @@ def render_constructor( def render_platforms( environment_file: pathlib.Path, - installer_pkg_specs: List[str], + installer_environment_file: pathlib.Path, version: str, company: str, license_file: pathlib.Path, @@ -192,9 +192,14 @@ def render_platforms( ) # add installer-only (base environment) packages and lock those too + installer_pkg_spec = conda_lock.conda_lock.parse_environment_file( + environment_file=installer_environment_file, platform=platform + ) installer_spec = conda_lock.src_parser.LockSpecification( - specs=sorted(locked_env_spec.specs + installer_pkg_specs), - channels=locked_env_spec.channels, + specs=sorted(locked_env_spec.specs + installer_pkg_spec.specs), + channels=sorted( + set(locked_env_spec.channels) | set(installer_pkg_spec.channels) + ), platform=locked_env_spec.platform, ) locked_installer_spec = lock_env_spec(installer_spec, conda_exe) @@ -202,7 +207,8 @@ def render_platforms( # get a set of only the packages to put in the constructor specification # taken from the installer-only list and those explicitly selected originally constructor_pkg_names = set( - name_from_pkg_spec(spec) for spec in env_spec.specs + installer_pkg_specs + name_from_pkg_spec(spec) + for spec in env_spec.specs + installer_pkg_spec.specs ) # filter the installer spec by the constructor package names @@ -269,11 +275,22 @@ if __name__ == "__main__": nargs="?", default=here / f"{distname}.yaml", help=( - "YAML file defining an installer distribution, with a 'name' string and" + "YAML file defining a distribution, with a 'name' string and" " 'channels', 'platforms', and 'dependencies' lists." " (default: %(default)s)" ), ) + parser.add_argument( + "installer_environment_file", + type=pathlib.Path, + nargs="?", + default=here / f"{distname}_installer.yaml", + help=( + "YAML file defining additional packages for the installer, with a 'name'" + " string and 'channels' and 'dependencies' lists." + " (default: %(default)s)" + ), + ) parser.add_argument( "-v", "--version", @@ -331,7 +348,7 @@ if __name__ == "__main__": constructor_specs = render_platforms( environment_file=args.environment_file, - installer_pkg_specs=["mamba"], + installer_environment_file=args.installer_environment_file, version=args.version, company=args.company, license_file=args.license_file, From 5e9e3ecff69d9ef7d5016133a0fd4de77e8ad9e2 Mon Sep 17 00:00:00 2001 From: Ryan Volz Date: Fri, 23 Jul 2021 16:06:32 -0400 Subject: [PATCH 2/2] Re-render 2021.07.23 --- installer_specs/radioconda-win-64.lock | 3 +-- installer_specs/radioconda-win-64.yml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/installer_specs/radioconda-win-64.lock b/installer_specs/radioconda-win-64.lock index 56ed087..1742b82 100644 --- a/installer_specs/radioconda-win-64.lock +++ b/installer_specs/radioconda-win-64.lock @@ -1,7 +1,6 @@ # platform: win-64 -# env_hash: dd9a74b01235ea822f6439aec0252480c0c5f80f0d01afad0cedd51254807bc3 +# env_hash: a6c4c49c97fc2a05e7e80ad2abf45b057b95bf65f48079317cf56f55e3b1dca4 @EXPLICIT -https://conda.anaconda.org/ryanvolz/win-64/radioconda_console_shortcut-1.0-0.tar.bz2#29b615e3784c3011eaad9451ae284d30 https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2021.5.30-h5b45459_0.tar.bz2#cfb6380d41af681ad323403f02755a15 https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45 https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6 diff --git a/installer_specs/radioconda-win-64.yml b/installer_specs/radioconda-win-64.yml index 57d561a..f5eec91 100644 --- a/installer_specs/radioconda-win-64.yml +++ b/installer_specs/radioconda-win-64.yml @@ -1,6 +1,5 @@ channels: - conda-forge -- ryanvolz dependencies: - adwaita-icon-theme=40.1.1=h57928b3_1 - appdirs=1.4.4=pyh9f0ad1d_0 @@ -160,7 +159,6 @@ dependencies: - pyzmq=22.1.0=py38h09162b1_0 - qt=5.12.9=h5909a2a_4 - qwt=6.1.6=h552f0f6_0 -- radioconda_console_shortcut=1.0=0 - requests=2.26.0=pyhd8ed1ab_0 - rtl-sdr=0.6.0=h8ffe710_2 - scipy=1.7.0=py38he847743_0