July 2024 - openSUSE Commits - openSUSE Mailing Lists

commit gum for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gum for openSUSE:Factory checked in at 2024-07-11 20:32:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gum (Old) and /work/SRC/openSUSE:Factory/.gum.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gum" Thu Jul 11 20:32:59 2024 rev:4 rq:1186718 version:0.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gum/gum.changes 2024-05-03 10:29:04.687529613 +0200 +++ /work/SRC/openSUSE:Factory/.gum.new.17339/gum.changes 2024-07-11 20:33:40.665959597 +0200 @@ -1,0 +2,13 @@ +Thu Jul 11 00:17:31 UTC 2024 - Joshua Smith <smolsheep(a)opensuse.org> + +- Switch from deprecated %setup to %autosetup +- Update to 0.14.1: + New: + * Show help with Huh? + * Support using the Home/End keys in pager + Fixes: + * Handle huh? user aborted error + * Cursor styling + * Re-introduce ESC for gum write + +------------------------------------------------------------------- Old: ---- gum-0.14.0.tar.gz New: ---- gum-0.14.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gum.spec ++++++ --- /var/tmp/diff_new_pack.cOL1wg/_old 2024-07-11 20:33:41.317983195 +0200 +++ /var/tmp/diff_new_pack.cOL1wg/_new 2024-07-11 20:33:41.317983195 +0200 @@ -18,7 +18,7 @@ %global _lto_cflags %nil Name: gum -Version: 0.14.0 +Version: 0.14.1 Release: 0 Summary: Tool for glamorous shell scripts License: MIT @@ -62,7 +62,7 @@ Zsh command-line completion support for %{name}. %prep -%setup -qa1 +%autosetup -a1 %build %ifarch ppc64 ++++++ gum-0.14.0.tar.gz -> gum-0.14.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/.github/workflows/lint-soft.yml new/gum-0.14.1/.github/workflows/lint-soft.yml --- old/gum-0.14.0/.github/workflows/lint-soft.yml 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/.github/workflows/lint-soft.yml 2024-05-25 20:56:32.000000000 +0200 @@ -20,7 +20,7 @@ - uses: actions/checkout@v4 - name: golangci-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v6 with: # Optional: golangci-lint command line arguments. args: --config .golangci-soft.yml --issues-exit-code=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/.github/workflows/lint.yml new/gum-0.14.1/.github/workflows/lint.yml --- old/gum-0.14.0/.github/workflows/lint.yml 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/.github/workflows/lint.yml 2024-05-25 20:56:32.000000000 +0200 @@ -20,7 +20,7 @@ - uses: actions/checkout@v4 - name: golangci-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v6 with: # Optional: golangci-lint command line arguments. #args: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/.golangci-soft.yml new/gum-0.14.1/.golangci-soft.yml --- old/gum-0.14.0/.golangci-soft.yml 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/.golangci-soft.yml 2024-05-25 20:56:32.000000000 +0200 @@ -31,10 +31,10 @@ - noctx - nolintlint - prealloc - - wrapcheck # disable default linters, they are already enabled in .golangci.yml disable: + - wrapcheck - deadcode - errcheck - gosimple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/README.md new/gum-0.14.1/README.md --- old/gum-0.14.0/README.md 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/README.md 2024-05-25 20:56:32.000000000 +0200 @@ -68,6 +68,7 @@ nix-env -iA nixpkgs.gum # Windows (via WinGet or Scoop) +winget install charmbracelet.gum scoop install charm-gum ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/choose/command.go new/gum-0.14.1/choose/command.go --- old/gum-0.14.0/choose/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/choose/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -14,6 +14,8 @@ "github.com/charmbracelet/gum/internal/stdin" ) +const widthBuffer = 2 + // Run provides a shell script interface for choosing between different through // options. func (o Options) Run() error { @@ -22,7 +24,7 @@ if input == "" { return errors.New("no options provided, see `gum choose --help`") } - o.Options = strings.Split(strings.TrimSuffix(input, "\n"), "\n") + o.Options = strings.Split(input, "\n") } if o.SelectIfOne && len(o.Options) == 1 { @@ -55,36 +57,33 @@ } width := max(widest(o.Options)+ - max(lipgloss.Width(o.SelectedPrefix), lipgloss.Width(o.UnselectedPrefix))+ - lipgloss.Width(o.Cursor)+1, lipgloss.Width(o.Header)+1) + max(lipgloss.Width(o.SelectedPrefix)+lipgloss.Width(o.UnselectedPrefix))+ + lipgloss.Width(o.Cursor)+1, lipgloss.Width(o.Header)+widthBuffer) if o.Limit > 1 { var choices []string - err := huh.NewForm( - huh.NewGroup( - huh.NewMultiSelect[string](). - Options(options...). - Title(o.Header). - Filterable(false). - Height(o.Height). - Limit(o.Limit). - Value(&choices), - ), - ). + + field := huh.NewMultiSelect[string](). + Options(options...). + Title(o.Header). + Height(o.Height). + Limit(o.Limit). + Value(&choices) + + form := huh.NewForm(huh.NewGroup(field)) + + err := form. WithWidth(width). - WithShowHelp(false). + WithShowHelp(o.ShowHelp). WithTheme(theme). Run() + if err != nil { return err } if len(choices) > 0 { s := strings.Join(choices, "\n") - if isatty.IsTerminal(os.Stdout.Fd()) { - fmt.Println(s) - } else { - fmt.Print(ansi.Strip(s)) - } + ansiprint(s) } return nil } @@ -102,7 +101,7 @@ ). WithWidth(width). WithTheme(theme). - WithShowHelp(false). + WithShowHelp(o.ShowHelp). Run() if err != nil { @@ -128,3 +127,11 @@ } return max } + +func ansiprint(s string) { + if isatty.IsTerminal(os.Stdout.Fd()) { + fmt.Println(s) + } else { + fmt.Print(ansi.Strip(s)) + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/choose/options.go new/gum-0.14.1/choose/options.go --- old/gum-0.14.0/choose/options.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/choose/options.go 2024-05-25 20:56:32.000000000 +0200 @@ -14,7 +14,8 @@ Ordered bool `help:"Maintain the order of the selected options" env:"GUM_CHOOSE_ORDERED"` Height int `help:"Height of the list" default:"10" env:"GUM_CHOOSE_HEIGHT"` Cursor string `help:"Prefix to show on item that corresponds to the cursor position" default:"> " env:"GUM_CHOOSE_CURSOR"` - Header string `help:"Header value" default:"" env:"GUM_CHOOSE_HEADER"` + ShowHelp bool `help:"Show help keybinds" default:"true" negatable:"true" env:"GUM_CHOOSE_SHOW_HELP"` + Header string `help:"Header value" default:"Choose:" env:"GUM_CHOOSE_HEADER"` CursorPrefix string `help:"Prefix to show on the cursor item (hidden if limit is 1)" default:"• " env:"GUM_CHOOSE_CURSOR_PREFIX"` SelectedPrefix string `help:"Prefix to show on selected items (hidden if limit is 1)" default:"✓ " env:"GUM_CHOOSE_SELECTED_PREFIX"` UnselectedPrefix string `help:"Prefix to show on unselected items (hidden if limit is 1)" default:"• " env:"GUM_CHOOSE_UNSELECTED_PREFIX"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/confirm/command.go new/gum-0.14.1/confirm/command.go --- old/gum-0.14.0/confirm/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/confirm/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -5,14 +5,12 @@ "os" "github.com/charmbracelet/huh" - "github.com/charmbracelet/lipgloss" ) // Run provides a shell script interface for prompting a user to confirm an // action with an affirmative or negative answer. func (o Options) Run() error { theme := huh.ThemeCharm() - theme.Focused.Base = lipgloss.NewStyle().Margin(0, 1) theme.Focused.Title = o.PromptStyle.ToLipgloss() theme.Focused.FocusedButton = o.SelectedStyle.ToLipgloss() theme.Focused.BlurredButton = o.UnselectedStyle.ToLipgloss() @@ -29,7 +27,7 @@ ), ). WithTheme(theme). - WithShowHelp(false). + WithShowHelp(o.ShowHelp). Run() if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/confirm/options.go new/gum-0.14.1/confirm/options.go --- old/gum-0.14.0/confirm/options.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/confirm/options.go 2024-05-25 20:56:32.000000000 +0200 @@ -8,14 +8,16 @@ // Options is the customization options for the confirm command. type Options struct { - Default bool `help:"Default confirmation action" default:"true"` - Affirmative string `help:"The title of the affirmative action" default:"Yes"` - Negative string `help:"The title of the negative action" default:"No"` - Prompt string `arg:"" help:"Prompt to display." default:"Are you sure?"` - PromptStyle style.Styles `embed:"" prefix:"prompt." help:"The style of the prompt" set:"defaultMargin=1 0 0 1" envprefix:"GUM_CONFIRM_PROMPT_"` + Default bool `help:"Default confirmation action" default:"true"` + Affirmative string `help:"The title of the affirmative action" default:"Yes"` + Negative string `help:"The title of the negative action" default:"No"` + Prompt string `arg:"" help:"Prompt to display." default:"Are you sure?"` + //nolint:staticcheck + PromptStyle style.Styles `embed:"" prefix:"prompt." help:"The style of the prompt" set:"defaultMargin=0 0 0 1" set:"defaultForeground=#7571F9" set:"defaultBold=true" envprefix:"GUM_CONFIRM_PROMPT_"` //nolint:staticcheck SelectedStyle style.Styles `embed:"" prefix:"selected." help:"The style of the selected action" set:"defaultBackground=212" set:"defaultForeground=230" set:"defaultPadding=0 3" set:"defaultMargin=0 1" envprefix:"GUM_CONFIRM_SELECTED_"` //nolint:staticcheck UnselectedStyle style.Styles `embed:"" prefix:"unselected." help:"The style of the unselected action" set:"defaultBackground=235" set:"defaultForeground=254" set:"defaultPadding=0 3" set:"defaultMargin=0 1" envprefix:"GUM_CONFIRM_UNSELECTED_"` + ShowHelp bool `help:"Show help key binds" negatable:"" default:"true" env:"GUM_CONFIRM_SHOW_HELP"` Timeout time.Duration `help:"Timeout until confirm returns selected value or default if provided" default:"0" env:"GUM_CONFIRM_TIMEOUT"` } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/default.nix new/gum-0.14.1/default.nix --- old/gum-0.14.0/default.nix 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/default.nix 2024-05-25 20:56:32.000000000 +0200 @@ -1,7 +1,12 @@ { pkgs }: -pkgs.buildGoModule { - name = "gum"; +pkgs.buildGoModule rec { + pname = "gum"; + version = "0.14.0"; + src = ./.; - vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; + + vendorHash = "sha256-gDDaKrwlrJyyDzgyGf9iP/XPnOAwpkvIyzCXobXrlF4="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/examples/test.sh new/gum-0.14.1/examples/test.sh --- old/gum-0.14.0/examples/test.sh 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/examples/test.sh 2024-05-25 20:56:32.000000000 +0200 @@ -40,7 +40,7 @@ # Write gum write -gum write --width 40 --height 3 --placeholder "Type whatever you want" --prompt "| " --show-cursor-line --show-line-numbers --value "Something..." --base.padding 1 --cursor.foreground 99 --prompt.foreground 99 +gum write --width 40 --height 6 --placeholder "Type whatever you want" --prompt "| " --show-cursor-line --show-line-numbers --value "Something..." --base.padding 1 --cursor.foreground 99 --prompt.foreground 99 # Table gum table < table/example.csv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/file/command.go new/gum-0.14.1/file/command.go --- old/gum-0.14.0/file/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/file/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -30,6 +30,9 @@ theme.Focused.Directory = o.DirectoryStyle.ToLipgloss() theme.Focused.SelectedOption = o.SelectedStyle.ToLipgloss() + keymap := huh.NewDefaultKeyMap() + keymap.FilePicker.Open.SetEnabled(false) + // XXX: These should be file selected specific. theme.Focused.TextInput.Placeholder = o.PermissionsStyle.ToLipgloss() theme.Focused.TextInput.Prompt = o.CursorStyle.ToLipgloss() @@ -46,7 +49,8 @@ Value(&path), ), ). - WithShowHelp(false). + WithShowHelp(o.ShowHelp). + WithKeyMap(keymap). WithTheme(theme). Run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/file/options.go new/gum-0.14.1/file/options.go --- old/gum-0.14.0/file/options.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/file/options.go 2024-05-25 20:56:32.000000000 +0200 @@ -15,6 +15,7 @@ All bool `short:"a" help:"Show hidden and 'dot' files" default:"false" env:"GUM_FILE_ALL"` File bool `help:"Allow files selection" default:"true" env:"GUM_FILE_FILE"` Directory bool `help:"Allow directories selection" default:"false" env:"GUM_FILE_DIRECTORY"` + ShowHelp bool `help:"Show help key binds" negatable:"" default:"true" env:"GUM_FILE_SHOW_HELP"` Height int `help:"Maximum number of files to display" default:"10" env:"GUM_FILE_HEIGHT"` CursorStyle style.Styles `embed:"" prefix:"cursor." help:"The cursor style" set:"defaultForeground=212" envprefix:"GUM_FILE_CURSOR_"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/filter/command.go new/gum-0.14.1/filter/command.go --- old/gum-0.14.0/filter/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/filter/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -34,7 +34,7 @@ if len(o.Options) == 0 { if input, _ := stdin.Read(); input != "" { - o.Options = strings.Split(strings.TrimSuffix(input, "\n"), "\n") + o.Options = strings.Split(input, "\n") } else { o.Options = files.List() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/flake.lock new/gum-0.14.1/flake.lock --- old/gum-0.14.0/flake.lock 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/flake.lock 2024-05-25 20:56:32.000000000 +0200 @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -17,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664107978, - "narHash": "sha256-31I9XnIjXkUa62BM1Zr/ylKMf9eVO5PtoX2mGpmB7/U=", + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72783a2d0dbbf030bff1537873dd5b85b3fb332f", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/flake.nix new/gum-0.14.1/flake.nix --- old/gum-0.14.0/flake.nix 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/flake.nix 2024-05-25 20:56:32.000000000 +0200 @@ -2,8 +2,8 @@ description = "A tool for glamorous shell scripts"; inputs = { - nixpkgs.url = github:nixos/nixpkgs/nixos-22.05; - flake-utils.url = github:numtide/flake-utils; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, nixpkgs, flake-utils }: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/go.mod new/gum-0.14.1/go.mod --- old/gum-0.14.0/go.mod 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/go.mod 2024-05-25 20:56:32.000000000 +0200 @@ -6,10 +6,10 @@ github.com/alecthomas/kong v0.9.0 github.com/alecthomas/mango-kong v0.1.0 github.com/charmbracelet/bubbles v0.18.0 - github.com/charmbracelet/bubbletea v0.25.0 + github.com/charmbracelet/bubbletea v0.26.3 github.com/charmbracelet/glamour v0.7.0 - github.com/charmbracelet/huh v0.3.1-0.20240404200615-66118a2cb3cf - github.com/charmbracelet/lipgloss v0.10.0 + github.com/charmbracelet/huh v0.4.2 + github.com/charmbracelet/lipgloss v0.11.0 github.com/charmbracelet/log v0.4.0 github.com/mattn/go-isatty v0.0.20 github.com/muesli/reflow v0.3.0 @@ -19,15 +19,19 @@ ) require ( - github.com/alecthomas/chroma/v2 v2.13.0 // indirect + github.com/alecthomas/chroma/v2 v2.14.0 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/catppuccin/go v0.2.0 // indirect - github.com/charmbracelet/x/exp/strings v0.0.0-20240405134957-07f093a22d1c // indirect - github.com/containerd/console v1.0.4 // indirect + github.com/charmbracelet/x/ansi v0.1.1 // indirect + github.com/charmbracelet/x/exp/strings v0.0.0-20240525152034-77596eb8760e // indirect + github.com/charmbracelet/x/input v0.1.1 // indirect + github.com/charmbracelet/x/term v0.1.1 // indirect + github.com/charmbracelet/x/windows v0.1.2 // indirect github.com/dlclark/regexp2 v1.11.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect + github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect @@ -39,12 +43,12 @@ github.com/muesli/mango v0.2.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/rivo/uniseg v0.4.7 // indirect + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yuin/goldmark v1.7.1 // indirect github.com/yuin/goldmark-emoji v1.0.2 // indirect - golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect - golang.org/x/net v0.24.0 // indirect + golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/go.sum new/gum-0.14.1/go.sum --- old/gum-0.14.0/go.sum 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/go.sum 2024-05-25 20:56:32.000000000 +0200 @@ -1,9 +1,7 @@ -github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= -github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= -github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU= -github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/chroma/v2 v2.13.0 h1:VP72+99Fb2zEcYM0MeaWJmV+xQvz5v5cxRHd+ooU1lI= -github.com/alecthomas/chroma/v2 v2.13.0/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk= +github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE= +github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E= +github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I= github.com/alecthomas/kong v0.9.0 h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA= github.com/alecthomas/kong v0.9.0/go.mod h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os= github.com/alecthomas/mango-kong v0.1.0 h1:iFVfP1k1K4qpml3JUQmD5I8MCQYfIvsD9mRdrw7jJC4= @@ -20,28 +18,36 @@ github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0= github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw= -github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM= -github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg= +github.com/charmbracelet/bubbletea v0.26.3 h1:iXyGvI+FfOWqkB2V07m1DF3xxQijxjY2j8PqiXYqasg= +github.com/charmbracelet/bubbletea v0.26.3/go.mod h1:bpZHfDHTYJC5g+FBK+ptJRCQotRC+Dhh3AoMxa/2+3Q= github.com/charmbracelet/glamour v0.7.0 h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng= github.com/charmbracelet/glamour v0.7.0/go.mod h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps= -github.com/charmbracelet/huh v0.3.1-0.20240404200615-66118a2cb3cf h1:+9fHRq6kLZs4xebUCgMBNUY8d0rd05jeNMPcbYsEDnY= -github.com/charmbracelet/huh v0.3.1-0.20240404200615-66118a2cb3cf/go.mod h1:XTzRYgVSGt89DsCAUpCYTTgMPLrWuNtRYJHZs/TU0iY= -github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s= -github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE= +github.com/charmbracelet/huh v0.4.2 h1:5wLkwrA58XDAfEZsJzNQlfJ+K8N9+wYwvR5FOM7jXFM= +github.com/charmbracelet/huh v0.4.2/go.mod h1:g9OXBgtY3zRV4ahnVih9bZE+1yGYN+y2C9Q6L2P+WM0= +github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g= +github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8= github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM= github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM= -github.com/charmbracelet/x/exp/strings v0.0.0-20240405134957-07f093a22d1c h1:gELpu2vuZkXCFD43Pqp+xvZzG2IRxtgZK1eNsnnTrAI= -github.com/charmbracelet/x/exp/strings v0.0.0-20240405134957-07f093a22d1c/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= -github.com/charmbracelet/x/exp/term v0.0.0-20240321133156-7faadd06c281 h1:ZYwrF0GAd859tU6oF63T2pIkZVQ4z9BosDVD7jYu93A= -github.com/charmbracelet/x/exp/term v0.0.0-20240321133156-7faadd06c281/go.mod h1:madZtB2OVDOG+ZnLruGITVZceYy047W+BLQ1MNQzbWg= -github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= -github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= +github.com/charmbracelet/x/ansi v0.1.1 h1:CGAduulr6egay/YVbGc8Hsu8deMg1xZ/bkaXTPi1JDk= +github.com/charmbracelet/x/ansi v0.1.1/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= +github.com/charmbracelet/x/exp/strings v0.0.0-20240525152034-77596eb8760e h1:DhvN6ye3nHLhRtNHtlrQ0Zk+vmeN7YtEnyIRfcl7e0E= +github.com/charmbracelet/x/exp/strings v0.0.0-20240525152034-77596eb8760e/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= +github.com/charmbracelet/x/exp/term v0.0.0-20240524151031-ff83003bf67a h1:k/s6UoOSVynWiw7PlclyGO2VdVs5ZLbMIHiGp4shFZE= +github.com/charmbracelet/x/exp/term v0.0.0-20240524151031-ff83003bf67a/go.mod h1:YBotIGhfoWhHDlnUpJMkjebGV2pdGRCn1Y4/Nk/vVcU= +github.com/charmbracelet/x/input v0.1.1 h1:YDOJaTUKCqtGnq9PHzx3pkkl4pXDOANUHmhH3DqMtM4= +github.com/charmbracelet/x/input v0.1.1/go.mod h1:jvdTVUnNWj/RD6hjC4FsoB0SeZCJ2ZBkiuFP9zXvZI0= +github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI= +github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw= +github.com/charmbracelet/x/windows v0.1.2 h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg= +github.com/charmbracelet/x/windows v0.1.2/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= +github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= @@ -86,24 +92,24 @@ github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U= github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s= github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY= -golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8= -golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d h1:N0hmiNbwsSNwHBAvR3QB5w25pUwH4tK0Y/RltD1j1h4= +golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/input/command.go new/gum-0.14.1/input/command.go --- old/gum-0.14.0/input/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/input/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -2,8 +2,10 @@ import ( "fmt" + "os" + "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/huh" "github.com/charmbracelet/lipgloss" @@ -23,11 +25,15 @@ theme := huh.ThemeCharm() theme.Focused.Base = lipgloss.NewStyle() - // theme.Focused.TextInput.Cursor = o.CursorStyle.ToLipgloss() + theme.Focused.TextInput.Cursor = o.CursorStyle.ToLipgloss() theme.Focused.TextInput.Placeholder = o.PlaceholderStyle.ToLipgloss() theme.Focused.TextInput.Prompt = o.PromptStyle.ToLipgloss() theme.Focused.Title = o.HeaderStyle.ToLipgloss() + // Keep input keymap backwards compatible + keymap := huh.NewDefaultKeyMap() + keymap.Quit = key.NewBinding(key.WithKeys("ctrl+c", "esc")) + var echoMode huh.EchoMode if o.Password { @@ -50,6 +56,8 @@ WithShowHelp(false). WithWidth(o.Width). WithTheme(theme). + WithKeyMap(keymap). + WithShowHelp(o.ShowHelp). WithProgramOptions(tea.WithOutput(os.Stderr)). Run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/input/options.go new/gum-0.14.1/input/options.go --- old/gum-0.14.0/input/options.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/input/options.go 2024-05-25 20:56:32.000000000 +0200 @@ -18,6 +18,7 @@ CharLimit int `help:"Maximum value length (0 for no limit)" default:"400"` Width int `help:"Input width (0 for terminal width)" default:"40" env:"GUM_INPUT_WIDTH"` Password bool `help:"Mask input characters" default:"false"` + ShowHelp bool `help:"Show help keybinds" default:"true" negatable:"true" env:"GUM_INPUT_SHOW_HELP"` Header string `help:"Header value" default:"" env:"GUM_INPUT_HEADER"` HeaderStyle style.Styles `embed:"" prefix:"header." set:"defaultForeground=240" envprefix:"GUM_INPUT_HEADER_"` Timeout time.Duration `help:"Timeout until input aborts" default:"0" env:"GUM_INPUT_TIMEOUT"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/internal/stdin/stdin.go new/gum-0.14.1/internal/stdin/stdin.go --- old/gum-0.14.0/internal/stdin/stdin.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/internal/stdin/stdin.go 2024-05-25 20:56:32.000000000 +0200 @@ -28,7 +28,7 @@ } } - return b.String(), nil + return strings.TrimSuffix(b.String(), "\n"), nil } // IsEmpty returns whether stdin is empty. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/log/command.go new/gum-0.14.1/log/command.go --- old/gum-0.14.0/log/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/log/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -46,9 +46,9 @@ "stampmilli": time.StampMilli, "stampmicro": time.StampMicro, "stampnano": time.StampNano, - "datetime": "2006-01-02 15:04:05", - "dateonly": "2006-01-02", - "timeonly": "15:04:05", + "datetime": time.DateTime, + "dateonly": time.DateOnly, + "timeonly": time.TimeOnly, } tf, ok := timeFormats[strings.ToLower(o.Time)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/main.go new/gum-0.14.1/main.go --- old/gum-0.14.0/main.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/main.go 2024-05-25 20:56:32.000000000 +0200 @@ -7,6 +7,7 @@ "runtime/debug" "github.com/alecthomas/kong" + "github.com/charmbracelet/huh" "github.com/charmbracelet/lipgloss" "github.com/muesli/termenv" @@ -72,7 +73,7 @@ }, ) if err := ctx.Run(); err != nil { - if errors.Is(err, exit.ErrAborted) { + if errors.Is(err, exit.ErrAborted) || errors.Is(err, huh.ErrUserAborted) { os.Exit(exit.StatusAborted) } fmt.Println(err) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/pager/pager.go new/gum-0.14.1/pager/pager.go --- old/gum-0.14.0/pager/pager.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/pager/pager.go 2024-05-25 20:56:32.000000000 +0200 @@ -1,6 +1,6 @@ // Package pager provides a pager (similar to less) for the terminal. // -// $ cat file.txt | gum page +// $ cat file.txt | gum pager package pager import ( @@ -120,9 +120,9 @@ } } else { switch key.String() { - case "g": + case "g", "home": m.viewport.GotoTop() - case "G": + case "G", "end": m.viewport.GotoBottom() case "/": m.search.Begin() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/spin/command.go new/gum-0.14.1/spin/command.go --- old/gum-0.14.0/spin/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/spin/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -43,6 +43,7 @@ // If the command succeeds, and we are printing output and we are in a TTY then push the STDOUT we got to the actual // STDOUT for piping or other things. + //nolint:nestif if m.status == 0 { if o.ShowOutput { // BubbleTea writes the View() to stderr. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/style/command.go new/gum-0.14.1/style/command.go --- old/gum-0.14.0/style/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/style/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -24,7 +24,6 @@ if text == "" { return errors.New("no input provided, see `gum style --help`") } - text = strings.TrimSuffix(text, "\n") } fmt.Println(o.Style.ToLipgloss().Render(text)) return nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/write/command.go new/gum-0.14.1/write/command.go --- old/gum-0.14.0/write/command.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/write/command.go 2024-05-25 20:56:32.000000000 +0200 @@ -25,6 +25,9 @@ theme.Focused.TextInput.Placeholder = o.PlaceholderStyle.ToLipgloss() theme.Focused.TextInput.Prompt = o.PromptStyle.ToLipgloss() + keymap := huh.NewDefaultKeyMap() + keymap.Text.NewLine.SetHelp("ctrl+j", "new line") + err := huh.NewForm( huh.NewGroup( huh.NewText(). @@ -37,7 +40,10 @@ ). WithWidth(o.Width). WithHeight(o.Height). - WithShowHelp(false).Run() + WithTheme(theme). + WithKeyMap(keymap). + WithShowHelp(o.ShowHelp). + Run() if err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gum-0.14.0/write/options.go new/gum-0.14.1/write/options.go --- old/gum-0.14.0/write/options.go 2024-04-26 23:04:25.000000000 +0200 +++ new/gum-0.14.1/write/options.go 2024-05-25 20:56:32.000000000 +0200 @@ -13,6 +13,7 @@ ShowLineNumbers bool `help:"Show line numbers" default:"false" env:"GUM_WRITE_SHOW_LINE_NUMBERS"` Value string `help:"Initial value (can be passed via stdin)" default:"" env:"GUM_WRITE_VALUE"` CharLimit int `help:"Maximum value length (0 for no limit)" default:"400"` + ShowHelp bool `help:"Show help key binds" negatable:"" default:"true" env:"GUM_WRITE_SHOW_HELP"` CursorMode string `prefix:"cursor." name:"mode" help:"Cursor mode" default:"blink" enum:"blink,hide,static" env:"GUM_WRITE_CURSOR_MODE"` BaseStyle style.Styles `embed:"" prefix:"base." envprefix:"GUM_WRITE_BASE_"` ++++++ vendor.tar.zst ++++++ ++++ 38329 lines of diff (skipped)

1 0

commit python-yt for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-yt for openSUSE:Factory checked in at 2024-07-11 20:32:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-yt (Old) and /work/SRC/openSUSE:Factory/.python-yt.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-yt" Thu Jul 11 20:32:56 2024 rev:11 rq:1186758 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-yt/python-yt.changes 2024-04-08 17:52:33.462318157 +0200 +++ /work/SRC/openSUSE:Factory/.python-yt.new.17339/python-yt.changes 2024-07-11 20:33:35.693777903 +0200 @@ -1,0 +2,27 @@ +Thu Jul 4 05:28:54 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 4.3.1: + * Fix broken urllib imports + * Make annotate_sphere and annotate_arrow safe when run after plot + invalidation + * Fix an incompatibility with unyt 3.0 (amu_cgs doesn't exist as a physical + constant anymore) + * Handle deprecation warnings from numpy 2.0.0dev0 (np.row_stack -> + np.vstack and np.in1d -> np.isin) + * Avoid a deprecation warning in yt.load_sample on Python 3.12 + * Switch to field tuples for default fields in particle_trajectories + * Enforce Figure dpi in _show_mpl + * Fix bug where race condition results in incorrect fields categorization + when computing particle_trajectories + * Use the validated center for YTCuttingPlane set_field_parameter + * Avoid usage of deprecated numpy.core namespace (numpy 2 compat) + * Fix geographic coordinate conversions + * Update xarray integration test to use non-deprecated API + * Enzo testing framework - ignore units for ShockTube tests + * Explicitly set minimum Python to 3.9.2 + * Ditch np.int_t, removed in numpy 2's C API (use np.int64_t instead) + * Migrate module-level setup/teardown functions to pytest +- Drop patch yt-pr4727-unpin-unyt.patch, included upstream. +- Remove upper bound on numpy. + +------------------------------------------------------------------- Old: ---- yt-4.3.0.tar.gz yt-pr4727-unpin-unyt.patch New: ---- yt-4.3.1.tar.gz BETA DEBUG BEGIN: Old: * Migrate module-level setup/teardown functions to pytest - Drop patch yt-pr4727-unpin-unyt.patch, included upstream. - Remove upper bound on numpy. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-yt.spec ++++++ --- /var/tmp/diff_new_pack.dRzMNH/_old 2024-07-11 20:33:36.861820586 +0200 +++ /var/tmp/diff_new_pack.dRzMNH/_new 2024-07-11 20:33:36.861820586 +0200 @@ -24,28 +24,25 @@ %bcond_with test %define psuffix %{nil} %endif -%define skip_python39 1 # avoid "lto1: internal compiler error" during build %global _lto_cflags %{nil} %{?sle15_python_module_pythons} Name: python-yt%{psuffix} -Version: 4.3.0 +Version: 4.3.1 Release: 0 Summary: An analysis and visualization toolkit for volumetric data License: BSD-3-Clause -Group: Development/Languages/Python URL: https://github.com/yt-project/yt Source0: https://files.pythonhosted.org/packages/source/y/yt/yt-%{version}.tar.gz Source100: python-yt-rpmlintrc -# PATCH-FIX-UPSTREAM yt-pr4727-unpin-unyt.patch gh#yt-project/yt#4727 -Patch0: https://github.com/yt-project/yt/pull/4727.patch#/yt-pr4727-unpin-unyt.patch # PATCH-FIX-OPENSUSE yt-ignore-pytestdepr.patch code(a)bnavigator.de -- ignore a pytest deprecation warning. Upstream is still working on the nose ot pytest transition Patch1: yt-ignore-pytestdepr.patch BuildRequires: %{python_module Cython > 3 with %python-Cython < 3.1} +BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module ewah-bool-utils-devel >= 1.0.2} -BuildRequires: %{python_module numpy-devel >= 1.25 with %python-numpy-devel < 2} +BuildRequires: %{python_module numpy-devel >= 1.25} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} @@ -58,11 +55,11 @@ Requires: python-ipywidgets >= 8.0.0 Requires: python-matplotlib >= 3.5 Requires: python-more-itertools >= 8.4 +Requires: python-numpy >= 1.19.3 Requires: python-packaging >= 20.9 Requires: python-tomli-w >= 0.4.0 Requires: python-tqdm >= 3.4.0 Requires: python-unyt >= 2.9.2 -Requires: (python-numpy >= 1.19.3 with python-numpy < 2) Requires: (python-tomli >= 1.2.3 if python-base < 3.11) Requires: (python-typing-extensions >= 4.4.0 if python-base < 3.12) Requires(post): update-alternatives @@ -122,7 +119,7 @@ %doc README.md %license COPYING.txt %python_alternative %{_bindir}/yt -%{python_sitearch}/yt-%{version}.dist-info %{python_sitearch}/yt +%{python_sitearch}/yt-%{version}.dist-info %endif ++++++ yt-4.3.0.tar.gz -> yt-4.3.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-yt/yt-4.3.0.tar.gz /work/SRC/openSUSE:Factory/.python-yt.new.17339/yt-4.3.1.tar.gz differ: char 5, line 1

1 0

commit python-datashader for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-datashader for openSUSE:Factory checked in at 2024-07-11 20:32:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-datashader (Old) and /work/SRC/openSUSE:Factory/.python-datashader.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-datashader" Thu Jul 11 20:32:55 2024 rev:31 rq:1186729 version:0.16.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-datashader/python-datashader.changes 2024-07-08 19:09:20.437110732 +0200 +++ /work/SRC/openSUSE:Factory/.python-datashader.new.17339/python-datashader.changes 2024-07-11 20:33:34.797745161 +0200 @@ -1,0 +2,5 @@ +Thu Jul 11 03:34:03 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Restrict numpy to < 2. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-datashader.spec ++++++ --- /var/tmp/diff_new_pack.tptrcM/_old 2024-07-11 20:33:35.477770011 +0200 +++ /var/tmp/diff_new_pack.tptrcM/_new 2024-07-11 20:33:35.477770011 +0200 @@ -39,7 +39,7 @@ Source100: python-datashader-rpmlintrc BuildRequires: %{python_module devel >= 3.9} BuildRequires: %{python_module multipledispatch} -BuildRequires: %{python_module numpy} +BuildRequires: %{python_module numpy < 2} BuildRequires: %{python_module param} BuildRequires: %{python_module pip} BuildRequires: %{python_module pyct} @@ -52,7 +52,7 @@ Requires: python-dask-dataframe Requires: python-multipledispatch Requires: python-numba -Requires: python-numpy +Requires: python-numpy < 2 Requires: python-pandas Requires: python-param Requires: python-pyct

1 0

commit python-pyemd for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pyemd for openSUSE:Factory checked in at 2024-07-11 20:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyemd (Old) and /work/SRC/openSUSE:Factory/.python-pyemd.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pyemd" Thu Jul 11 20:32:54 2024 rev:5 rq:1186727 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyemd/python-pyemd.changes 2023-02-23 17:06:17.817930057 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyemd.new.17339/python-pyemd.changes 2024-07-11 20:33:33.365692831 +0200 @@ -1,0 +2,8 @@ +Thu Jul 4 02:17:34 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 1.0.0: + * Use modern packaging. +- Switch to pyproject macros. +- Remove patch numpy-arrays.patch, included upstream. + +------------------------------------------------------------------- Old: ---- numpy-arrays.patch pyemd-0.5.1.tar.gz New: ---- pyemd-1.0.0.tar.gz BETA DEBUG BEGIN: Old:- Switch to pyproject macros. - Remove patch numpy-arrays.patch, included upstream. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyemd.spec ++++++ --- /var/tmp/diff_new_pack.o42z8d/_old 2024-07-11 20:33:33.897712272 +0200 +++ /var/tmp/diff_new_pack.o42z8d/_new 2024-07-11 20:33:33.897712272 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pyemd # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,20 @@ # -%define skip_python36 1 -# pytest is too smart for its own good, prevent use of compiled version -%bcond_with test Name: python-pyemd -Version: 0.5.1 +Version: 1.0.0 Release: 0 Summary: Python implementation of the Earth Mover's Distance License: MIT -Group: Development/Languages/Python URL: https://github.com/wmayner/pyemd Source: https://files.pythonhosted.org/packages/source/p/pyemd/pyemd-%{version}.tar… -# PATCH-FIX-UPSTREAM https://github.com/wmayner/pyemd/commit/34631658ae0cc555001b692623c23c02ed8… Mark uses of ragged nested sequences in NumPy arrays as intented -Patch0: numpy-arrays.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel >= 1.9.0} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: c++_compiler BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -49,26 +46,23 @@ %prep %autosetup -p1 -n pyemd-%{version} -sed -i -e '/^#!\//, 1d' pyemd/__about__.py pyemd/__init__.py - %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} +%python_expand rm -r %{buildroot}%{$python_sitearch}/pyemd/{lib,emd.cpp} %check -mv conftest.py conftest_bad.py_bad pushd test %pytest_arch popd -mv conftest_bad.py_bad conftest.py %files %{python_files} %doc README.rst %license LICENSE %{python_sitearch}/pyemd -%{python_sitearch}/pyemd-%{version}*-info +%{python_sitearch}/pyemd-%{version}.dist-info ++++++ pyemd-0.5.1.tar.gz -> pyemd-1.0.0.tar.gz ++++++ ++++ 28385 lines of diff (skipped)

1 0

commit python-uncertainties for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-uncertainties for openSUSE:Factory checked in at 2024-07-11 20:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-uncertainties (Old) and /work/SRC/openSUSE:Factory/.python-uncertainties.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-uncertainties" Thu Jul 11 20:32:54 2024 rev:16 rq:1186728 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-uncertainties/python-uncertainties.changes 2024-01-03 12:23:39.896576647 +0100 +++ /work/SRC/openSUSE:Factory/.python-uncertainties.new.17339/python-uncertainties.changes 2024-07-11 20:33:34.085719142 +0200 @@ -1,0 +2,14 @@ +Thu Jul 4 03:47:54 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 3.2.1: + * Drop future dependency. Uncertainties now has no external dependencies + when not using Numpy integration + * Drop support for Python versions before 3.8, including Python 2 + * remove 1to2 and deprecations + * Moved from setup.py to pyproject.toml + * Move tests to tests folder + * Update unumpy test to be compatible with numpy 2 + * Mark docstrings with backslashes as raw strings in tests +- Drop patch remove-future-requirement.patch, no longer required. + +------------------------------------------------------------------- Old: ---- remove-future-requirement.patch uncertainties-3.1.7.tar.gz New: ---- uncertainties-3.2.1.tar.gz BETA DEBUG BEGIN: Old: * Mark docstrings with backslashes as raw strings in tests - Drop patch remove-future-requirement.patch, no longer required. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-uncertainties.spec ++++++ --- /var/tmp/diff_new_pack.73dVGb/_old 2024-07-11 20:33:34.577737122 +0200 +++ /var/tmp/diff_new_pack.73dVGb/_new 2024-07-11 20:33:34.581737267 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-uncertainties # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ %{?sle15_python_module_pythons} Name: python-uncertainties -Version: 3.1.7 +Version: 3.2.1 Release: 0 Summary: Uncertainties on the Quantities Involved (aka "Error Propagation") License: BSD-3-Clause URL: https://github.com/lebigot/uncertainties/ Source: https://files.pythonhosted.org/packages/source/u/uncertainties/uncertaintie… -Patch0: remove-future-requirement.patch +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module numpy} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} @@ -47,8 +47,6 @@ %prep %autosetup -p1 -n uncertainties-%{version} -sed -i -e '/^#!\//, 1d' uncertainties/1to2.py -sed -i -e '/^#!\//, 1d' uncertainties/lib1to2/test_1to2.py %build %pyproject_wheel ++++++ uncertainties-3.1.7.tar.gz -> uncertainties-3.2.1.tar.gz ++++++ ++++ 11638 lines of diff (skipped)

1 0

commit python-unyt for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-unyt for openSUSE:Factory checked in at 2024-07-11 20:32:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-unyt (Old) and /work/SRC/openSUSE:Factory/.python-unyt.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-unyt" Thu Jul 11 20:32:53 2024 rev:7 rq:1186726 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-unyt/python-unyt.changes 2024-03-17 22:16:31.285526201 +0100 +++ /work/SRC/openSUSE:Factory/.python-unyt.new.17339/python-unyt.changes 2024-07-11 20:33:32.573663889 +0200 @@ -1,0 +2,8 @@ +Thu Jul 11 02:42:33 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 3.0.3: + * BUG: fix signature incompatibilities in NEP 18 wrapped functions + * BUG: fix an incompatibility with sympy 1.13.0rc1 +- Restrict numpy to < 2. + +------------------------------------------------------------------- Old: ---- unyt-3.0.2.tar.gz New: ---- unyt-3.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-unyt.spec ++++++ --- /var/tmp/diff_new_pack.h4XyE8/_old 2024-07-11 20:33:33.141684645 +0200 +++ /var/tmp/diff_new_pack.h4XyE8/_new 2024-07-11 20:33:33.145684792 +0200 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-unyt -Version: 3.0.2 +Version: 3.0.3 Release: 0 Summary: A package for handling numpy arrays with units License: BSD-3-Clause @@ -33,12 +33,12 @@ # SECTION test BuildRequires: %{python_module dask-array} BuildRequires: %{python_module dask-diagnostics} -BuildRequires: %{python_module numpy >= 1.19.3} +BuildRequires: %{python_module numpy >= 1.19.3 with %python-numpy < 2} BuildRequires: %{python_module packaging >= 20.9} BuildRequires: %{python_module pytest} BuildRequires: %{python_module sympy >= 1.7} # /SECTION -Requires: python-numpy >= 1.19.3 +Requires: (python-numpy >= 1.19.3 with python-numpy < 2) Requires: python-packaging > 20.9 Requires: python-sympy >= 1.7 BuildArch: noarch ++++++ unyt-3.0.2.tar.gz -> unyt-3.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/.github/workflows/ci.yml new/unyt-3.0.3/.github/workflows/ci.yml --- old/unyt-3.0.2/.github/workflows/ci.yml 2024-01-28 09:32:56.000000000 +0100 +++ new/unyt-3.0.3/.github/workflows/ci.yml 2024-07-01 19:41:17.000000000 +0200 @@ -24,7 +24,8 @@ - '3.12' # Test all on ubuntu, test ends on macos and windows include: - - os: macos-latest + - os: macos-12 + # pin macos-12 (x86) because Python 3.9 is broken in the arm64 image python-version: '3.9' - os: windows-latest python-version: '3.9' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/.pre-commit-config.yaml new/unyt-3.0.3/.pre-commit-config.yaml --- old/unyt-3.0.2/.pre-commit-config.yaml 2024-02-24 15:11:41.000000000 +0100 +++ new/unyt-3.0.3/.pre-commit-config.yaml 2024-07-02 15:31:26.000000000 +0200 @@ -10,7 +10,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -21,18 +21,18 @@ - id: check-toml - repo: https://github.com/psf/black - rev: 24.1.1 + rev: 24.4.2 hooks: - id: black - repo: https://github.com/adamchainz/blacken-docs - rev: 1.16.0 + rev: 1.18.0 hooks: - id: blacken-docs additional_dependencies: [black==24.1.1] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.2.0 + rev: v0.5.0 hooks: - id: ruff args: [--fix, --show-fixes] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/CONTRIBUTING.rst new/unyt-3.0.3/CONTRIBUTING.rst --- old/unyt-3.0.2/CONTRIBUTING.rst 2024-01-27 13:22:26.000000000 +0100 +++ new/unyt-3.0.3/CONTRIBUTING.rst 2024-07-01 19:41:17.000000000 +0200 @@ -106,7 +106,7 @@ $ cd unyt/ $ pyenv local 3.10 - $ python setup.py develop + $ python -m pip install -e 5. Create a branch for local development:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/HISTORY.rst new/unyt-3.0.3/HISTORY.rst --- old/unyt-3.0.2/HISTORY.rst 2024-03-13 07:25:16.000000000 +0100 +++ new/unyt-3.0.3/HISTORY.rst 2024-07-02 15:38:31.000000000 +0200 @@ -2,6 +2,35 @@ History ======= +3.0.3 (2024-07-02) +------------------ + +This new bugfix release of ``unyt`` fixes bugs discovered since the v3.0.2 release. + +* Fix defects when running test suite in isolation from the project's pytest + configuration (`PR #495 <https://github.com/yt-project/unyt/pull/495>`_). Thank you + to Clément Robert (@neutrinoceros on GitHub) for the contribution. + +* Drop test case for unpickling old pickle files as too sensitive to upstream changes + (`PR #498 <https://github.com/yt-project/unyt/pull/498>`_). Thank you to Clément + Robert (@neutrinoceros on GitHub) for the contribution. + +* Fix signature incompatibilities in nep 18 wrapped functions (`PR #500 + <https://github.com/yt-project/unyt/pull/500>`_). Thank you to Clément Robert + (@neutrinoceros on GitHub) for the contribution. + +* Fix an incompatibility with sympy 1.13.0rc1 (`PR #504 + <https://github.com/yt-project/unyt/pull/504>`_). Thank you to Clément Robert + (@neutrinoceros on GitHub) for the contribution. + +* Adjust doctests to changes in array repr from numpy 2.0 (`PR #506 + <https://github.com/yt-project/unyt/pull/506>`_). Thank you to Clément Robert + (@neutrinoceros on GitHub) for the contribution. + +* TST: declare np.unstack as subclass-safe (fix incompatibility with Numpy 2.1) + (`PR #509 <https://github.com/yt-project/unyt/pull/509>`_). Thank you to + Clément Robert (@neutrinoceros on GitHub) for the contribution. + 3.0.2 (2024-03-13) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/PKG-INFO new/unyt-3.0.3/PKG-INFO --- old/unyt-3.0.2/PKG-INFO 2024-03-13 07:33:56.847813000 +0100 +++ new/unyt-3.0.3/PKG-INFO 2024-07-02 15:39:56.505619300 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: unyt -Version: 3.0.2 +Version: 3.0.3 Summary: A package for handling numpy arrays with units Author-email: The yt project <yt-dev(a)python.org> License: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/docs/extensions/show_all_units.py new/unyt-3.0.3/docs/extensions/show_all_units.py --- old/unyt-3.0.2/docs/extensions/show_all_units.py 2024-01-27 13:22:26.000000000 +0100 +++ new/unyt-3.0.3/docs/extensions/show_all_units.py 2024-06-26 16:21:25.000000000 +0200 @@ -175,22 +175,14 @@ start_of_line = start_of_line.translate(to_separator) vertical_separator = vertical_separator.translate(to_separator) end_of_line = end_of_line.translate(to_separator) - separator = "{}{}{}".format( - start_of_line, - vertical_separator.join([x * line_marker for x in sizes]), - end_of_line, - ) + separator = f"{start_of_line}{vertical_separator.join([x * line_marker for x in sizes])}{end_of_line}" # determine header separator th_separator_tr = maketrans("-", "=") start_of_line = start_of_line.translate(th_separator_tr) line_marker = line_marker.translate(th_separator_tr) vertical_separator = vertical_separator.translate(th_separator_tr) end_of_line = end_of_line.translate(th_separator_tr) - th_separator = "{}{}{}".format( - start_of_line, - vertical_separator.join([x * line_marker for x in sizes]), - end_of_line, - ) + th_separator = f"{start_of_line}{vertical_separator.join([x * line_marker for x in sizes])}{end_of_line}" # prepare result table.append(separator) # set table header diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/docs/usage.rst new/unyt-3.0.3/docs/usage.rst --- old/unyt-3.0.2/docs/usage.rst 2024-01-27 13:22:26.000000000 +0100 +++ new/unyt-3.0.3/docs/usage.rst 2024-07-01 19:41:17.000000000 +0200 @@ -1494,7 +1494,7 @@ One important caveat is that using Dask array functions may strip units: >>> da.sum(x_da).compute() - 49995000 + np.int64(49995000) For simple reductions, you can use the :mod:`reduce_with_units` function: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/pyproject.toml new/unyt-3.0.3/pyproject.toml --- old/unyt-3.0.2/pyproject.toml 2024-03-13 07:25:16.000000000 +0100 +++ new/unyt-3.0.3/pyproject.toml 2024-07-01 19:41:17.000000000 +0200 @@ -124,7 +124,6 @@ "error", "ignore:Matplotlib is currently using agg, which is a non-GUI backend, so cannot show the figure.:UserWarning", "ignore:FigureCanvasAgg is non-interactive, and thus cannot be shown:UserWarning", - "ignore:In accordance with NEP 32:DeprecationWarning", "ignore:distutils Version classes are deprecated. Use packaging.version instead.:DeprecationWarning", 'ignore:datetime\.datetime\.utcfromtimestamp is deprecated:DeprecationWarning', # https://github.com/dateutil/dateutil/pull/1285 'ignore:mpnumeric is deprecated:DeprecationWarning', # sympy 1.12 VS mpmath 1.4, solution: https://github.com/sympy/sympy/pull/25290 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/tox.ini new/unyt-3.0.3/tox.ini --- old/unyt-3.0.2/tox.ini 2024-01-27 13:22:26.000000000 +0100 +++ new/unyt-3.0.3/tox.ini 2024-07-01 19:41:17.000000000 +0200 @@ -20,8 +20,8 @@ deps = pytest h5py - pint - astropy + !py39: pint + !py39: astropy!=6.1.1 coverage[toml]>=5.0 pytest-cov pytest-doctestplus @@ -32,6 +32,14 @@ pytest --cov=unyt --cov-append --doctest-modules --doctest-plus --doctest-rst --basetemp={envtmpdir} coverage report --omit='.tox/*' +[testenv:py39] +# skip doctest on py39 because doctests require numpy>=2.0 and all optional deps, +# but some of our optional deps (pint, astropy) don't have a version that support +# both numpy>=2.0 and Python 3.9 +commands= + pytest --cov=unyt --cov-append --basetemp={envtmpdir} + coverage report --omit='.tox/*' + [testenv:py39-versions] deps = docutils diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/_array_functions.py new/unyt-3.0.3/unyt/_array_functions.py --- old/unyt-3.0.2/unyt/_array_functions.py 2024-02-25 09:14:12.000000000 +0100 +++ new/unyt-3.0.3/unyt/_array_functions.py 2024-07-02 15:31:26.000000000 +0200 @@ -272,57 +272,57 @@ @implements(np.intersect1d) -def intersect1d(arr1, arr2, /, assume_unique=False, return_indices=False): - _validate_units_consistency((arr1, arr2)) +def intersect1d(ar1, ar2, assume_unique=False, return_indices=False): + _validate_units_consistency((ar1, ar2)) retv = np.intersect1d._implementation( - np.asarray(arr1), - np.asarray(arr2), + np.asarray(ar1), + np.asarray(ar2), assume_unique=assume_unique, return_indices=return_indices, ) if return_indices: return retv else: - return retv * arr1.units + return retv * ar1.units @implements(np.union1d) -def union1d(arr1, arr2, /): - _validate_units_consistency((arr1, arr2)) - return np.union1d._implementation(np.asarray(arr1), np.asarray(arr2)) * arr1.units +def union1d(ar1, ar2): + _validate_units_consistency((ar1, ar2)) + return np.union1d._implementation(np.asarray(ar1), np.asarray(ar2)) * ar1.units @implements(np.linalg.norm) -def norm(x, /, *args, **kwargs): +def norm(x, *args, **kwargs): return np.linalg.norm._implementation(np.asarray(x), *args, **kwargs) * x.units @implements(np.vstack) -def vstack(tup, /): +def vstack(tup, **kwargs): ret_units = _validate_units_consistency(tup) - return np.vstack._implementation([np.asarray(_) for _ in tup]) * ret_units + return np.vstack._implementation([np.asarray(_) for _ in tup], **kwargs) * ret_units @implements(np.hstack) -def hstack(tup, /): +def hstack(tup, **kwargs): ret_units = _validate_units_consistency(tup) - return np.vstack._implementation([np.asarray(_) for _ in tup]) * ret_units + return np.vstack._implementation([np.asarray(_) for _ in tup], **kwargs) * ret_units @implements(np.dstack) -def dstack(tup, /): +def dstack(tup): ret_units = _validate_units_consistency(tup) return np.dstack._implementation([np.asarray(_) for _ in tup]) * ret_units @implements(np.column_stack) -def column_stack(tup, /): +def column_stack(tup): ret_units = _validate_units_consistency(tup) return np.column_stack._implementation([np.asarray(_) for _ in tup]) * ret_units @implements(np.stack) -def stack(arrays, /, axis=0, out=None): +def stack(arrays, axis=0, out=None, **kwargs): ret_units = _validate_units_consistency(arrays) if out is None: return ( @@ -330,7 +330,7 @@ * ret_units ) res = np.stack._implementation( - [np.asarray(_) for _ in arrays], axis=axis, out=np.asarray(out) + [np.asarray(_) for _ in arrays], axis=axis, out=np.asarray(out), **kwargs ) if getattr(out, "units", None) is not None: out.units = ret_units @@ -678,8 +678,8 @@ @implements(np.ediff1d) -def ediff1d(a, *args, **kwargs): - return diff_helper(np.ediff1d, a, *args, **kwargs) +def ediff1d(ary, *args, **kwargs): + return diff_helper(np.ediff1d, ary, *args, **kwargs) @implements(np.ptp) @@ -874,7 +874,8 @@ @implements(np.einsum) -def einsum(subscripts, *operands, out=None, **kwargs): +def einsum(*operands, out=None, **kwargs): + subscripts, *operands = operands ret_units = _validate_units_consistency(operands) if out is not None: @@ -962,7 +963,7 @@ arr = np.asfarray._implementation(np.asarray(a), dtype=dtype) # noqa: NPY201 return arr * ret_units - _trapezoid_func = np.trapz + _trapezoid_func = np.trapz # noqa: NPY201 elif NUMPY_VERSION >= Version("2.0.0dev0"): # functions that were added in numpy 2.0.0 @@ -992,7 +993,7 @@ if hasattr(np, "in1d"): - @implements(np.in1d) + @implements(np.in1d) # noqa: NPY201 def in1d(ar1, ar2, *args, **kwargs): _validate_units_consistency((ar1, ar2)) return np.isin._implementation( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/_parsing.py new/unyt-3.0.3/unyt/_parsing.py --- old/unyt-3.0.2/unyt/_parsing.py 2024-02-24 15:11:41.000000000 +0100 +++ new/unyt-3.0.3/unyt/_parsing.py 2024-06-26 16:21:25.000000000 +0200 @@ -85,9 +85,6 @@ unit_expr, global_dict=global_dict, transformations=unit_text_transform ) except Exception as e: - msg = "Unit expression '{}' raised an error during parsing:\n{}".format( - unit_expr, - repr(e), - ) + msg = f"Unit expression '{unit_expr}' raised an error during parsing:\n{e!r}" raise UnitParseError(msg) return unit_expr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/_version.py new/unyt-3.0.3/unyt/_version.py --- old/unyt-3.0.2/unyt/_version.py 2024-03-13 07:33:56.000000000 +0100 +++ new/unyt-3.0.3/unyt/_version.py 2024-07-02 15:39:56.000000000 +0200 @@ -12,5 +12,5 @@ __version_tuple__: VERSION_TUPLE version_tuple: VERSION_TUPLE -__version__ = version = '3.0.2' -__version_tuple__ = version_tuple = (3, 0, 2) +__version__ = version = '3.0.3' +__version_tuple__ = version_tuple = (3, 0, 3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/array.py new/unyt-3.0.3/unyt/array.py --- old/unyt-3.0.2/unyt/array.py 2024-03-12 16:09:51.000000000 +0100 +++ new/unyt-3.0.3/unyt/array.py 2024-07-01 19:41:17.000000000 +0200 @@ -1255,7 +1255,7 @@ >>> from unyt import km >>> data = [3, 8, 7]*km >>> print(np.argsort(data)) - [0 2 1] + [0 2 1] km >>> print(data.argsort()) [0 2 1] """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/exceptions.py new/unyt-3.0.3/unyt/exceptions.py --- old/unyt-3.0.2/unyt/exceptions.py 2024-01-27 13:22:26.000000000 +0100 +++ new/unyt-3.0.3/unyt/exceptions.py 2024-06-26 16:21:25.000000000 +0200 @@ -148,11 +148,10 @@ super().__init__() def __str__(self): - err = ( - "The %s unit system does not have a MKS current base unit" - % self.unit_system_name + return ( + f"The {self.unit_system_name} unit system does not have " + "a MKS current base unit" ) - return err class MKSCGSConversionError(UnytError): @@ -343,5 +342,5 @@ def __str__(self): return ( "Cannot create unit system with inconsistent mapping from " - "dimensions to units. Received:\n%s" % self.units_map + f"dimensions to units. Received:\n{self.units_map}" ) Binary files old/unyt-3.0.2/unyt/tests/data/unyt_array_sympy1.8.pickle and new/unyt-3.0.3/unyt/tests/data/unyt_array_sympy1.8.pickle differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/tests/test_array_functions.py new/unyt-3.0.3/unyt/tests/test_array_functions.py --- old/unyt-3.0.2/unyt/tests/test_array_functions.py 2024-02-25 09:14:12.000000000 +0100 +++ new/unyt-3.0.3/unyt/tests/test_array_functions.py 2024-07-02 15:31:26.000000000 +0200 @@ -1,5 +1,7 @@ # tests for NumPy __array_function__ support +import inspect import re +import warnings from importlib.metadata import version import numpy as np @@ -24,6 +26,13 @@ NUMPY_VERSION = Version(version("numpy")) + +VAR_POSITIONAL = inspect.Parameter.VAR_POSITIONAL +VAR_KEYWORD = inspect.Parameter.VAR_KEYWORD +POSITIONAL_ONLY = inspect.Parameter.POSITIONAL_ONLY +KEYWORD_ONLY = inspect.Parameter.KEYWORD_ONLY +POSITIONAL_OR_KEYWORD = inspect.Parameter.POSITIONAL_OR_KEYWORD + # this is a subset of NOT_HANDLED_FUNCTIONS for which there's nothing to do # because they don't apply to (real) numeric types # or they work as expected out of the box @@ -154,7 +163,7 @@ if NUMPY_VERSION >= Version("2.0.0dev0"): - # the followin all work out of the box (tested) + # the following all work out of the box (tested) NOOP_FUNCTIONS |= { np.linalg.cross, np.linalg.diagonal, @@ -175,6 +184,11 @@ np.vecdot, } +if NUMPY_VERSION >= Version("2.1.0dev0"): + NOOP_FUNCTIONS |= { + np.unstack, + } + # Functions for which behaviour is intentionally left to default IGNORED_FUNCTIONS = { np.i0, @@ -184,35 +198,47 @@ np.savez_compressed, } - +# map subsets of deprecated functions to the version they were removed +# so that we can drop the ones that are not present in any version we support DEPRECATED_FUNCTIONS = { - "alen", # deprecated in numpy 1.18, removed in 1.22 - "asscalar", # deprecated in numpy 1.18, removed in 1.22 - "fv", # deprecated in numpy 1.18, removed in 1.20 - "ipmt", # deprecated in numpy 1.18, removed in 1.20 - "irr", # deprecated in numpy 1.18, removed in 1.20 - "mirr", # deprecated in numpy 1.18, removed in 1.20 - "nper", # deprecated in numpy 1.18, removed in 1.20 - "npv", # deprecated in numpy 1.18, removed in 1.20 - "pmt", # deprecated in numpy 1.18, removed in 1.20 - "ppmt", # deprecated in numpy 1.18, removed in 1.20 - "pv", # deprecated in numpy 1.18, removed in 1.20 - "rank", # deprecated in numpy 1.10, removed in 1.18 - "rate", # deprecated in numpy 1.18, removed in 1.20 - "msort", # deprecated in numpy 1.24 - # numpy 1.25 deprecations - "product", - "cumproduct", - "round_", # removed in 2.0 - "sometrue", - "alltrue", + Version("1.20"): { + "fv", + "ipmt", + "irr", + "mirr", + "nper", + "npv", + "pmt", + "ppmt", + "pv", + "rate", + }, + Version("1.22"): { + "alen", + "asscalar", + }, + Version("2.0.0b1"): { + "msort", + "product", + "cumproduct", + "round_", + "sometrue", + "alltrue", + }, + # functions that are deprecated but not yet removed in any known version + # should be added here + Version("999.999.999"): set(), } NOT_HANDLED_FUNCTIONS = NOOP_FUNCTIONS | UNSUPPORTED_FUNCTIONS | IGNORED_FUNCTIONS -for func in DEPRECATED_FUNCTIONS: - if hasattr(np, func): - NOT_HANDLED_FUNCTIONS.add(getattr(np, func)) +with warnings.catch_warnings(): + warnings.simplefilter("ignore", DeprecationWarning) + for removal_version, functions in DEPRECATED_FUNCTIONS.items(): + if NUMPY_VERSION >= removal_version: + continue + for func in functions: + NOT_HANDLED_FUNCTIONS.add(getattr(np, func)) def get_decorators(func): @@ -930,7 +956,7 @@ if NUMPY_VERSION >= Version("2.0.0dev0"): _trapezoid_func = np.trapezoid else: - _trapezoid_func = np.trapz + _trapezoid_func = np.trapz # noqa: NPY201 def test_trapezoid_no_x(): @@ -1202,16 +1228,25 @@ @pytest.mark.parametrize( - "func, args", + "func_name, args", [ - (np.split, (3, 2)), - (np.dsplit, (3,)), - (np.hsplit, (2,)), - (np.vsplit, (1,)), - (np.array_split, (3,)), + ("split", (3, 2)), + ("dsplit", (3,)), + ("hsplit", (2,)), + ("vsplit", (1,)), + ("array_split", (3,)), + pytest.param( + "unstack", + (), + marks=pytest.mark.skipif( + NUMPY_VERSION < Version("2.1.0dev0"), + reason="np.unstack is new in NumPy 2.1", + ), + ), ], ) -def test_xsplit(func, args): +def test_xsplit(func_name, args): + func = getattr(np, func_name) x = [ [ [ @@ -1404,7 +1439,7 @@ def test_savetxt(tmp_path): a = [1, 2, 3] * cm - with pytest.raises( + with pytest.warns( UserWarning, match=re.escape( "numpy.savetxt does not preserve units, " @@ -1685,14 +1720,14 @@ def test_in1d_mixed_units(): a = [1, 2, 3] * cm with pytest.raises(UnitInconsistencyError): - np.in1d([1, 2], a) + np.in1d([1, 2], a) # noqa: NPY201 @pytest.mark.filterwarnings("ignore:`in1d` is deprecated. Use `np.isin` instead.") def test_in1d(): a = [1, 2, 3] * cm b = [1, 2] * cm - assert np.all(np.in1d(b, a)) + assert np.all(np.in1d(b, a)) # noqa: NPY201 def test_place_mixed_units(): @@ -1965,3 +2000,146 @@ res = np.interp(_x * cm, _xp * cm, _fp * K) assert type(res) is unyt_array assert res.units == K + + +(a)pytest.mark.parametrize( + "target, helper", + sorted( + HANDLED_FUNCTIONS.items(), + key=lambda items: items[0].__name__, + ), + ids=lambda func: func.__name__, +) +class TestFunctionHelpersSignatureCompatibility: + """ + Check that a helper function's signature is *at least* as flexible + as the helped (target) function's. E.g., any argument that is allowed positionally, + or as keyword, by the target must be re-exposed *somehow* by the helper. + We explicitly allow helper's signature to be *more* flexible than the target signature + by allowing *args and **kwargs catch-all arguments, which we use to limit code + duplication, and also help with forward and backward compatibility. + See https://github.com/astropy/astropy/issues/15703 + """ + + # this test class is adapted from astropy.units + + @staticmethod + def have_catchall_argument(parameters, kind) -> bool: + return any(p.kind is kind for p in parameters.values()) + + @staticmethod + def get_param_group(parameters, kinds: list) -> list[str]: + return [name for name, p in parameters.items() if p.kind in kinds] + + def test_all_arguments_reexposed(self, target, helper): + try: + sig_target = inspect.signature(target) + except ValueError: + pytest.skip("Non Python function cannot be inspected at runtime") + + params_target = sig_target.parameters + sig_helper = inspect.signature(helper) + params_helper = sig_helper.parameters + + have_args_helper = self.have_catchall_argument(params_helper, VAR_POSITIONAL) + have_kwargs_helper = self.have_catchall_argument(params_helper, VAR_KEYWORD) + + args_helper = list(params_helper.items()) + + pos_helper = 0 + for nt, pt in params_target.items(): + kt = pt.kind + if kt in (POSITIONAL_ONLY, POSITIONAL_OR_KEYWORD): + assert pos_helper < len(args_helper), ( + "helper's signature is too short; " + "some arguments are not properly re-exposed" + ) + nh, ph = args_helper[pos_helper] + if (kh := ph.kind) is not VAR_POSITIONAL: + assert nh == nt, f"argument {nt!r} isn't re-exposed as positional" + assert kh is kt, ( + f"helper is not re-exposing argument {nt!r} properly:" + f"expected {kt}, got {kh}" + ) + pos_helper += 1 + continue + + if kt in (KEYWORD_ONLY, POSITIONAL_OR_KEYWORD): + if nt in params_helper: + kh = params_helper[nt].kind + assert kh is kt, ( + f"helper is not re-exposing argument {nt!r} properly: " + f"expected {kt}, got {kh}" + ) + elif kt is KEYWORD_ONLY: + assert ( + have_kwargs_helper + ), f"argument {nt!r} is not re-exposed as keyword" + elif kt is POSITIONAL_OR_KEYWORD: + assert ( + have_args_helper and have_kwargs_helper + ), f"argument {nt!r} is not re-exposed as positional-or-keyword" + elif kt is VAR_POSITIONAL: + assert have_args_helper, "helper is missing a catch-all *args argument" + elif kt is VAR_KEYWORD: + assert ( + have_kwargs_helper + ), "helper is missing a catch-all **kwargs argument" + + def test_known_arguments(self, target, helper): + # validate that all exposed arguments map to something in the target + try: + sig_target = inspect.signature(target) + except ValueError: + pytest.skip("Non Python function cannot be inspected at runtime") + + params_target = sig_target.parameters + sig_helper = inspect.signature(helper) + params_helper = sig_helper.parameters + + for kind in (POSITIONAL_ONLY, POSITIONAL_OR_KEYWORD): + args_target = self.get_param_group(params_helper, [kind]) + args_helper = self.get_param_group(params_helper, [kind]) + + if (nhelper := len(args_helper)) > (ntarget := len(args_target)): + unknown: list[str] = args_helper[ntarget:] + raise AssertionError( + f"Found unknown {kind} parameter(s) " + "in helper's signature: " + f"{unknown}, at position(s) {list(range(ntarget, nhelper))}" + ) + + # keyword-allowed + keyword_allowed_target = set( + self.get_param_group(params_target, [KEYWORD_ONLY, POSITIONAL_OR_KEYWORD]) + ) + keyword_allowed_helper = set( + self.get_param_group(params_helper, [KEYWORD_ONLY, POSITIONAL_OR_KEYWORD]) + ) + + # additional private keyword-only argument are allowed because + # they are only intended for testing purposes. + # For instance, quantile has such a parameter '_q_unit' + keyword_allowed_helper = { + name for name in keyword_allowed_helper if not name.startswith("_") + } + + diff = keyword_allowed_helper - keyword_allowed_target + assert not diff, ( + "Found some keyword-allowed parameters in helper " + f"that are unknown to target: {diff}" + ) + + # finally, check that default values are correctly replicated + for name, ph in params_helper.items(): + if name not in params_target: + # In a few cases, the helper defines names that are not in + # the target (e.g., a private name like _q_unit in quantile, + # or a *args, **kwargs that captures further arguments + # that do not matter. We let such cases slip by. + continue + pt = params_target[name] + assert ph.default == pt.default, ( + f"Default value mismatch for argument {name!r}. " + f"Helper has {ph.default!r}, target has {pt.default!r}" + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/tests/test_unyt_array.py new/unyt-3.0.3/unyt/tests/test_unyt_array.py --- old/unyt-3.0.2/unyt/tests/test_unyt_array.py 2024-03-12 16:09:51.000000000 +0100 +++ new/unyt-3.0.3/unyt/tests/test_unyt_array.py 2024-07-01 19:41:17.000000000 +0200 @@ -16,7 +16,6 @@ import shutil import tempfile from importlib.metadata import version -from pathlib import Path import numpy as np import pytest @@ -851,30 +850,6 @@ SYMPY_VERSION = Version(version("sympy")) -(a)pytest.mark.xfail( - condition=(SYMPY_VERSION == Version("1.12")), - reason="regression in sympy 1.12", - raises=AssertionError, - strict=True, -) -(a)pytest.mark.xfail( - condition=(SYMPY_VERSION in (Version("1.9"), Version("1.10"))), - reason="Not resolved upstream as of sympy 1.10", - raises=AttributeError, - strict=True, -) -def test_unpickling_old_array(): - # see https://github.com/sympy/sympy/issues/22241 - # the expected error is "AttributeError: 'One' object has no attribute '__dict__'" - PFILE = Path(__file__).parent / "data" / "unyt_array_sympy1.8.pickle" - with open(PFILE, "rb") as fh: - arr = pickle.load(fh) - - # this comparison fails with sympy==1.12 - # see https://github.com/sympy/sympy/issues/25134 - assert arr.units.dimensions == cm.dimensions - - def test_copy(): quan = unyt_quantity(1, "g") arr = unyt_array([1, 2, 3], "cm") @@ -1546,7 +1521,8 @@ reg.add("code_length", 10.0, dimensions.length) - warr = unyt_array(np.random.random((256, 256)), "code_length", registry=reg) + rng = np.random.default_rng() + warr = unyt_array(rng.random((256, 256)), "code_length", registry=reg) warr.write_hdf5("test.h5") @@ -1565,8 +1541,8 @@ # test code to overwrite existing dataset with data that has a different # shape - - warr = unyt_array(np.random.random((255, 255)), "code_length", registry=reg) + rng = np.random.default_rng() + warr = unyt_array(rng.random((255, 255)), "code_length", registry=reg) warr.write_hdf5("test.h5") @@ -2165,9 +2141,10 @@ curdir = os.getcwd() os.chdir(tmpdir) - a = unyt_array(np.random.random(10), "kpc") - b = unyt_array(np.random.random(10), "Msun") - c = unyt_array(np.random.random(10), "km/s") + rng = np.random.default_rng() + a = unyt_array(rng.random(10), "kpc") + b = unyt_array(rng.random(10), "Msun") + c = unyt_array(rng.random(10), "km/s") savetxt("arrays.dat", [a, b, c], delimiter=",") @@ -2221,8 +2198,9 @@ def test_trig_ufunc_degrees(): + rng = np.random.default_rng() for ufunc in (np.sin, np.cos, np.tan): - degree_values = np.random.random(10) * degree + degree_values = rng.random(10) * degree radian_values = degree_values.in_units("radian") assert_array_equal(ufunc(degree_values), ufunc(radian_values)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/unit_object.py new/unyt-3.0.3/unyt/unit_object.py --- old/unyt-3.0.2/unyt/unit_object.py 2024-02-24 15:11:41.000000000 +0100 +++ new/unyt-3.0.3/unyt/unit_object.py 2024-07-01 19:41:17.000000000 +0200 @@ -467,7 +467,7 @@ "Failed to cast it to a float." ) - if self.dimensions is logarithmic and p != 1.0: + if self.dimensions is logarithmic and p != 1: raise InvalidUnitOperation(f"Tried to raise '{self}' to power '{p}'") return Unit( @@ -988,9 +988,8 @@ return (float(base_value), dimensions) raise UnitParseError( - "Cannot parse for unit data from '%s'. Please supply" - " an expression of only Unit, Symbol, Pow, and Mul" - "objects." % str(unit_expr) + f"Cannot parse for unit data from {str(unit_expr)!r}. Please supply " + "an expression of only Unit, Symbol, Pow, and Mul objects." ) @@ -1006,15 +1005,15 @@ elif isinstance(dimensions, Pow): if not isinstance(dimensions.args[1], Number): raise UnitParseError( - "Dimensionality expression '%s' contains a " - "unit symbol as a power." % dimensions + f"Dimensionality expression '{dimensions}' contains a " + "unit symbol as a power." ) elif isinstance(dimensions, (Add, Number)): if not isinstance(dimensions, One): raise UnitParseError( "Only dimensions that are instances of Pow, " "Mul, or symbols in the base dimensions are " - "allowed. Got dimensions '%s'" % dimensions + f"allowed. Got dimensions '{dimensions}'" ) elif not isinstance(dimensions, Basic): raise UnitParseError(f"Bad dimensionality expression '{dimensions}'.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt/unit_registry.py new/unyt-3.0.3/unyt/unit_registry.py --- old/unyt-3.0.2/unyt/unit_registry.py 2024-02-24 15:11:41.000000000 +0100 +++ new/unyt-3.0.3/unyt/unit_registry.py 2024-06-26 16:21:25.000000000 +0200 @@ -179,8 +179,8 @@ if symbol not in self.lut: raise SymbolNotFoundError( - "Tried to remove the symbol '%s', but it does not exist " - "in this registry." % symbol + r"Tried to remove the symbol {symbol!r}, but it does not exist " + "in this registry." ) del self.lut[symbol] @@ -205,8 +205,8 @@ if symbol not in self.lut: raise SymbolNotFoundError( - "Tried to modify the symbol '%s', but it does not exist " - "in this registry." % symbol + f"Tried to modify the symbol {symbol!r}, but it does not exist " + "in this registry." ) if hasattr(base_value, "in_base"): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt.egg-info/PKG-INFO new/unyt-3.0.3/unyt.egg-info/PKG-INFO --- old/unyt-3.0.2/unyt.egg-info/PKG-INFO 2024-03-13 07:33:56.000000000 +0100 +++ new/unyt-3.0.3/unyt.egg-info/PKG-INFO 2024-07-02 15:39:56.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: unyt -Version: 3.0.2 +Version: 3.0.3 Summary: A package for handling numpy arrays with units Author-email: The yt project <yt-dev(a)python.org> License: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unyt-3.0.2/unyt.egg-info/SOURCES.txt new/unyt-3.0.3/unyt.egg-info/SOURCES.txt --- old/unyt-3.0.2/unyt.egg-info/SOURCES.txt 2024-03-13 07:33:56.000000000 +0100 +++ new/unyt-3.0.3/unyt.egg-info/SOURCES.txt 2024-07-02 15:39:56.000000000 +0200 @@ -91,5 +91,4 @@ unyt/tests/test_unyt_array.py unyt/tests/test_unyt_testing.py unyt/tests/data/__init__.py -unyt/tests/data/old_json_registry.txt -unyt/tests/data/unyt_array_sympy1.8.pickle \ No newline at end of file +unyt/tests/data/old_json_registry.txt \ No newline at end of file

1 0

commit deno for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deno for openSUSE:Factory checked in at 2024-07-11 20:32:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deno (Old) and /work/SRC/openSUSE:Factory/.deno.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deno" Thu Jul 11 20:32:46 2024 rev:46 rq:1186723 version:1.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/deno/deno.changes 2024-07-05 19:53:18.806990009 +0200 +++ /work/SRC/openSUSE:Factory/.deno.new.17339/deno.changes 2024-07-11 20:33:25.985423144 +0200 @@ -1,0 +2,78 @@ +Wed Jul 10 23:19:03 UTC 2024 - Avindra Goolcharan <avindra(a)opensuse.org> + +- update to 1.45.0 + * BREAKING(unstable/ffi): remove callback reentrant flag (#24367) + * feat(cli): Add --frozen flag to error out if lockfile is out of date (#24355) + * feat(cli): deno init --lib (#22499) + * feat(compile): support --env (#24166) + * feat(ext/crypto): make deriveBits length parameter optional and nullable (#24426) + * feat(ext/web): add Blob.prototype.bytes() (#24148) + * feat(jsr): support publishing jsr packages in npm workspaces (#24507) + * feat(jupyter): support confirm and prompt in notebooks (#23592) + * feat(lsp): ts language service scopes (#24345) + * feat(node): Support executing npm package lifecycle scripts + (preinstall/install/postinstall) (#24487) + * feat(workspace): support object config (#24483) + * feat: Deprecate --lock-write flag (#24436) + * feat: Upgrade to TypeScript 5.5.2 (#24326) + * feat: add __tests__ to test file detection defaults (#24443) + * feat: deprecate deno vendor (#22183) + * feat: npm workspace and better Deno workspace support (#24334) + * feat: support wildcards in npm workspaces (#24471) + * feat: upgrade deno_core (#24364) + * feat: upgrade deno_core to 0.293.0 (#24482) + * fix(check): CJS types importing dual ESM/CJS package should prefer CJS types (#24492) + * fix(compile): atomically write compile output (#24378) + * fix(compile): prevent setting unstable feature twice (#24381) + * fix(ext/node): Add fs.lutimes / fs.lutimesSync (#23172) + * fix(ext/node): add Module.parent (#24333) + * fix(ext/node): add ServerResponse#appendHeader (#24216) + * fix(ext/node): add Symbol.toStringTag to KeyObject instances (#24377) + * fix(ext/node): discover .npmrc in user's homedir (#24021) + * fix(ext/node): don't panic on invalid utf-8 in pem (#24303) + * fix(ext/node): don't wait for end() call to send http client request (#24390) + * fix(ext/node): http chunked writes hangs (#24428) + * fix(ext/node): ignore stream error during enqueue (#24243) + * fix(ext/node): make next tick queue resilient to Array.prototype tampering (#24361) + * fix(ext/node): rewrite crypto.Hash (#24302) + * fix(ext/node): rewrite digest handling (#24392) + * fix(ext/node): use cppgc for node:zlib (#24267) + * fix(ext/webgpu): fix GPUUncapturedErrorEvent parent type (#24369) + * fix(ext/websocket): drop connection when close frame not ack (#24301) + * fix(lsp): correct scope attribution for injected @types/node (#24404) + * fix(lsp): do sloppy resolution for node-to-node imports in byonm (#24481) + * fix(lsp): don't use global cache paths for scope allocation (#24353) + * fix(lsp): inherit workspace-root-only fields in members (#24440) + * fix(lsp): respect lockfile redirects entries for resolution (#24365) + * fix(lsp): use CliLockfile (#24387) + * fix(net): set correct max size for Datagram (#21611) + * fix(node): Implement fs.lchown (and process.getegid) (#24418) + * fix(node): add missing readline/promises module (#24336) + * fix(node/assert): throws not checking error instance (#24466) + * fix(node/http): don't error if request destroyed before send (#24497) + * fix(node/http): don't send destroyed requests (#24498) + * fix(node/http): don't throw on .address() before .listen() (#24432) + * fix(node/http): support all .writeHead() signatures (#24469) + * fix(node/perf_hooks): stub eventLoopUtilization (#24501) + * fix(node/v8): stub serializer methods (#24502) + * fix(permissions): handle ipv6 addresses correctly (#24397) + * fix(publish): unfurling should always be done with the package json (#24435) + * fix(task): do not propagate env changes outside subshells (#24279) + * fix(workspace): better cli file argument handling (#24447) + * fix: Add sys permission kinds for node compat (#24242) + * fix: add warning for invalid unstable feature use in deno.json/jsonc (#24120) + * fix: do not download compilerOptions -> types when not type checking (#24473) + * fix: do not return undefined for missing global properties (#24474) + * fix: make .setup-cache.bin in node_modules more reproducible (#24480) + * fix: memory leak when transpiling (#24490) + * fix: node-api get_value_string_utf8 should use utf8_length (#24193) + * fix: panic when piping "deno help" or "deno --version" (#22917) + * fix: test in presence of .npmrc (#24486) + * fix: upgrade deno_core to 0.291.0 (#24297) + * perf(ext/node): improve Buffer.from(buffer) (#24352) + * perf(ext/websocket): avoid global interceptor overhead (#24284) + * perf(ws): optimize fastwebsockets in release profile (#24277) + * perf: optimize Buffer.from("base64") for forgiving-base64 conforming input (#24346) +- rebase deno-rm-upgrade.patch + +------------------------------------------------------------------- @@ -182 +259,0 @@ - * fix(ext/node): support junction symlinks on Windows (#22762) @@ -185 +261,0 @@ - * fix(node): add nul byte to statfs path on windows (#22905) Old: ---- deno-1.44.4.tar.xz New: ---- deno-1.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deno.spec ++++++ --- /var/tmp/diff_new_pack.oWjNYR/_old 2024-07-11 20:33:29.621556013 +0200 +++ /var/tmp/diff_new_pack.oWjNYR/_new 2024-07-11 20:33:29.625556159 +0200 @@ -19,7 +19,7 @@ Name: deno -Version: 1.44.4 +Version: 1.45.0 Release: 0 Summary: A secure JavaScript and TypeScript runtime License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.oWjNYR/_old 2024-07-11 20:33:29.673557914 +0200 +++ /var/tmp/diff_new_pack.oWjNYR/_new 2024-07-11 20:33:29.677558059 +0200 @@ -13,8 +13,8 @@ <service name="tar_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/denoland/deno</param> - <param name="revision">v1.44.4</param> - <param name="version">1.44.4</param> + <param name="revision">v1.45.0</param> + <param name="version">1.45.0</param>  <param name="exclude">docs</param> @@ -37,8 +37,8 @@ <service name="tar_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/denoland/rusty_v8</param> - <param name="revision">v0.94.0</param> - <param name="version">0.94.0</param> + <param name="revision">v0.97.0</param> + <param name="version">0.97.0</param> <param name="exclude">.github</param> <!-- ++++++ deno-1.44.4.tar.xz -> deno-1.45.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/deno/deno-1.44.4.tar.xz /work/SRC/openSUSE:Factory/.deno.new.17339/deno-1.45.0.tar.xz differ: char 15, line 1 ++++++ deno-rm-upgrade.patch ++++++ --- /var/tmp/diff_new_pack.oWjNYR/_old 2024-07-11 20:33:29.745560545 +0200 +++ /var/tmp/diff_new_pack.oWjNYR/_new 2024-07-11 20:33:29.749560690 +0200 @@ -38,10 +38,26 @@ tools::vendor::vendor(flags, vendor_flags).await }), diff --git a/cli/args/flags.rs.1 b/cli/args/flags.rs -index 72841df..1c93da1 100644 +index 48cfb92..eb31bf6 100644 --- a/cli/args/flags.rs.1 +++ b/cli/args/flags.rs -@@ -397,7 +397,6 @@ pub enum DenoSubcommand { +@@ -377,15 +377,6 @@ pub struct TestFlags { + pub junit_path: Option<String>, + } + +-#[derive(Clone, Debug, Eq, PartialEq)] +-pub struct UpgradeFlags { +- pub dry_run: bool, +- pub force: bool, +- pub canary: bool, +- pub version: Option<String>, +- pub output: Option<String>, +-} +- + #[derive(Clone, Debug, Eq, PartialEq)] + pub struct VendorFlags { + pub specifiers: Vec<String>, +@@ -428,7 +419,6 @@ pub enum DenoSubcommand { Task(TaskFlags), Test(TestFlags), Types, @@ -49,16 +65,7 @@ Vendor(VendorFlags), Publish(PublishFlags), } -@@ -917,7 +917,7 @@ impl Flags { - Some(current_dir.to_path_buf()) - } - Add(_) | Bundle(_) | Completions(_) | Doc(_) | Fmt(_) | Init(_) -- | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types | Upgrade(_) -+ | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types - | Vendor(_) => None, - Install(_) => { - if *DENO_FUTURE { -@@ -1062,9 +1061,6 @@ static ENV_VARIABLES_HELP: &str = color_print::cstr!( +@@ -1097,9 +1087,6 @@ static ENV_VARIABLES_HELP: &str = color_print::cstr!( <g>DENO_NO_PROMPT</> Set to disable permission prompts on access (alternative to passing --no-prompt on invocation) @@ -68,7 +75,7 @@ <g>DENO_TLS_CA_STORE</> Comma-separated list of order dependent certificate stores. Possible values: "system", "mozilla". Defaults to "mozilla". -@@ -944,7 +934,6 @@ pub fn flags_from_vec(args: Vec<String>) -> clap::error::Result<Flags> { +@@ -1209,7 +1196,6 @@ pub fn flags_from_vec(args: Vec<OsString>) -> clap::error::Result<Flags> { "test" => test_parse(&mut flags, &mut m), "types" => types_parse(&mut flags, &mut m), "uninstall" => uninstall_parse(&mut flags, &mut m), @@ -76,7 +83,7 @@ "vendor" => vendor_parse(&mut flags, &mut m), "publish" => publish_parse(&mut flags, &mut m), _ => unreachable!(), -@@ -1099,7 +1088,6 @@ fn clap_root() -> Command { +@@ -1379,7 +1365,6 @@ fn clap_root() -> Command { .subcommand(task_subcommand()) .subcommand(test_subcommand()) .subcommand(types_subcommand()) @@ -84,7 +91,7 @@ .subcommand(vendor_subcommand()) }) .long_about(DENO_HELP) -@@ -2413,60 +2404,6 @@ The declaration file could be saved and used for typing information.", +@@ -2776,60 +2761,6 @@ The declaration file could be saved and used for typing information.", ) } @@ -142,10 +149,10 @@ - }) -} - + // TODO(bartlomieju): this subcommand is now deprecated, remove it in Deno 2. fn vendor_subcommand() -> Command { Command::new("vendor") - .about("Vendor remote modules into a local directory") -@@ -3965,23 +3902,6 @@ fn types_parse(flags: &mut Flags, _matches: &mut ArgMatches) { +@@ -4488,23 +4419,6 @@ fn types_parse(flags: &mut Flags, _matches: &mut ArgMatches) { flags.subcommand = DenoSubcommand::Types; } @@ -169,7 +176,7 @@ fn vendor_parse(flags: &mut Flags, matches: &mut ArgMatches) { ca_file_arg_parse(flags, matches); config_args_parse(flags, matches); -@@ -4442,25 +4362,6 @@ mod tests { +@@ -4974,43 +4888,6 @@ mod tests { assert_eq!(flags2, flags); } @@ -192,10 +199,28 @@ - ); - } - +- #[test] +- fn upgrade_with_output_flag() { +- let r = flags_from_vec(svec!["deno", "upgrade", "--output", "example.txt"]); +- assert_eq!( +- r.unwrap(), +- Flags { +- subcommand: DenoSubcommand::Upgrade(UpgradeFlags { +- force: false, +- dry_run: false, +- canary: false, +- version: None, +- output: Some(String::from("example.txt")), +- }), +- ..Flags::default() +- } +- ); +- } +- #[test] - fn upgrade_with_output_flag() { - let r = flags_from_vec(svec!["deno", "upgrade", "--output", "example.txt"]); -@@ -7509,25 +7406,6 @@ mod tests { + fn version() { + let r = flags_from_vec(svec!["deno", "--version"]); +@@ -8832,25 +8709,6 @@ mod tests { ); } ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/deno/vendor.tar.xz /work/SRC/openSUSE:Factory/.deno.new.17339/vendor.tar.xz differ: char 15, line 1

1 0

commit suse-prime for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package suse-prime for openSUSE:Factory checked in at 2024-07-11 20:32:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-prime (Old) and /work/SRC/openSUSE:Factory/.suse-prime.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suse-prime" Thu Jul 11 20:32:45 2024 rev:45 rq:1186790 version:0.8.17 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-prime/suse-prime.changes 2024-01-06 18:23:49.655486305 +0100 +++ /work/SRC/openSUSE:Factory/.suse-prime.new.17339/suse-prime.changes 2024-07-11 20:33:23.737340994 +0200 @@ -1,0 +2,20 @@ +Thu Jul 11 08:37:56 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com> + +- SUSEPrime-0.8.17 + * fix error in disabling nvidia service + +------------------------------------------------------------------- +Thu Jul 11 01:12:50 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com> + +- SUSEPrime-0.8.16 + * fixed nvidia-powerd service preventing unloading of nvidia + modules + +------------------------------------------------------------------- +Thu Jul 11 01:12:06 UTC 2024 - Stefan Dirsch <sndirsch(a)suse.com> + +- SUSEPrime-0.8.15 + * added prime-run script for easier offload mode usage (github + issue#96) + +------------------------------------------------------------------- Old: ---- SUSEPrime-0.8.15.tar.gz New: ---- SUSEPrime-0.8.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-prime.spec ++++++ --- /var/tmp/diff_new_pack.IFV2D0/_old 2024-07-11 20:33:24.641374030 +0200 +++ /var/tmp/diff_new_pack.IFV2D0/_new 2024-07-11 20:33:24.645374175 +0200 @@ -23,7 +23,7 @@ %global modprobe_d_files 09-nvidia-modprobe-bbswitch-G04.conf 09-nvidia-modprobe-pm-G05.conf Name: suse-prime -Version: 0.8.15 +Version: 0.8.17 Release: 0 Summary: GPU (nvidia/intel) selection for NVIDIA optimus laptops with bbswitch support License: SUSE-Public-Domain ++++++ SUSEPrime-0.8.15.tar.gz -> SUSEPrime-0.8.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.8.15/prime-select.sh new/SUSEPrime-0.8.17/prime-select.sh --- old/SUSEPrime-0.8.15/prime-select.sh 2024-01-06 17:55:04.000000000 +0100 +++ new/SUSEPrime-0.8.17/prime-select.sh 2024-07-11 10:33:49.000000000 +0200 @@ -374,11 +374,14 @@ fi else # https://github.com/Bumblebee-Project/bbswitch/issues/173#issuecomment-70316… - # ensure nvidia-persistenced service is not running - if systemctl is-active --quiet nvidia-persistenced.service; then - systemctl stop nvidia-persistenced.service - systemctl disable nvidia-persistenced.service - fi + # ensure nvidia-persistenced and nvidia-powerd services are disabled and not running + # as they prevent unloading of NVIDIA modules + for name in persistenced powerd + do + if systemctl is-active --quiet nvidia-${name}.service; then + systemctl disable --now nvidia-${name}.service + fi + done # kill all nvidia related process to fix failure to unload nvidia modules (issue#50) nvidia_process=$(lsof -t /dev/nvidia* 2> /dev/null) if [ -n "$nvidia_process" ]; then

1 0

commit minio-client for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minio-client for openSUSE:Factory checked in at 2024-07-11 20:32:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minio-client (Old) and /work/SRC/openSUSE:Factory/.minio-client.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "minio-client" Thu Jul 11 20:32:31 2024 rev:87 rq:1186740 version:20240708T205924Z Changes: -------- --- /work/SRC/openSUSE:Factory/minio-client/minio-client.changes 2024-07-09 20:05:42.292446601 +0200 +++ /work/SRC/openSUSE:Factory/.minio-client.new.17339/minio-client.changes 2024-07-11 20:32:37.731659858 +0200 @@ -1,0 +2,7 @@ +Thu Jul 11 05:31:59 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 20240708T205924Z: + * improve 'admin service restart' UI (#4979) + * update deps (#4978) + +------------------------------------------------------------------- Old: ---- mc-20240703T201725Z.obscpio New: ---- mc-20240708T205924Z.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minio-client.spec ++++++ --- /var/tmp/diff_new_pack.sUiydV/_old 2024-07-11 20:32:41.379793168 +0200 +++ /var/tmp/diff_new_pack.sUiydV/_new 2024-07-11 20:32:41.379793168 +0200 @@ -22,7 +22,7 @@ %define binary_name minio-client Name: minio-client -Version: 20240703T201725Z +Version: 20240708T205924Z Release: 0 Summary: Client for MinIO License: AGPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.sUiydV/_old 2024-07-11 20:32:41.411794337 +0200 +++ /var/tmp/diff_new_pack.sUiydV/_new 2024-07-11 20:32:41.415794484 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="changesgenerate">enable</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">RELEASE.2024-07-03T20-17-25Z</param> + <param name="revision">RELEASE.2024-07-08T20-59-24Z</param> <param name="match-tag">RELEASE.*</param> <param name="versionrewrite-pattern">RELEASE\.(.*)-(.*)-(.*)-(.*)-(.*)</param> <param name="versionrewrite-replacement">\1\2\3\4\5</param> @@ -19,7 +19,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="manual"> - <param name="archive">mc-20240703T201725Z.obscpio</param> + <param name="archive">mc-20240708T205924Z.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.sUiydV/_old 2024-07-11 20:32:41.439795361 +0200 +++ /var/tmp/diff_new_pack.sUiydV/_new 2024-07-11 20:32:41.443795507 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/minio/mc</param> - <param name="changesrevision">d6ff97012549bfd91396447249297411ccfc79a7</param></service></servicedata> + <param name="changesrevision">21d3ec0089a1fa297cbdc23db413012535e2ff9e</param></service></servicedata> (No newline at EOF) ++++++ mc-20240703T201725Z.obscpio -> mc-20240708T205924Z.obscpio ++++++ ++++ 1867 lines of diff (skipped) ++++++ mc.obsinfo ++++++ --- /var/tmp/diff_new_pack.sUiydV/_old 2024-07-11 20:32:41.703805008 +0200 +++ /var/tmp/diff_new_pack.sUiydV/_new 2024-07-11 20:32:41.707805155 +0200 @@ -1,5 +1,5 @@ name: mc -version: 20240703T201725Z -mtime: 1720037845 -commit: d6ff97012549bfd91396447249297411ccfc79a7 +version: 20240708T205924Z +mtime: 1720472364 +commit: 21d3ec0089a1fa297cbdc23db413012535e2ff9e ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/minio-client/vendor.tar.gz /work/SRC/openSUSE:Factory/.minio-client.new.17339/vendor.tar.gz differ: char 5, line 1

1 0

commit anjuta for openSUSE:Factory
by Source-Sync 11 Jul '24

11 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package anjuta for openSUSE:Factory checked in at 2024-07-11 20:32:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/anjuta (Old) and /work/SRC/openSUSE:Factory/.anjuta.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "anjuta" Thu Jul 11 20:32:30 2024 rev:117 rq:1186692 version:3.34.0 Changes: -------- --- /work/SRC/openSUSE:Factory/anjuta/anjuta.changes 2022-09-21 14:42:48.413817266 +0200 +++ /work/SRC/openSUSE:Factory/.anjuta.new.17339/anjuta.changes 2024-07-11 20:32:36.711622585 +0200 @@ -1,0 +2,5 @@ +Wed Jul 10 14:12:45 UTC 2024 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Add pointer-types.patch: Fix build with gcc 14. + +------------------------------------------------------------------- New: ---- pointer-types.patch BETA DEBUG BEGIN: New: - Add pointer-types.patch: Fix build with gcc 14. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.FIOXjl/_old 2024-07-11 20:32:37.227641441 +0200 +++ /var/tmp/diff_new_pack.FIOXjl/_new 2024-07-11 20:32:37.231641587 +0200 @@ -1,7 +1,7 @@ # # spec file for package anjuta # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,9 @@ Source99: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM libgda-6.patch gmbr3(a)opensuse.org -- Require and support GDA 6 Patch0: libgda-6.patch +# PATCH-FIX-UPSTREAM pointer-types.patch -- Fix for modern C +Patch1: pointer-types.patch + BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison ++++++ pointer-types.patch ++++++ Index: anjuta-3.34.0/libanjuta/anjuta-dock.c =================================================================== --- anjuta-3.34.0.orig/libanjuta/anjuta-dock.c +++ anjuta-3.34.0/libanjuta/anjuta-dock.c @@ -403,7 +403,7 @@ anjuta_dock_set_command_bar (AnjutaDock if (self->priv->command_bar) g_object_unref (self->priv->command_bar); - self->priv->command_bar = g_object_ref (command_bar); + self->priv->command_bar = (GtkWidget *)(g_object_ref (command_bar)); } /** Index: anjuta-3.34.0/plugins/am-project/amp-group.c =================================================================== --- anjuta-3.34.0.orig/plugins/am-project/amp-group.c +++ anjuta-3.34.0/plugins/am-project/amp-group.c @@ -364,7 +364,7 @@ amp_group_node_update_preset_variable (A root = anjuta_project_node_get_file (node); /* Set source directory variables */ - file = anjuta_project_node_get_file (group); + file = (GFile *)(anjuta_project_node_get_file ((const AnjutaProjectNode *)group)); value = anjuta_token_insert_token_list (FALSE, NULL, ANJUTA_TOKEN_LIST, NULL, ANJUTA_TOKEN_ARGUMENT, NULL, Index: anjuta-3.34.0/plugins/glade/plugin.c =================================================================== --- anjuta-3.34.0.orig/plugins/glade/plugin.c +++ anjuta-3.34.0/plugins/glade/plugin.c @@ -487,7 +487,7 @@ add_glade_member (GladeWidget *widget, return; current_editor = IANJUTA_IS_EDITOR (doc) ? IANJUTA_EDITOR (doc) - : get_doc_with_associated_file (plugin, doc); + : get_doc_with_associated_file ((GladePlugin *)plugin, doc); if (!current_editor) return; Index: anjuta-3.34.0/plugins/language-support-cpp-java/plugin.c =================================================================== --- anjuta-3.34.0.orig/plugins/language-support-cpp-java/plugin.c +++ anjuta-3.34.0/plugins/language-support-cpp-java/plugin.c @@ -430,7 +430,7 @@ get_text_between (IAnjutaEditor *editor, g_object_unref (result_end); - return ianjuta_editor_get_text (editor, prefix_end, suffix_start, NULL); + return ianjuta_editor_get_text (editor, (IAnjutaIterable *)prefix_end, (IAnjutaIterable *)suffix_start, NULL); } static gchar* @@ -846,7 +846,7 @@ static void install_support (CppJavaPlugin *lang_plugin) { /* Searching for association */ - gchar *ui_filename = get_text_between (lang_plugin->current_editor, + gchar *ui_filename = get_text_between ((IAnjutaEditor *)lang_plugin->current_editor, WIDGETS_DECLARATION_MARKER_PREFIX, WIDGETS_DECLARATION_MARKER_SUFFIX); Index: anjuta-3.34.0/plugins/language-support-js/util.c =================================================================== --- anjuta-3.34.0.orig/plugins/language-support-js/util.c +++ anjuta-3.34.0/plugins/language-support-js/util.c @@ -109,7 +109,7 @@ highlight_lines (GList *lines) JSLang* plugin = (JSLang*)getPlugin (); if (!plugin->prefs) - plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); + plugin->prefs = (GSettings *)anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); if (!g_settings_get_boolean (plugin->prefs, HIGHLIGHT_MISSEDSEMICOLON)) { @@ -240,7 +240,7 @@ get_gir_path () JSLang* plugin = (JSLang*)getPlugin (); if (!plugin->prefs) - plugin->prefs = anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); + plugin->prefs = (GSettings *)anjuta_shell_get_preferences (ANJUTA_PLUGIN (plugin)->shell, NULL); gchar *path = g_settings_get_string (plugin->prefs, GIR_DIR_KEY); if (!path || strlen (path) < 1) Index: anjuta-3.34.0/plugins/project-manager/tree-data.c =================================================================== --- anjuta-3.34.0.orig/plugins/project-manager/tree-data.c +++ anjuta-3.34.0/plugins/project-manager/tree-data.c @@ -63,7 +63,7 @@ gbf_tree_data_get_file (GbfTreeData *dat { if (data->source != NULL) { - return g_object_ref (g_file_get_uri (data->source)); + return (GFile *)(g_object_ref (g_file_get_uri (data->source))); } else if (data->target != NULL) { @@ -75,7 +75,7 @@ gbf_tree_data_get_file (GbfTreeData *dat } else if (data->group != NULL) { - return g_object_ref (g_file_get_uri (data->group)); + return (GFile *)(g_object_ref (g_file_get_uri (data->group))); } return NULL; Index: anjuta-3.34.0/plugins/python-loader/plugin.c =================================================================== --- anjuta-3.34.0.orig/plugins/python-loader/plugin.c +++ anjuta-3.34.0/plugins/python-loader/plugin.c @@ -112,7 +112,7 @@ pyl_plugin_activate (AnjutaPlugin *plugi return FALSE; } - PySys_SetArgv (1, argv); + PySys_SetArgv (1, (wchar_t **)argv); /* Retrieve the Python type for anjuta plugin */ m = PyImport_ImportModule ("gi.repository.Anjuta"); Index: anjuta-3.34.0/plugins/starter/plugin.c =================================================================== --- anjuta-3.34.0.orig/plugins/starter/plugin.c +++ anjuta-3.34.0/plugins/starter/plugin.c @@ -153,7 +153,7 @@ on_row_activated (GtkListBox *box, GtkLi if (row != NULL) { - name = gtk_widget_get_name (row); + name = gtk_widget_get_name ((GtkWidget *)row); if (name != NULL) { if (g_strcmp0 (name, CREATE_ROW) == 0) on_new_project_activated (row, user_data); @@ -189,13 +189,13 @@ add_recent_project_row (GtkListBox *rece } else { - file = g_file_new_for_uri (gtk_recent_info_get_uri (recent_project)); + file = g_file_new_for_uri (gtk_recent_info_get_uri ((GtkRecentInfo *)recent_project)); if (g_file_query_exists (file, NULL)) { recent_row = GTK_WIDGET (gtk_builder_get_object (builder, RECENT_ROW)); - project_label = GTK_WIDGET (gtk_builder_get_object (builder, PROJECT_LABEL)); - path_label = GTK_WIDGET (gtk_builder_get_object (builder, PATH_LABEL)); - gtk_label_set_text (project_label, gtk_recent_info_get_display_name(recent_project)); + project_label = (GtkLabel *)(GTK_WIDGET (gtk_builder_get_object (builder, PROJECT_LABEL))); + path_label = (GtkLabel *)(GTK_WIDGET (gtk_builder_get_object (builder, PATH_LABEL))); + gtk_label_set_text (project_label, gtk_recent_info_get_display_name((GtkRecentInfo *)recent_project)); gtk_label_set_text (path_label, g_file_get_path(file)); g_object_set_data_full (G_OBJECT (recent_row), URI_KEY, g_file_get_uri(file), g_free); gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (recent_row)), recent_row); @@ -252,9 +252,9 @@ on_remove_project_clicked (GtkButton *bu error = NULL; if (row != NULL) { - if (gtk_recent_manager_remove_item (manager, g_object_get_data (row, URI_KEY), &error)) + if (gtk_recent_manager_remove_item (manager, g_object_get_data ((GObject *)row, URI_KEY), &error)) { - gtk_container_remove (GTK_CONTAINER (recent_list_box), row); + gtk_container_remove (GTK_CONTAINER (recent_list_box), (GtkWidget *)row); } else { @@ -316,16 +316,16 @@ create_starter_widget (StarterPlugin* pl /* Manually assembling stack and switcher because they are not available in glade yet */ switcher = gtk_stack_switcher_new (); stack = gtk_stack_new (); - gtk_stack_switcher_set_stack (switcher, stack); - gtk_stack_set_transition_type (stack, GTK_STACK_TRANSITION_TYPE_CROSSFADE); - gtk_stack_set_transition_duration (stack, TRANSITION_TIME); + gtk_stack_switcher_set_stack ((GtkStackSwitcher *)switcher, (GtkStack *)stack); + gtk_stack_set_transition_type ((GtkStack *)stack, GTK_STACK_TRANSITION_TYPE_CROSSFADE); + gtk_stack_set_transition_duration ((GtkStack *)stack, TRANSITION_TIME); starter_box = GTK_WIDGET (gtk_builder_get_object (builder, STARTER_BOX)); switcher_box = GTK_WIDGET (gtk_builder_get_object (builder, SWITCHER_BOX)); gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (starter_box)), starter_box); g_object_ref (starter_box); - gtk_box_pack_start (switcher_box, switcher, FALSE, FALSE, 0); - gtk_box_pack_start (starter_box, stack, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *)switcher_box, switcher, FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *)starter_box, stack, FALSE, FALSE, 0); gtk_widget_show_all (starter_box); actions_listbox = GTK_WIDGET (gtk_builder_get_object (builder, ACTIONS_LISTBOX)); @@ -333,7 +333,7 @@ create_starter_widget (StarterPlugin* pl actions_frame = GTK_WIDGET (gtk_builder_get_object (builder, ACTIONS_FRAME)); gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (actions_frame)), actions_frame); g_object_ref (actions_frame); - gtk_stack_add_titled (stack, actions_frame, ACTIONS_ID, "Actions"); + gtk_stack_add_titled ((GtkStack *)stack, actions_frame, ACTIONS_ID, "Actions"); recent_projects_box = GTK_WIDGET (gtk_builder_get_object (builder, RECENT_PROJECTS_BOX)); gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (recent_projects_box)), recent_projects_box); @@ -342,7 +342,7 @@ create_starter_widget (StarterPlugin* pl recent_listbox = GTK_WIDGET (gtk_builder_get_object (builder, RECENT_LISTBOX)); refresh_recent_project_view (GTK_LIST_BOX (recent_listbox)); - gtk_stack_add_titled (stack, recent_projects_box, RECENT_PROJECTS_ID, "Recent Projects"); + gtk_stack_add_titled ((GtkStack *)stack, recent_projects_box, RECENT_PROJECTS_ID, "Recent Projects"); button = GTK_WIDGET (gtk_builder_get_object (builder, REMOVE_PROJECT_BUTTON)); g_signal_connect_object (G_OBJECT (button), "clicked", Index: anjuta-3.34.0/plugins/symbol-db/plugin.c =================================================================== --- anjuta-3.34.0.orig/plugins/symbol-db/plugin.c +++ anjuta-3.34.0/plugins/symbol-db/plugin.c @@ -584,11 +584,11 @@ static void on_code_added (IAnjutaEditor *editor, IAnjutaIterable *position, gchar *code, SymbolDBPlugin *sdb_plugin) { - IAnjutaEditor *old_editor = sdb_plugin->current_editor; - sdb_plugin->current_editor = editor; + IAnjutaEditor *old_editor = (IAnjutaEditor *)(sdb_plugin->current_editor); + sdb_plugin->current_editor = (GObject *)editor; sdb_plugin->need_symbols_update = TRUE; editor_buffer_symbols_update (editor, sdb_plugin); - sdb_plugin->current_editor = old_editor; + sdb_plugin->current_editor = (GObject *)old_editor; } static void

1 0