Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package urlscan for openSUSE:Factory checked in at 2024-05-02 23:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/urlscan (Old) and /work/SRC/openSUSE:Factory/.urlscan.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "urlscan" Thu May 2 23:47:32 2024 rev:15 rq:1171221 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/urlscan/urlscan.changes 2023-07-31 15:25:16.087635531 +0200 +++ /work/SRC/openSUSE:Factory/.urlscan.new.1880/urlscan.changes 2024-05-03 10:48:55.402807852 +0200 @@ -1,0 +2,9 @@ +Wed May 1 16:56:56 UTC 2024 - Andrea Manzini <[email protected]> + +- update to 1.0.2: + * Correct escaped pipe character in urlscan.1 + * fix: patch invalid escape sequence in regex argument help text to support py3.12 + * read me update - neomutt term color compatability + * Fix for newer urwid versions + +------------------------------------------------------------------- Old: ---- urlscan-1.0.1.tar.gz New: ---- urlscan-1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ urlscan.spec ++++++ --- /var/tmp/diff_new_pack.ijMQuR/_old 2024-05-03 10:48:55.990829262 +0200 +++ /var/tmp/diff_new_pack.ijMQuR/_new 2024-05-03 10:48:55.990829262 +0200 @@ -1,7 +1,7 @@ # # spec file for package urlscan # -# 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,7 +18,7 @@ %define pythons python3 Name: urlscan -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: An other URL extractor/viewer License: GPL-2.0-or-later ++++++ urlscan-1.0.1.tar.gz -> urlscan-1.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/.github/workflows/main.yml new/urlscan-1.0.2/.github/workflows/main.yml --- old/urlscan-1.0.1/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/urlscan-1.0.2/.github/workflows/main.yml 2024-04-29 19:22:00.000000000 +0200 @@ -0,0 +1,32 @@ +name: main + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + steps: + - uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Install Hatch + run: | + python -m pip install --upgrade pip + pip install hatch + + - name: Build package + run: hatch build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/README.md new/urlscan-1.0.2/README.md --- old/urlscan-1.0.1/README.md 2023-07-24 18:04:09.000000000 +0200 +++ new/urlscan-1.0.2/README.md 2024-04-29 19:22:00.000000000 +0200 @@ -1,5 +1,7 @@ # Urlscan +[](https://github.com/firecat53/urlscan/actions/workflows/main.yml) + ## Contributors Scott Hansen \<[email protected]\> (Author and Maintainer) @@ -72,10 +74,10 @@ To install urlscan, install from your distribution repositories, from Pypi, or do a local development install with pip -e: - pipx install urlscan - + pipx install urlscan + OR - + pip install --user urlscan OR @@ -97,6 +99,15 @@ Once this is done, Control-b while reading mail in mutt will automatically invoke urlscan on the message. +> Note for Neomutt users: [As of version +> `2023-05-17`](https://github.com/neomutt/neomutt/releases/tag/20230517) true +> color support was implemented. If you are using true color support with Neomutt, +> or are encountering the error `setupterm: could not find terminfo database`, +> then you should also add `TERM=xterm-256color` to your macro in `.muttrc`. +> See more here [#135](https://github.com/firecat53/urlscan/issues/135). For example: +> `macro index,pager \cb "<pipe-message> TERM=xterm-256color urlscan<Enter>" "call urlscan to +extract URLs out of a message"` + To choose a particular browser, set the environment variable BROWSER. If BROWSER is not set, xdg-open will control which browser is used, if it's available.: @@ -200,6 +211,8 @@ ## Build/development - pyproject.toml is configured for [hatch][2] for building and submitting to pypi. +- flake.nix is available for a development shell or building/testing the package + if desired. `nix develop` [1]: http://urwid.org/manual/displayattributes.html#display-attributes "Urwid display attributes" [2]: https://hatch.pypa.io/latest/ "Hatch" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/flake.lock new/urlscan-1.0.2/flake.lock --- old/urlscan-1.0.1/flake.lock 1970-01-01 01:00:00.000000000 +0100 +++ new/urlscan-1.0.2/flake.lock 2024-04-29 19:22:00.000000000 +0200 @@ -0,0 +1,26 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1714406590, + "narHash": "sha256-cNSlV8Ti5UxF6oaR2PcnLJaZ5mTB531hnS0Yw5EsAbs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "040c045db72424cb12c0440807a9a3b6050bbb99", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/flake.nix new/urlscan-1.0.2/flake.nix --- old/urlscan-1.0.1/flake.nix 1970-01-01 01:00:00.000000000 +0100 +++ new/urlscan-1.0.2/flake.nix 2024-04-29 19:22:00.000000000 +0200 @@ -0,0 +1,69 @@ +{ + description = "View/select the URLs in an email message or file"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs"; + }; + + outputs = { + self, + nixpkgs, + }: let + systems = ["x86_64-linux" "i686-linux" "aarch64-linux"]; + forAllSystems = f: + nixpkgs.lib.genAttrs systems (system: + f rec { + pkgs = nixpkgs.legacyPackages.${system}; + commonPackages = builtins.attrValues { + inherit + (pkgs.python312Packages) + python + urwid + ; + }; + }); + in { + devShells = forAllSystems ({ + pkgs, + commonPackages, + }: { + default = pkgs.mkShell { + packages = commonPackages ++ [pkgs.pandoc]; + shellHook = '' + alias urlscan="python -m urlscan" + export PYTHONPATH="$PYTHONPATH:$PWD" + ''; + }; + }); + packages = forAllSystems ({ + pkgs, + commonPackages, + }: { + default = pkgs.python3Packages.buildPythonApplication { + name = "urlscan"; + pname = "urlscan"; + format = "pyproject"; + src = ./.; + nativeBuildInputs = builtins.attrValues { + inherit + (pkgs) + git + ; + inherit + (pkgs.python312Packages) + hatchling + hatch-vcs + ; + }; + propagatedBuildInputs = commonPackages; + meta = { + description = "View/select the URLs in an email message or file"; + homepage = "https://github.com/firecat53/urlscan";; + license = pkgs.lib.licenses.gpl2Plus; + maintainers = ["firecat53"]; + platforms = systems; + }; + }; + }); + }; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/pyproject.toml new/urlscan-1.0.2/pyproject.toml --- old/urlscan-1.0.1/pyproject.toml 2023-07-24 18:04:09.000000000 +0200 +++ new/urlscan-1.0.2/pyproject.toml 2024-04-29 19:22:00.000000000 +0200 @@ -7,7 +7,7 @@ dynamic = ["version"] description = "View/select the URLs in an email message or file" readme = "README.md" -license = "GPL-2.0" +license = "GPL-2.0-or-later" authors = [ { name = "Scott Hansen", email = "[email protected]" }, ] @@ -30,6 +30,7 @@ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Utilities", ] dependencies = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/urlscan/__main__.py new/urlscan-1.0.2/urlscan/__main__.py --- old/urlscan-1.0.1/urlscan/__main__.py 2023-07-24 18:04:09.000000000 +0200 +++ new/urlscan-1.0.2/urlscan/__main__.py 2024-04-29 19:22:00.000000000 +0200 @@ -56,7 +56,7 @@ arg_parse.add_argument('--regex', '-E', help="Alternate custom regex to be used for all " "kinds of matching. " - "For example: --regex 'https?://.+\.\w+'") + r"For example: --regex 'https?://.+\.\w+'") arg_parse.add_argument('--run', '-r', help="Alternate command to run on selected URL " "instead of opening URL in browser. Use {} to " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/urlscan/urlchoose.py new/urlscan-1.0.2/urlscan/urlchoose.py --- old/urlscan-1.0.1/urlscan/urlchoose.py 2023-07-24 18:04:09.000000000 +0200 +++ new/urlscan-1.0.2/urlscan/urlchoose.py 2024-04-29 19:22:00.000000000 +0200 @@ -699,7 +699,7 @@ for idx, item in enumerate(grp): if isinstance(item, urwid.Columns): for col_idx, col in enumerate(item.contents): - if isinstance(col[0], urwid.decoration.AttrMap): + if isinstance(col[0], urwid.AttrMap): grp[idx][col_idx].set_label(splittext(col[0].base_widget.label, self.search_string, '')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urlscan-1.0.1/urlscan.1 new/urlscan-1.0.2/urlscan.1 --- old/urlscan-1.0.1/urlscan.1 2023-07-24 18:04:09.000000000 +0200 +++ new/urlscan-1.0.2/urlscan.1 2024-04-29 19:22:00.000000000 +0200 @@ -118,7 +118,7 @@ .TP .B \-r, \-\-run \<expression\> Execute \<expression\> in place of opening URL with a browser. Use {} in -\<expression\> to substitute in the URL. Shell features such as \| and \> can be +\<expression\> to substitute in the URL. Shell features such as | and \> can be used, but it is less secure. Examples: $ urlscan --run 'echo {} | xclip -i' file.txt
