From 7bf047f1698d9e0585fca89a8fdc1c440aed65856b3eb4529ed400e80dcf0157 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 18 Dec 2022 15:00:51 +0000 Subject: [PATCH 1/3] - Update to version 1.8.14: * Update comment * Raise signal twice * Handle signals in julialauncher * Make get_juliaup_home_path work when no depot exists * Update deps * Add a missing conditional compile * fix typo in src/operations.rs error message * add more context to error-paths when handling juliaup startup script section * implement assumption that juliaup-path must be valid UTF-8 * add indoc for better string literal formatting to dependencies * refactor shell-specific content generation into separate functions * move shell-script section header into global constant * Search depot path for existing juliaup dir * add unit tests for match_markers * add indoc as dev dependency for unit tests * fix some clippy lints in operations.rs * remove temporary rustfmt attribute to prevent formatting * adapt removal logic to work on bytes as well * adapt match_markers to work on bytes instead of strings * add generated byte vector to startup file instead of strings * generate vector of bytes instead of string for writing to file * add bstr to Cargo.toml and Cargo.lock - Change to 4GB of memory in _constraints OBS-URL: https://build.opensuse.org/package/show/science/juliaup?expand=0&rev=67 --- _constraints | 2 +- _service | 2 +- juliaup-1.8.12.tar.xz | 3 --- juliaup-1.8.14.tar.xz | 3 +++ juliaup.changes | 32 ++++++++++++++++++++++++++++++++ juliaup.spec | 2 +- vendor.tar.xz | 4 ++-- 7 files changed, 40 insertions(+), 8 deletions(-) delete mode 100644 juliaup-1.8.12.tar.xz create mode 100644 juliaup-1.8.14.tar.xz diff --git a/_constraints b/_constraints index cf2c20d..4b9a936 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 12 + 4 diff --git a/_service b/_service index 7aa5e3e..5f64719 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/JuliaLang/juliaup @PARENT_TAG@ git - f8a03e994dc94cfcd54f932fa950361c371be051 + e52c0db v(.*) \1 enable diff --git a/juliaup-1.8.12.tar.xz b/juliaup-1.8.12.tar.xz deleted file mode 100644 index 8818573..0000000 --- a/juliaup-1.8.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7446a8b44cc962e644bbf9b625ed40265dbff08511b7d6b9b1ab59ea9efe17ec -size 66858832 diff --git a/juliaup-1.8.14.tar.xz b/juliaup-1.8.14.tar.xz new file mode 100644 index 0000000..cc71485 --- /dev/null +++ b/juliaup-1.8.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:753a0d0efa3c04387c767a8305ca22354abbd10500211fdb008f9ada16eca01d +size 66848236 diff --git a/juliaup.changes b/juliaup.changes index 7abcfc3..8bfcb26 100644 --- a/juliaup.changes +++ b/juliaup.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Sun Dec 18 14:51:39 UTC 2022 - socvirnyl.estela@gmail.com + +- Update to version 1.8.14: + * Update comment + * Raise signal twice + * Handle signals in julialauncher + * Make get_juliaup_home_path work when no depot exists + * Update deps + * Add a missing conditional compile + * fix typo in src/operations.rs error message + * add more context to error-paths when handling juliaup startup script section + * implement assumption that juliaup-path must be valid UTF-8 + * add indoc for better string literal formatting to dependencies + * refactor shell-specific content generation into separate functions + * move shell-script section header into global constant + * Search depot path for existing juliaup dir + * add unit tests for match_markers + * add indoc as dev dependency for unit tests + * fix some clippy lints in operations.rs + * remove temporary rustfmt attribute to prevent formatting + * adapt removal logic to work on bytes as well + * adapt match_markers to work on bytes instead of strings + * add generated byte vector to startup file instead of strings + * generate vector of bytes instead of string for writing to file + * add bstr to Cargo.toml and Cargo.lock + +------------------------------------------------------------------- +Sun Dec 18 14:50:32 UTC 2022 - Soc Virnyl Estela + +- Change to 4GB of memory in _constraints + ------------------------------------------------------------------- Sat Dec 03 13:06:55 UTC 2022 - Soc Virnyl Estela diff --git a/juliaup.spec b/juliaup.spec index d191e33..cb1e764 100644 --- a/juliaup.spec +++ b/juliaup.spec @@ -21,7 +21,7 @@ %global latest_julia_version 1.8.3 Name: juliaup -Version: 1.8.12 +Version: 1.8.14 Release: 0 Summary: Julia installer and version multiplexer License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND ISC AND MIT AND MPL-2.0 AND MIT diff --git a/vendor.tar.xz b/vendor.tar.xz index 44fe637..9f7079d 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c742f6d0a3cf80063f1c9915963c9770b2bd40d1365843326087e1abd98c6c5e -size 34210708 +oid sha256:165821010493e592cea54522064885e5d20b78f4eb965816f2c4dc4e875f552a +size 34611944 From 57f2de2077e1ae53ef64f7549ad92f8503b55736673e301b8c5e7f54b9d281ef Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 26 Dec 2022 06:22:49 +0000 Subject: [PATCH 2/3] - Add 0000-fix-typo.patch - Automatic update of vendored dependencies OBS-URL: https://build.opensuse.org/package/show/science/juliaup?expand=0&rev=68 --- 0000-fix-typo.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++ juliaup.changes | 8 ++++++- juliaup.spec | 3 ++- vendor.tar.xz | 4 ++-- 4 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 0000-fix-typo.patch diff --git a/0000-fix-typo.patch b/0000-fix-typo.patch new file mode 100644 index 0000000..ae85627 --- /dev/null +++ b/0000-fix-typo.patch @@ -0,0 +1,56 @@ +From 81addc626a5995f36f279e37022c354dc2a4fb4c Mon Sep 17 00:00:00 2001 +From: Shayan Davoodi <52105833+shayandavoodii@users.noreply.github.com> +Date: Sun, 25 Dec 2022 22:42:27 +0330 +Subject: [PATCH] Fix typo `uopdate` => `update` (#536) + +--- + src/command_selfupdate.rs | 8 ++++---- + src/command_update.rs | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/command_selfupdate.rs b/src/command_selfupdate.rs +index e29d8ff4..93770692 100644 +--- a/src/command_selfupdate.rs ++++ b/src/command_selfupdate.rs +@@ -11,7 +11,7 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { + use crate::{get_juliaup_target, get_own_version}; + + update_version_db(paths) +- .with_context(|| "Failed to uopdate versions db.")?; ++ .with_context(|| "Failed to update versions db.")?; + + let mut config_file = + load_mut_config_db(paths).with_context(|| "`selfupdate` command failed to load configuration db.")?; +@@ -77,7 +77,7 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { + use windows::{core::Interface,Win32::{System::Console::GetConsoleWindow, UI::Shell::IInitializeWithWindow}}; + + update_version_db(paths) +- .with_context(|| "Failed to uopdate versions db.")?; ++ .with_context(|| "Failed to update versions db.")?; + + let update_manager = windows::Services::Store::StoreContext::GetDefault() + .with_context(|| "Failed to get the store context.")?; +@@ -116,6 +116,6 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { + #[cfg(not(any(feature = "windowsstore", feature = "selfupdate")))] + pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { + update_version_db(paths) +- .with_context(|| "Failed to uopdate versions db.")?; ++ .with_context(|| "Failed to update versions db.")?; + Ok(()) +-} +\ No newline at end of file ++} +diff --git a/src/command_update.rs b/src/command_update.rs +index 502fbcb0..ae2829e3 100644 +--- a/src/command_update.rs ++++ b/src/command_update.rs +@@ -50,7 +50,7 @@ fn update_channel(config_db: &mut JuliaupConfig, channel: &String, version_db: & + + pub fn run_command_update(channel: Option, paths: &GlobalPaths) -> Result<()> { + update_version_db(paths) +- .with_context(|| "Failed to uopdate versions db.")?; ++ .with_context(|| "Failed to update versions db.")?; + + let version_db = + load_versions_db(paths).with_context(|| "`update` command failed to load versions db.")?; + diff --git a/juliaup.changes b/juliaup.changes index 8bfcb26..cf53a76 100644 --- a/juliaup.changes +++ b/juliaup.changes @@ -1,5 +1,11 @@ ------------------------------------------------------------------- -Sun Dec 18 14:51:39 UTC 2022 - socvirnyl.estela@gmail.com +Mon Dec 26 06:17:39 UTC 2022 - Soc Virnyl Estela + +- Add 0000-fix-typo.patch +- Automatic update of vendored dependencies + +------------------------------------------------------------------- +Sun Dec 18 14:51:39 UTC 2022 - Soc Virnyl Estela - Update to version 1.8.14: * Update comment diff --git a/juliaup.spec b/juliaup.spec index cb1e764..779b4ab 100644 --- a/juliaup.spec +++ b/juliaup.spec @@ -30,6 +30,7 @@ URL: https://github.com/JuliaLang/juliaup Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config +Patch0: 0000-fix-typo.patch BuildRequires: cargo-packaging BuildRequires: rust+cargo @@ -46,7 +47,7 @@ when new Julia versions are released and provides a convenient Julia release channel abstraction. %prep -%autosetup -a1 +%autosetup -a1 -p1 mkdir .cargo cp %{SOURCE2} .cargo/config diff --git a/vendor.tar.xz b/vendor.tar.xz index 9f7079d..fd08650 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:165821010493e592cea54522064885e5d20b78f4eb965816f2c4dc4e875f552a -size 34611944 +oid sha256:1271299d502cd84c3c19670636f7d88497b3ed39a13470573264929f3736c521 +size 34622316 From aff2c243cdf2116f5dcbbc1a0a006916f2d2db04aa468d8e1cec8c68b1e0d329 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 4 Jan 2023 01:21:36 +0000 Subject: [PATCH 3/3] - Update to version 1.8.16: * chore: Release juliaup version 1.8.16 * Adjust README text * Update some names * Document installer command line args * chore: Release juliaup version 1.8.15 * Update deps * Fix a warning * Add --channel option to self installer * Finish non-interactive install option * Add support for non-interactive install * add an ls alias for list * Add a comment * Purge the Fastly cache before downloading `versions.json` * Update version db * "Update Version DB": cc the user that triggered the workflow run * Update version db * Fix typo `uopdate` => `update` (#536) * Update version db * Update deps - Remove 0000-fix-typo.patch. Fix already included in 1.8.16. OBS-URL: https://build.opensuse.org/package/show/science/juliaup?expand=0&rev=69 --- 0000-fix-typo.patch | 56 ------------------------------------------- _service | 2 +- juliaup-1.8.14.tar.xz | 3 --- juliaup-1.8.16.tar.xz | 3 +++ juliaup.changes | 25 +++++++++++++++++++ juliaup.spec | 5 ++-- vendor.tar.xz | 4 ++-- 7 files changed, 33 insertions(+), 65 deletions(-) delete mode 100644 0000-fix-typo.patch delete mode 100644 juliaup-1.8.14.tar.xz create mode 100644 juliaup-1.8.16.tar.xz diff --git a/0000-fix-typo.patch b/0000-fix-typo.patch deleted file mode 100644 index ae85627..0000000 --- a/0000-fix-typo.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 81addc626a5995f36f279e37022c354dc2a4fb4c Mon Sep 17 00:00:00 2001 -From: Shayan Davoodi <52105833+shayandavoodii@users.noreply.github.com> -Date: Sun, 25 Dec 2022 22:42:27 +0330 -Subject: [PATCH] Fix typo `uopdate` => `update` (#536) - ---- - src/command_selfupdate.rs | 8 ++++---- - src/command_update.rs | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/command_selfupdate.rs b/src/command_selfupdate.rs -index e29d8ff4..93770692 100644 ---- a/src/command_selfupdate.rs -+++ b/src/command_selfupdate.rs -@@ -11,7 +11,7 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { - use crate::{get_juliaup_target, get_own_version}; - - update_version_db(paths) -- .with_context(|| "Failed to uopdate versions db.")?; -+ .with_context(|| "Failed to update versions db.")?; - - let mut config_file = - load_mut_config_db(paths).with_context(|| "`selfupdate` command failed to load configuration db.")?; -@@ -77,7 +77,7 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { - use windows::{core::Interface,Win32::{System::Console::GetConsoleWindow, UI::Shell::IInitializeWithWindow}}; - - update_version_db(paths) -- .with_context(|| "Failed to uopdate versions db.")?; -+ .with_context(|| "Failed to update versions db.")?; - - let update_manager = windows::Services::Store::StoreContext::GetDefault() - .with_context(|| "Failed to get the store context.")?; -@@ -116,6 +116,6 @@ pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { - #[cfg(not(any(feature = "windowsstore", feature = "selfupdate")))] - pub fn run_command_selfupdate(paths: &GlobalPaths) -> Result<()> { - update_version_db(paths) -- .with_context(|| "Failed to uopdate versions db.")?; -+ .with_context(|| "Failed to update versions db.")?; - Ok(()) --} -\ No newline at end of file -+} -diff --git a/src/command_update.rs b/src/command_update.rs -index 502fbcb0..ae2829e3 100644 ---- a/src/command_update.rs -+++ b/src/command_update.rs -@@ -50,7 +50,7 @@ fn update_channel(config_db: &mut JuliaupConfig, channel: &String, version_db: & - - pub fn run_command_update(channel: Option, paths: &GlobalPaths) -> Result<()> { - update_version_db(paths) -- .with_context(|| "Failed to uopdate versions db.")?; -+ .with_context(|| "Failed to update versions db.")?; - - let version_db = - load_versions_db(paths).with_context(|| "`update` command failed to load versions db.")?; - diff --git a/_service b/_service index 5f64719..a05bb3b 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/JuliaLang/juliaup @PARENT_TAG@ git - e52c0db + 0a42faa v(.*) \1 enable diff --git a/juliaup-1.8.14.tar.xz b/juliaup-1.8.14.tar.xz deleted file mode 100644 index cc71485..0000000 --- a/juliaup-1.8.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:753a0d0efa3c04387c767a8305ca22354abbd10500211fdb008f9ada16eca01d -size 66848236 diff --git a/juliaup-1.8.16.tar.xz b/juliaup-1.8.16.tar.xz new file mode 100644 index 0000000..45584c2 --- /dev/null +++ b/juliaup-1.8.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ef5437fcad3951e2591c03f476ef8c483465675072d2a205291e3f5fb901ac8 +size 66824436 diff --git a/juliaup.changes b/juliaup.changes index cf53a76..664ed1b 100644 --- a/juliaup.changes +++ b/juliaup.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Jan 04 00:30:24 UTC 2023 - Soc Virnyl Estela + +- Update to version 1.8.16: + * chore: Release juliaup version 1.8.16 + * Adjust README text + * Update some names + * Document installer command line args + * chore: Release juliaup version 1.8.15 + * Update deps + * Fix a warning + * Add --channel option to self installer + * Finish non-interactive install option + * Add support for non-interactive install + * add an ls alias for list + * Add a comment + * Purge the Fastly cache before downloading `versions.json` + * Update version db + * "Update Version DB": cc the user that triggered the workflow run + * Update version db + * Fix typo `uopdate` => `update` (#536) + * Update version db + * Update deps +- Remove 0000-fix-typo.patch. Fix already included in 1.8.16. + ------------------------------------------------------------------- Mon Dec 26 06:17:39 UTC 2022 - Soc Virnyl Estela diff --git a/juliaup.spec b/juliaup.spec index 779b4ab..2426136 100644 --- a/juliaup.spec +++ b/juliaup.spec @@ -1,7 +1,7 @@ # # spec file for package juliaup # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %global latest_julia_version 1.8.3 Name: juliaup -Version: 1.8.14 +Version: 1.8.16 Release: 0 Summary: Julia installer and version multiplexer License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND ISC AND MIT AND MPL-2.0 AND MIT @@ -30,7 +30,6 @@ URL: https://github.com/JuliaLang/juliaup Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config -Patch0: 0000-fix-typo.patch BuildRequires: cargo-packaging BuildRequires: rust+cargo diff --git a/vendor.tar.xz b/vendor.tar.xz index fd08650..363d9f3 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1271299d502cd84c3c19670636f7d88497b3ed39a13470573264929f3736c521 -size 34622316 +oid sha256:0b3704eabb18f207cba9c80d1b75982f2c70ba7b32e189ea5ab5eeb081f929f7 +size 34606104