November 2023 - openSUSE Commits - openSUSE Mailing Lists

commit python-myst-parser for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-myst-parser for openSUSE:Factory checked in at 2023-11-23 21:38:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-myst-parser (Old) and /work/SRC/openSUSE:Factory/.python-myst-parser.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-myst-parser" Thu Nov 23 21:38:34 2023 rev:4 rq:1128268 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-myst-parser/python-myst-parser.changes 2023-06-12 15:25:02.230549983 +0200 +++ /work/SRC/openSUSE:Factory/.python-myst-parser.new.25432/python-myst-parser.changes 2023-11-23 21:38:36.506983453 +0100 @@ -1,0 +2,81 @@ +Thu Nov 23 07:46:00 UTC 2023 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Update to version 2.0.0: + - This release primarily updates core myst-parser dependencies, with + some minor changes to parsing behaviour: + - UPGRADE: markdown-it-py to v3 (#773) + - This is mainly a non-breaking change, fixing some edge cases in parsing + - See: https://github.com/executablebooks/markdown-it-py/releases/tag/v3.0.0 + - and https://github.com/executablebooks/mdit-py-plugins/releases/tag/v0.4.0 + - UPGRADE: linkify-it-py to v2 (#675) + - Also fixes some edge cases in parsing + - See: https://github.com/tsutsu3/linkify-it-py/blob/main/CHANGELOG.md + - UPGRADE: Add support for docutils v0.20 (#775) + - No significant changes, see https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-20-2023-05-04 + - UPGRADE: Add support for sphinx v7, and remove v5 support (#776) + - No significant changes, see https://www.sphinx-doc.org/en/master/changes.html + - UPGRADE: Remove Python 3.7 support and add testing for Python + 3.11 (#772) + - Improve default slug generation for heading anchors, thanks to + @Cimbali (#777) + - This change makes the slug generation closer to GitHub, in + that, starting/ending whitespace will not be stripped. + - For example, # ` a` b `c ` will now correctly create the slug + -a-b-c- and not a-b-c + - IMPROVE: Substitution extension (#777) + - Allow any value type (including dict, list, datetime) and emit + a myst.substitution warning for errors in resolving the + substitution content. + - Introduce a gate/check GHA job, thanks to @webknjaz (#635) + +- v1.0.0: + - This changes absolutely nothing in the code, or about the + maintenance/release policy of this project. But it does feel + about time :D +- v0.19.2: + - NEW: Add myst_fence_as_directive config by @chrisjsewell in #742 + - Fix the sphinx-design example by @recfab in #738 + - Add html_last_updated_fmt = "" to conf.py by @jeanas in #691 +- v0.19.1: + - FIX NoURI error in doc reference resolution, for texinfo builds by + @chrisjsewell in #734 +- v0.19.0: + - This release brings a number of exciting new features, + improvements + - Rewritten documentation, with a clearer structure, many more + examples, rich hover tips, and a new live preview page (powered + by pyscript) + - The code base API is also now fully documented by + https://sphinx-autodoc2.readthedocs.io/, which even allows for + MyST docstrings! + - Add Sphinx 6 support + - Extended docutils (single-page) support + - Extended Markdown links, including intersphinx support, e.g. + [text](inv:name#target) + - {} New attributes syntax, to extend common Markdown syntaxes, + e.g. ![image](image.png){#id .class width=100px} +- v0.18.1: + - MAINTAIN: Minor fixes by @chrisjsewell in #585 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #586 + - DOCS: redundant trailing ) by @Ab2nour in #588 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #595 + - DOCS: Fix typos in syntax.md by @StefanBrand in #596 + - DOCS: Fix sphinxcontrib.mermaid typo by @bskinn in #599 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #598 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #603 + - DOCS: Fix gallery link by @chrisjsewell in #605 + - FIX: set myst-anchor read/write encoding as utf8 by @chrisjsewell in #610 + - UPGRADE: docutils 0.19 support by @chrisjsewell in #611 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #608 + - Update MySTyc URL by @astrojuanlu in #616 + - NEW: Add attrs_image (experimental) extension by @chrisjsewell in #620 + - RELEASE: 0.18.1 by @chrisjsewell in #621 +- v0.18.0: + - IMPROVE: Do not let sphinx check the config type by @chrisjsewell in #559 + - Restructure code base and documentation by @chrisjsewell in #566 + - FIX: floor table column widths to integers by @Jean-Abou-Samra in #568 + - Drop Sphinx 3, add Sphinx 5 by @chrisjsewell in #579 + - FIX: parse_directive_text when body followed by options by @chrisjsewell in #580 + - RELEASE: 0.18.0 by @chrisjsewell in #581 + +------------------------------------------------------------------- Old: ---- python-myst-parser-0.17.2.tar.gz New: ---- python-myst-parser-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-myst-parser.spec ++++++ --- /var/tmp/diff_new_pack.BLmt8W/_old 2023-11-23 21:38:37.871033702 +0100 +++ /var/tmp/diff_new_pack.BLmt8W/_new 2023-11-23 21:38:37.871033702 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-myst-parser # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-myst-parser -Version: 0.17.2 +Version: 2.0.0 Release: 0 Summary: An extended commonmark compliant parser, with bridges to docutils & sphinx License: MIT @@ -26,13 +26,24 @@ Source: https://github.com/executablebooks/MyST-Parser/archive/refs/tags/v%{version… # PyPI tarball does not contain tests #Source: https://files.pythonhosted.org/packages/source/m/myst-parser/myst-parser-%%… -BuildRequires: %{python_module flit} +BuildRequires: %{python_module flit-core} +BuildRequires: %{python_module Jinja2} +BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module docutils >= 0.16} BuildRequires: %{python_module markdown-it-py} +BuildRequires: %{python_module markdown-it-py} +BuildRequires: %{python_module mdit-py-plugins} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} -BuildRequires: dos2unix +BuildRequires: %{python_module wheel} + BuildRequires: fdupes BuildRequires: python-rpm-macros +# SECTION tests +BuildRequires: %{python_module beautifulsoup4} +BuildRequires: %{python_module pygments} +BuildRequires: %{python_module pytest-regressions} +BuildRequires: %{python_module pytest} # SECTION docs #BuildRequires: python3-Sphinx #BuildRequires: python3-Jinja2 @@ -42,14 +53,12 @@ #BuildRequires: python3-markdown-it-py >= 1 #BuildRequires: python3-mdit-py-plugins < 0.4 # /SECTION -Requires: python-typing-extensions Requires: python-Jinja2 Requires: python-PyYAML Requires: python-Sphinx -Requires: python-Sphinx >= 3.1 -Requires: python-docutils >= 0.15 -Requires: python-markdown-it-py >= 1 -Requires: python-mdit-py-plugins < 0.4 +Requires: python-docutils >= 0.16 +Requires: python-markdown-it-py +Requires: python-mdit-py-plugins Requires(post): update-alternatives Requires(postun):update-alternatives BuildArch: noarch @@ -63,7 +72,6 @@ %prep %setup -q -n MyST-Parser-%{version} rm docs/.gitignore -dos2unix docs/examples/references.bib %build %pyproject_wheel @@ -81,13 +89,25 @@ %python_clone -a %{buildroot}%{_bindir}/myst-docutils-latex %python_clone -a %{buildroot}%{_bindir}/myst-docutils-pseudoxml %python_clone -a %{buildroot}%{_bindir}/myst-docutils-xml +%python_clone -a %{buildroot}%{_bindir}/myst-docutils-demo +%python_clone -a %{buildroot}%{_bindir}/myst-inv %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pyunittest -v +# no python-sphinx-pytest package +ignore="--ignore=tests/test_renderers/test_fixtures_sphinx.py" +ignore+=" --ignore=tests/test_renderers/test_myst_refs.py" +ignore+=" --ignore=tests/test_sphinx/test_sphinx_builds.py" +# no python-pytest-param-files package +ignore+=" --ignore=tests/test_renderers/test_myst_config.py" + +# no python-pytest-param-files package +donttest="test_parsing or test_errors or test_render or test_html_to_nodes or test_html_ast or test_html_round_trip" + +%pytest $ignore -k "not ($donttest)" %post -%{python_install_alternative myst-anchors myst-docutils-html myst-docutils-html5 myst-docutils-latex myst-docutils-pseudoxml myst-docutils-xml} +%{python_install_alternative myst-anchors myst-docutils-html myst-docutils-html5 myst-docutils-latex myst-docutils-pseudoxml myst-docutils-xml myst-docutils-demo myst-inv} %postun %python_uninstall_alternative myst-anchors @@ -103,5 +123,7 @@ %python_alternative %{_bindir}/myst-docutils-latex %python_alternative %{_bindir}/myst-docutils-pseudoxml %python_alternative %{_bindir}/myst-docutils-xml +%python_alternative %{_bindir}/myst-docutils-demo +%python_alternative %{_bindir}/myst-inv %doc docs ++++++ python-myst-parser-0.17.2.tar.gz -> python-myst-parser-2.0.0.tar.gz ++++++ ++++ 34613 lines of diff (skipped)

1 0

commit ghc-fgl for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-fgl for openSUSE:Factory checked in at 2023-11-23 21:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-fgl (Old) and /work/SRC/openSUSE:Factory/.ghc-fgl.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-fgl" Thu Nov 23 21:40:33 2023 rev:9 rq:1128071 version:5.8.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-fgl/ghc-fgl.changes 2023-06-30 19:59:10.957754237 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-fgl.new.25432/ghc-fgl.changes 2023-11-23 21:41:53.498239367 +0100 @@ -1,0 +2,28 @@ +Wed Oct 18 08:42:49 UTC 2023 - Peter Simons <psimons(a)suse.com> + +- Update fgl to version 5.8.2.0. + 5.8.2.0 + ------- + + * Data.Graph.Inductive.Graph now only requires Graph, not DynGraph + (issue #100). + + * Documented that some functions are partial (issue #98). + + * Add `insert` function as synonym for `&` (issue #90). + + 5.8.1.1 + ------- + + * Data.Graph.Inductive.Query.Dominators.{dom,iDom} could fail for some + graphs (issue #109, regression in 5.8.1.0). + + 5.8.1.0 + ------- + + * Data.Graph.Inductive.PatriciaTree.Gr and + Data.Graph.Inductive.Tree.Gr now have Functor instances. + + * 'Gr a' is now an instance of Functor. + +------------------------------------------------------------------- Old: ---- fgl-5.8.0.0.tar.gz fgl.cabal New: ---- fgl-5.8.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-fgl.spec ++++++ --- /var/tmp/diff_new_pack.wiAoZL/_old 2023-11-23 21:41:54.446274286 +0100 +++ /var/tmp/diff_new_pack.wiAoZL/_new 2023-11-23 21:41:54.446274286 +0100 @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.8.0.0 +Version: 5.8.2.0 Release: 0 Summary: Martin Erwig's Functional Graph Library License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-array-prof @@ -81,7 +80,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ fgl-5.8.0.0.tar.gz -> fgl-5.8.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/ChangeLog new/fgl-5.8.2.0/ChangeLog --- old/fgl-5.8.0.0/ChangeLog 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/ChangeLog 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,27 @@ +5.8.2.0 +------- + +* Data.Graph.Inductive.Graph now only requires Graph, not DynGraph + (issue #100). + +* Documented that some functions are partial (issue #98). + +* Add `insert` function as synonym for `&` (issue #90). + +5.8.1.1 +------- + +* Data.Graph.Inductive.Query.Dominators.{dom,iDom} could fail for some + graphs (issue #109, regression in 5.8.1.0). + +5.8.1.0 +------- + +* Data.Graph.Inductive.PatriciaTree.Gr and + Data.Graph.Inductive.Tree.Gr now have Functor instances. + +* 'Gr a' is now an instance of Functor. + 5.8.0.0 ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Graph.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Graph.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Graph.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Graph.hs 2001-09-09 03:46:40.000000000 +0200 @@ -34,6 +34,7 @@ Graph(..), DynGraph(..), -- * Operations + insert, order, size, -- ** Graph Folds and Maps @@ -156,9 +157,10 @@ matchAny :: gr a b -> GDecomp gr a b matchAny g = case labNodes g of [] -> error "Match Exception, Empty Graph" - (v,_):_ -> (c,g') - where - (Just c,g') = match v g + (v,_):_ -> + case match v g of + (Just c,g') -> (c,g') + _ -> error "Match Exception, cannot extract node" -- | The number of 'Node's in a 'Graph'. noNodes :: gr a b -> Int @@ -186,6 +188,10 @@ -- in the graph. (&) :: Context a b -> gr a b -> gr a b +-- | A synonym for '&', to avoid conflicts with the similarly named +-- operator in "Data.Function". +insert :: DynGraph gr => Context a b -> gr a b -> gr a b +insert = (&) -- | The number of nodes in the graph. An alias for 'noNodes'. order :: (Graph gr) => gr a b -> Int @@ -302,7 +308,7 @@ -- -- NOTE: in the case of multiple edges with the same label, this -- will only delete the /first/ such edge. To delete all such --- edges, please use 'delAllLedge'. +-- edges, please use 'delAllLEdge'. delLEdge :: (DynGraph gr, Eq b) => LEdge b -> gr a b -> gr a b delLEdge = delLEdgeBy delete @@ -577,7 +583,7 @@ -- | Pretty-print the graph. Note that this loses a lot of -- information, such as edge inverses, etc. -prettify :: (DynGraph gr, Show a, Show b) => gr a b -> String +prettify :: (Graph gr, Show a, Show b) => gr a b -> String prettify g = foldr (showsContext . context g) id (nodes g) "" where showsContext (_,n,l,s) sg = shows n . (':':) . shows l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Internal/RootPath.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Internal/RootPath.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Internal/RootPath.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Internal/RootPath.hs 2001-09-09 03:46:40.000000000 +0200 @@ -29,7 +29,7 @@ | otherwise = findP v ps getPath :: Node -> RTree -> Path -getPath v = reverse . first (\(w:_)->w==v) +getPath v = reverse . first ((==v) . head) getLPath :: Node -> LRTree a -> LPath a getLPath v = LP . reverse . findP v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Monad.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Monad.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Monad.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Monad.hs 2001-09-09 03:46:40.000000000 +0200 @@ -56,8 +56,10 @@ matchAnyM g = do vs <- labNodesM g case vs of [] -> error "Match Exception, Empty Graph" - (v,_):_ -> do ~(Just c,g') <- matchM v g - return (c,g') + (v,_):_ -> do r <- matchM v g + case r of + (Just c,g') -> return (c,g') + _ -> error "Match Exception, cannot extract node" noNodesM :: m (gr a b) -> m Int noNodesM = labNodesM >>. length diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/NodeMap.hs new/fgl-5.8.2.0/Data/Graph/Inductive/NodeMap.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/NodeMap.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/NodeMap.hs 2001-09-09 03:46:40.000000000 +0200 @@ -112,20 +112,22 @@ let (g', _, _) = insMapNode m a g in g' +-- | Partial function: raises exception if passed nodes that are not in the graph. insMapEdge :: (Ord a, DynGraph g) => NodeMap a -> (a, a, b) -> g a b -> g a b insMapEdge m e g = - let (Just e') = mkEdge m e - in insEdge e' g + case mkEdge m e of Just e' -> insEdge e' g + Nothing -> error "insMapEdge: invalid edge" delMapNode :: (Ord a, DynGraph g) => NodeMap a -> a -> g a b -> g a b delMapNode m a g = let (n, _) = mkNode_ m a in delNode n g +-- | Partial function: raises exception if passed nodes that are not in the graph. delMapEdge :: (Ord a, DynGraph g) => NodeMap a -> (a, a) -> g a b -> g a b delMapEdge m (n1, n2) g = - let Just (n1', n2', _) = mkEdge m (n1, n2, ()) - in delEdge (n1', n2') g + case mkEdge m (n1, n2, ()) of Just (n1', n2', _) -> delEdge (n1', n2') g + Nothing -> error "delMapEdge: invalid edge" insMapNodes :: (Ord a, DynGraph g) => NodeMap a -> [a] -> g a b -> (g a b, NodeMap a, [LNode a]) insMapNodes m as g = @@ -137,27 +139,33 @@ let (g', _, _) = insMapNodes m as g in g' +-- | Partial function: raises exception if passed nodes that are not in the graph. insMapEdges :: (Ord a, DynGraph g) => NodeMap a -> [(a, a, b)] -> g a b -> g a b insMapEdges m es g = - let Just es' = mkEdges m es - in insEdges es' g + case mkEdges m es of Just es' -> insEdges es' g + Nothing -> error "insMapEdges: invalid edge" delMapNodes :: (Ord a, DynGraph g) => NodeMap a -> [a] -> g a b -> g a b delMapNodes m as g = let ns = P.map fst $ mkNodes_ m as in delNodes ns g +-- | Partial function: raises exception if passed nodes that are not in the graph. delMapEdges :: (Ord a, DynGraph g) => NodeMap a -> [(a, a)] -> g a b -> g a b delMapEdges m ns g = - let Just ns' = mkEdges m $ P.map (\(a, b) -> (a, b, ())) ns - ns'' = P.map (\(a, b, _) -> (a, b)) ns' - in delEdges ns'' g + case mkEdges m $ P.map (\(a, b) -> (a, b, ())) ns of + Nothing -> error "delMapEdges: invalid edges" + Just ns' -> + let ns'' = P.map (\(a, b, _) -> (a, b)) ns' + in delEdges ns'' g +-- | Partial function: raises exception if passed a node that is not in the graph. mkMapGraph :: (Ord a, DynGraph g) => [a] -> [(a, a, b)] -> (g a b, NodeMap a) mkMapGraph ns es = let (ns', m') = mkNodes new ns - Just es' = mkEdges m' es - in (mkGraph ns' es', m') + in case mkEdges m' es of + Just es' -> (mkGraph ns' es', m') + Nothing -> error "mkMapGraph: invalid edges" -- | Graph construction monad; handles passing both the 'NodeMap' and the -- 'Graph'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/PatriciaTree.hs new/fgl-5.8.2.0/Data/Graph/Inductive/PatriciaTree.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/PatriciaTree.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/PatriciaTree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -134,6 +134,9 @@ rnf (Gr g) = rnf g #endif +instance Functor (Gr a) where + fmap = fastEMap + #if MIN_VERSION_base (4,8,0) instance Bifunctor Gr where bimap = fastNEMap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BCC.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BCC.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BCC.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BCC.hs 2001-09-09 03:46:40.000000000 +0200 @@ -43,10 +43,11 @@ splitGraphs :: (DynGraph gr) => [gr a b] -> [Node] -> [gr a b] splitGraphs gs [] = gs splitGraphs [] _ = error "splitGraphs: empty graph list" -splitGraphs gs (v:vs) = splitGraphs (gs''++gs''') vs - where gs'' = embedContexts c gs' - gs' = gComponents g' - ((Just c,g'), gs''') = findGraph v gs +splitGraphs gs (v:vs) = case findGraph v gs of + ((Nothing, _), _) -> error "splitGraphs: invalid node" + ((Just c,g'), gs''') -> splitGraphs (gs''++gs''') vs + where gs'' = embedContexts c gs' + gs' = gComponents g' {-| Finds the bi-connected components of an undirected connected graph. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BFS.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BFS.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BFS.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BFS.hs 2001-09-09 03:46:40.000000000 +0200 @@ -107,10 +107,12 @@ bf :: (Graph gr) => Queue Path -> gr a b -> RTree bf q g | queueEmpty q || isEmpty g = [] | otherwise = - case match v g of - (Just c, g') -> p:bf (queuePutList (map (:p) (suc' c)) q') g' - (Nothing, g') -> bf q' g' - where (p@(v:_),q') = queueGet q + case queueGet q of + ([], _) -> [] + (p@(v:_),q') -> + case match v g of + (Just c, g') -> p:bf (queuePutList (map (:p) (suc' c)) q') g' + (Nothing, g') -> bf q' g' esp :: (Graph gr) => Node -> Node -> gr a b -> Path esp s t = getPath t . bft s @@ -128,11 +130,13 @@ lbf :: (Graph gr) => Queue (LPath b) -> gr a b -> LRTree b lbf q g | queueEmpty q || isEmpty g = [] | otherwise = - case match v g of - (Just c, g') -> - LP p:lbf (queuePutList (map (\v' -> LP (v':p)) (lsuc' c)) q') g' - (Nothing, g') -> lbf q' g' - where (LP (p@((v,_):_)),q') = queueGet q + case queueGet q of + (LP [], _) -> [] + (LP (p@((v,_):_)),q') -> + case match v g of + (Just c, g') -> + LP p:lbf (queuePutList (map (\v' -> LP (v':p)) (lsuc' c)) q') g' + (Nothing, g') -> lbf q' g' lesp :: (Graph gr) => Node -> Node -> gr a b -> LPath b lesp s t = getLPath t . lbft s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Dominators.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Dominators.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Dominators.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Dominators.hs 2001-09-09 03:46:40.000000000 +0200 @@ -17,16 +17,17 @@ import Data.Graph.Inductive.Query.DFS import Data.IntMap (IntMap) import qualified Data.IntMap as I +import Data.Maybe (mapMaybe) import Data.Tree (Tree (..)) import qualified Data.Tree as T {-# ANN iDom "HLint: ignore Use ***" #-} --- | return immediate dominators for each node of a graph, given a root +-- | return immediate dominators for each reachable node of a graph, given a root iDom :: (Graph gr) => gr a b -> Node -> [(Node,Node)] iDom g root = let (result, toNode, _) = idomWork g root in map (\(a, b) -> (toNode ! a, toNode ! b)) (assocs result) --- | return the set of dominators of the nodes of a graph, given a root +-- | return the set of dominators of the reachable nodes of a graph, given a root dom :: (Graph gr) => gr a b -> Node -> [(Node,[Node])] dom g root = let (iD, toNode, fromNode) = idomWork g root @@ -50,24 +51,26 @@ type FromNode = IntMap Node' idomWork :: (Graph gr) => gr a b -> Node -> (IDom, ToNode, FromNode) -idomWork g root = let - -- use depth first tree from root do build the first approximation - trees@(~[tree]) = dff [root] g - -- relabel the tree so that paths from the root have increasing nodes - (s, ntree) = numberTree 0 tree - -- the approximation iDom0 just maps each node to its parent - iD0 = array (1, s-1) (tail $ treeEdges (-1) ntree) - -- fromNode translates graph nodes to relabeled (internal) nodes - fromNode = I.unionWith const (I.fromList (zip (T.flatten tree) (T.flatten ntree))) (I.fromList (zip (nodes g) (repeat (-1)))) - -- toNode translates internal nodes to graph nodes - toNode = array (0, s-1) (zip (T.flatten ntree) (T.flatten tree)) - preds = array (1, s-1) [(i, filter (/= -1) (map (fromNode I.!) - (pre g (toNode ! i)))) | i <- [1..s-1]] - -- iteratively improve the approximation to find iDom. - iD = fixEq (refineIDom preds) iD0 - in - if null trees then error "Dominators.idomWork: root not in graph" - else (iD, toNode, fromNode) +idomWork g root = + case dff [root] g of + [] -> error "Dominators.idomWork: root not in graph" + tree : _ -> + let + nds = reachable root g + -- use depth first tree from root do build the first approximation + -- relabel the tree so that paths from the root have increasing nodes + (s, ntree) = numberTree 0 tree + -- the approximation iDom0 just maps each node to its parent + iD0 = array (1, s-1) (tail $ treeEdges (-1) ntree) + -- fromNode translates graph nodes to relabeled (internal) nodes + fromNode = I.unionWith const (I.fromList (zip (T.flatten tree) (T.flatten ntree))) (I.fromList (zip nds (repeat (-1)))) + -- toNode translates internal nodes to graph nodes + toNode = array (0, s-1) (zip (T.flatten ntree) (T.flatten tree)) + preds = array (1, s-1) [(i, filter (/= -1) (mapMaybe (`I.lookup` fromNode) + (pre g (toNode ! i)))) | i <- [1..s-1]] + -- iteratively improve the approximation to find iDom. + iD = fixEq (refineIDom preds) iD0 + in (iD, toNode, fromNode) -- for each node in iDom, find the intersection of all its predecessor's -- dominating sets, and update iDom accordingly. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Indep.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Indep.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Indep.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Indep.hs 2001-09-09 03:46:40.000000000 +0200 @@ -22,12 +22,14 @@ indepSize :: (DynGraph gr) => gr a b -> ([Node], Int) indepSize g | isEmpty g = ([], 0) - | l1 > l2 = il1 - | otherwise = il2 + | otherwise = + case match v g of + (Nothing,_) -> error "indepSize: unexpected invalid node" + (Just c,g') -> + let il1@(_,l1) = indepSize g' + il2@(_,l2) = ((v:) *** (+1)) $ indepSize (delNodes (neighbors' c) g') + in if l1 > l2 then il1 else il2 where vs = nodes g v = snd . maximumBy (compare `on` fst) . map ((,) =<< deg g) $ vs - (Just c,g') = match v g - il1@(_,l1) = indepSize g' - il2@(_,l2) = ((v:) *** (+1)) $ indepSize (delNodes (neighbors' c) g') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MST.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MST.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MST.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MST.hs 2001-09-09 03:46:40.000000000 +0200 @@ -20,10 +20,12 @@ prim :: (Graph gr,Real b) => H.Heap b (LPath b) -> gr a b -> LRTree b prim h g | H.isEmpty h || isEmpty g = [] prim h g = - case match v g of - (Just c,g') -> p:prim (H.mergeAll (h':newEdges p c)) g' - (Nothing,g') -> prim h' g' - where (_,p@(LP ((v,_):_)),h') = H.splitMin h + case H.splitMin h of + (_,p@(LP ((v,_):_)),h') -> + case match v g of + (Just c,g') -> p:prim (H.mergeAll (h':newEdges p c)) g' + (Nothing,g') -> prim h' g' + _ -> [] msTreeAt :: (Graph gr,Real b) => Node -> gr a b -> LRTree b msTreeAt v = prim (H.unit 0 (LP [(v,0)])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow.hs 2001-09-09 03:46:40.000000000 +0200 @@ -64,10 +64,11 @@ -- residual capacity of that edge's label. Then return the updated -- list. updAdjList::(Num b) => Adj (b,b,b) -> Node -> b -> Bool -> Adj (b,b,b) -updAdjList s v cf fwd = rs ++ ((x,y+cf',z-cf'),w) : rs' +updAdjList s v cf fwd = + case break ((v==) . snd) s of + (rs, ((x,y,z),w):rs') -> rs ++ ((x,y+cf',z-cf'),w) : rs' + _ -> error "updAdjList: invalid node" where - (rs, ((x,y,z),w):rs') = break ((v==) . snd) s - cf' = if fwd then cf else negate cf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow2.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow2.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow2.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow2.hs 2001-09-09 03:46:40.000000000 +0200 @@ -77,7 +77,7 @@ -- Compute an augmenting path augPathFused :: Network -> Node -> Node -> Maybe DirPath augPathFused g s t = listToMaybe $ map reverse $ - filter (\((u,_):_) -> u==t) tree + filter ((==t) . fst . head) tree where tree = bftForEK s g -- Breadth First Search wrapper function @@ -87,8 +87,12 @@ -- Breadth First Search, tailored for Edmonds & Karp bfForEK :: Queue DirPath -> Network -> DirRTree bfForEK q g - | queueEmpty q || isEmpty g = [] - | otherwise = case match v g of + | queueEmpty q || isEmpty g = [] + | otherwise = + case queueGet q of + ([], _) -> [] + (p@((v,_):_), q1) -> + case match v g of (Nothing, g') -> bfForEK q1 g' (Just (preAdj, _, _, sucAdj), g') -> p:bfForEK q2 g' where @@ -100,7 +104,6 @@ -- Traverse edges forwards if flow less than capacity suc2 = [ (sucNode,Forward):p | ((c, f), sucNode) <- sucAdj, c>f] - where (p@((v,_):_), q1)=queueGet q -- Extract augmenting path from network; return path as a sequence of -- edges with direction of traversal, and new network with augmenting @@ -110,13 +113,17 @@ extractPathFused g [] = ([], g) extractPathFused g [(_,_)] = ([], g) extractPathFused g ((u,_):rest@((v,Forward):_)) = - ((u, v, l, Forward):tailedges, newerg) - where (tailedges, newerg) = extractPathFused newg rest - Just (l, newg) = extractEdge g u v (uncurry (>)) + case extractEdge g u v (uncurry (>)) of + Just (l, newg) -> + let (tailedges, newerg) = extractPathFused newg rest + in ((u, v, l, Forward):tailedges, newerg) + Nothing -> error "extractPathFused Forward: invalid edge" extractPathFused g ((u,_):rest@((v,Backward):_)) = - ((v, u, l, Backward):tailedges, newerg) - where (tailedges, newerg) = extractPathFused newg rest - Just (l, newg) = extractEdge g v u (\(_,f)->(f>0)) + case extractEdge g v u (\(_,f)->(f>0)) of + Just (l, newg) -> + let (tailedges, newerg) = extractPathFused newg rest + in ((v, u, l, Backward):tailedges, newerg) + Nothing -> error "extractPathFused Backward: invalid edge" ekFusedStep :: EKStepFunc ekFusedStep g s t = case maybePath of @@ -142,7 +149,7 @@ [(v, u, f) | (u,v,(_,f)) <- labEdges g, f>0]) augPath :: Network -> Node -> Node -> Maybe Path -augPath g s t = listToMaybe $ map reverse $ filter (\(u:_) -> u==t) tree +augPath g s t = listToMaybe $ map reverse $ filter ((==t) . head) tree where tree = bft s (residualGraph g) -- Extract augmenting path from network; return path as a sequence of @@ -168,12 +175,12 @@ -- Return the label on the edge and the graph without the edge extractEdge :: Gr a b -> Node -> Node -> (b->Bool) -> Maybe (b, Gr a b) extractEdge g u v p = - case adj of - Just (el, _) -> Just (el, (p', node, l, rest) & newg) - Nothing -> Nothing - where (Just (p', node, l, s), newg) = match u g - (adj, rest)=extractAdj s - (\(l', dest) -> dest==v && p l') + case match u g of + ((Just (p', node, l, s), newg)) -> + let (adj, rest)=extractAdj s (\(l', dest) -> dest==v && p l') + in do (el, _) <- adj + Just (el, (p', node, l, rest) & newg) + _ -> Nothing -- Extract an item from an adjacency list that satisfies a given -- predicate. Return the item and the rest of the adjacency list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Monad.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Monad.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Monad.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Monad.hs 2001-09-09 03:46:40.000000000 +0200 @@ -78,11 +78,11 @@ fmap = liftM instance (Monad m) => Applicative (GT m g) where - pure = return + pure x = MGT (\mg->do {g<-mg; return (x,g)}) (<*>) = ap instance (Monad m) => Monad (GT m g) where - return x = MGT (\mg->do {g<-mg; return (x,g)}) + return = pure f >>= h = MGT (\mg->do {(x,g)<-apply f mg; apply' (h x) g}) condMGT' :: (Monad m) => (s -> Bool) -> GT m s a -> GT m s a -> GT m s a @@ -218,14 +218,15 @@ dffM vs = MGT (\mg-> do g<-mg b<-isEmptyM mg - if b||null vs then return ([],g) else - let (v:vs') = vs in - do (mc,g1) <- matchM v mg + case (b, vs) of + (False, v:vs') -> do + (mc,g1) <- matchM v mg case mc of Nothing -> apply (dffM vs') (return g1) Just c -> do (ts, g2) <- apply (dffM (suc' c)) (return g1) (ts',g3) <- apply (dffM vs') (return g2) return (Node (node' c) ts:ts',g3) + _ -> return ([],g) ) graphDff :: (GraphM m gr) => [Node] -> m (gr a b) -> m [Tree Node] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/SP.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/SP.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/SP.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/SP.hs 2001-09-09 03:46:40.000000000 +0200 @@ -28,10 +28,12 @@ -> LRTree b dijkstra h g | H.isEmpty h || isEmpty g = [] dijkstra h g = - case match v g of - (Just c,g') -> p:dijkstra (H.mergeAll (h':expand d p c)) g' - (Nothing,g') -> dijkstra h' g' - where (_,p@(LP ((v,d):_)),h') = H.splitMin h + case H.splitMin h of + (_,p@(LP ((v,d):_)),h') -> + case match v g of + (Just c,g') -> p:dijkstra (H.mergeAll (h':expand d p c)) g' + (Nothing,g') -> dijkstra h' g' + _ -> [] -- | Tree of shortest paths from a certain node to the rest of the -- (reachable) nodes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/TransClos.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/TransClos.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/TransClos.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/TransClos.hs 2001-09-09 03:46:40.000000000 +0200 @@ -18,8 +18,8 @@ outU gr = map toEdge . out gr {-| -Finds the transitive, reflexive closure of a directed graph. -Given a graph G=(V,E), its transitive closure is the graph: +Finds the reflexive-transitive closure of a directed graph. +Given a graph G=(V,E), its reflexive-transitive closure is the graph: G* = (V,E*) where E*={(i,j): i,j in V and either i = j or there is a path from i to j in G} -} trc :: (DynGraph gr) => gr a b -> gr a () @@ -30,11 +30,12 @@ {-| Finds the reflexive closure of a directed graph. -Given a graph G=(V,E), its transitive closure is the graph: +Given a graph G=(V,E), its reflexive closure is the graph: G* = (V,Er union E) where Er = {(i,i): i in V} -} rc :: (DynGraph gr) => gr a b -> gr a () -rc g = newEdges `insEdges` insNodes ln empty +rc g = (newEdges ++ oldEdges) `insEdges` insNodes ln empty where ln = labNodes g newEdges = [ (u, u, ()) | (u, _) <- ln ] + oldEdges = [ (u, v, ()) | (u, v, _) <- labEdges g ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Tree.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Tree.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Tree.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Tree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -135,6 +135,9 @@ rnf (Gr g) = rnf g #endif +instance Functor (Gr a) where + fmap = emap + #if MIN_VERSION_base (4,8,0) instance Bifunctor Gr where bimap = nemap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/LICENSE new/fgl-5.8.2.0/LICENSE --- old/fgl-5.8.0.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,6 @@ Copyright (c) 1999-2008, Martin Erwig 2010, Ivan Lazar Miljenovic + 2023, Troels Henriksen All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs new/fgl-5.8.2.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs --- old/fgl-5.8.0.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs 2001-09-09 03:46:40.000000000 +0200 @@ -321,23 +321,24 @@ toConnGraph :: forall ag a b. (ArbGraph ag, Arbitrary a, Arbitrary b) => ag a b -> Gen (Connected ag a b) -toConnGraph ag = do a <- arbitrary - ces <- concat <$> mapM mkE ws - return $ CG { connNode = v - , connArbGraph = fromBaseGraph - . insEdges ces - . insNode (v,a) - $ g - } +toConnGraph ag = case newNodes 1 g of + [] -> error "toConnGraph: cannot make node" + v:_ -> do + a <- arbitrary + ces <- concat <$> mapM (mkE v) ws + return $ CG { connNode = v + , connArbGraph = fromBaseGraph + . insEdges ces + . insNode (v,a) + $ g + } where g = toBaseGraph ag - [v] = newNodes 1 g - ws = nodes g - mkE w = do b <- arbitrary - return (edgeF p [(v,w,b)]) + mkE v w = do b <- arbitrary + return (edgeF p [(v,w,b)]) p :: GrProxy ag p = GrProxy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/fgl.cabal new/fgl-5.8.2.0/fgl.cabal --- old/fgl-5.8.0.0/fgl.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/fgl.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,9 +1,9 @@ name: fgl -version: 5.8.0.0 +version: 5.8.2.0 license: BSD3 license-file: LICENSE author: Martin Erwig, Ivan Lazar Miljenovic -maintainer: Ivan.Miljenovic(a)gmail.com +maintainer: athas(a)sigkill.dk category: Data Structures, Graphs synopsis: Martin Erwig's Functional Graph Library @@ -20,7 +20,7 @@ tested-with: GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.2, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, - GHC == 9.2.3, GHC == 9.4.2 + GHC == 9.2.4, GHC == 9.4.4, GHC == 9.6.3, GHC == 9.8.1 source-repository head type: git @@ -73,7 +73,7 @@ if flag(containers042) build-depends: containers >= 0.4.2 - , deepseq >= 1.1.0.0 && < 1.5 + , deepseq >= 1.1.0.0 && < 1.6 else build-depends: containers < 0.4.2 @@ -93,7 +93,7 @@ build-depends: fgl , base , QuickCheck >= 2.8 && < 2.15 - , hspec >= 2.1 && < 2.11 + , hspec >= 2.1 && < 2.12 , containers hs-source-dirs: test @@ -107,6 +107,8 @@ , Data.Graph.Inductive.Query.Properties ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wall -Wno-star-is-type } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/test/Data/Graph/Inductive/Graph/Properties.hs new/fgl-5.8.2.0/test/Data/Graph/Inductive/Graph/Properties.hs --- old/fgl-5.8.0.0/test/Data/Graph/Inductive/Graph/Properties.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/test/Data/Graph/Inductive/Graph/Properties.hs 2001-09-09 03:46:40.000000000 +0200 @@ -194,18 +194,17 @@ -- current behaviour is to throw an error if an existing node is -- used. valid_insNode :: (DynGraph gr, Ord a, Ord b) => gr a b -> a -> Bool -valid_insNode g l = gelem v g' - && sort (labNodes g') == sort (vl : labNodes g) - && sort (labEdges g') == sort (labEdges g) - -- Note: not testing whether this changes - -- nodeRange because newNodes /might/ return - -- unused nodes in the middle. - where - [v] = newNodes 1 g - - vl = (v,l) - - g' = insNode vl g +valid_insNode g l = + case newNodes 1 g of + [v] -> let vl = (v,l) + g' = insNode vl g + in gelem v g' + && sort (labNodes g') == sort (vl : labNodes g) + && sort (labEdges g') == sort (labEdges g) + -- Note: not testing whether this changes + -- nodeRange because newNodes /might/ return + -- unused nodes in the middle. + _ -> False -- | Insert a node for every label in the list, but don't add any new -- edges. @@ -329,12 +328,13 @@ -- adding the specified number to the graph and then deleting them. valid_delAllLEdge :: (DynGraph gr, Eq a, Eq b) => gr a b -> NonNegative Int -> a -> a -> b -> Bool -valid_delAllLEdge g (NonNegative c) a1 a2 b = equal g' (delAllLEdge le g'') - where - [v,w] = newNodes 2 g - g' = insNodes [(v,a1),(w,a2)] g - le = (v,w,b) - g'' = insEdges (replicate c le) g' +valid_delAllLEdge g (NonNegative c) a1 a2 b = + case newNodes 2 g of + [v,w] -> let g' = insNodes [(v,a1),(w,a2)] g + le = (v,w,b) + g'' = insEdges (replicate c le) g' + in equal g' (delAllLEdge le g'') + _ -> False -- | There is a version of 'mkGraph' in its documentation that uses -- 'DynGraph' (hence why it isn't used by default). This ensures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/test/Data/Graph/Inductive/Query/Properties.hs new/fgl-5.8.2.0/test/Data/Graph/Inductive/Query/Properties.hs --- old/fgl-5.8.0.0/test/Data/Graph/Inductive/Query/Properties.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/test/Data/Graph/Inductive/Query/Properties.hs 2001-09-09 03:46:40.000000000 +0200 @@ -133,14 +133,25 @@ -- Dominators test_dom :: Spec -test_dom = it "dom" $ - sortIt (dom domGraph 1) `shouldMatchList` [ (1, [1]) - , (2, [1,2]) - , (3, [1,2,3]) - , (4, [1,2,4]) - , (5, [1,2,5]) - , (6, [1,2,6]) - ] +test_dom = describe "dom" $ do + it "regular dom" $ + sortIt (dom domGraph 1) `shouldMatchList` [ (1, [1]) + , (2, [1,2]) + , (3, [1,2,3]) + , (4, [1,2,4]) + , (5, [1,2,5]) + , (6, [1,2,6]) + ] + it "multiple components dom" $ + sortIt (dom domGraph1 1) `shouldMatchList` [ (1, [1]) + , (2, [1, 2]) + ] + it "directed reachable components dom" $ + sortIt (dom domGraph2 1) `shouldMatchList` [ (1, [1]) ] + + it "unreachable nodes dom" $ + sortIt (dom domGraph3 1) `shouldMatchList` [(1,[1]), (2,[1,2])] + where sortIt = map (second sort) @@ -160,6 +171,23 @@ , (5,2) ] +-- This graph has two components (independent subgraphs) +domGraph1 :: Gr () () +domGraph1 = mkUGraph [1..3] + [ (1,2) + ] + +-- This graph has no reachables from 1 (but 1 is reachable) +domGraph2 :: Gr () () +domGraph2 = mkUGraph [1..3] + [ (2,1) + , (2,2) + ] + +-- From #109: 1 -> 2 <- 3 +domGraph3 :: Gr () () +domGraph3 = mkUGraph [1..3] [(1,2), (3,2)] + -- ----------------------------------------------------------------------------- -- GVD @@ -333,26 +361,29 @@ test_sp_Just :: (ArbGraph gr, Graph gr, Real b) => Proxy (gr a b) -> gr a b -> Property test_sp_Just _ g = - (noNodes g >= 2 && v `elem` bfs u g) ==> - isJust (spLength u v g) && - isJust maybePath && - not (null path) && - head path == u && - last path == v - where - [u,v] = take 2 (nodes g) - maybePath@(Just path) = sp u v g + case nodes g of + u:v:_ -> + v `elem` bfs u g ==> + isJust (spLength u v g) && + case sp u v g of + Nothing -> False + Just path -> + not (null path) && + head path == u && + last path == v + _ -> property True -- | Test that 'spLength' and 'sp' return 'Nothing' when destination -- is not reachable from source. test_sp_Nothing :: (ArbGraph gr, Graph gr, Real b) => Proxy (gr a b) -> gr a b -> Property test_sp_Nothing _ g = - (noNodes g >= 2 && not (v `elem` bfs u g)) ==> - isNothing (spLength u v g) && - isNothing (sp u v g) - where - [u,v] = take 2 (nodes g) + case nodes g of + u:v:_ -> + not (v `elem` bfs u g) ==> + isNothing (spLength u v g) && + isNothing (sp u v g) + _ -> property True -- ----------------------------------------------------------------------------- -- TransClos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/test/TestSuite.hs new/fgl-5.8.2.0/test/TestSuite.hs --- old/fgl-5.8.0.0/test/TestSuite.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/test/TestSuite.hs 2001-09-09 03:46:40.000000000 +0200 @@ -79,7 +79,7 @@ propType "subgraph" valid_subgraph where - proxyProp str = prop str . ($p) + proxyProp str = prop str . ($ p) propType :: (Testable pr) => String -> (GraphType gr -> pr) -> Spec propType = prop @@ -126,7 +126,7 @@ propP "tc" test_tc propP "rc" test_rc where - propP str = prop str . ($p) + propP str = prop str . ($ p) p :: PatriciaTreeP p = Proxy

1 0

commit libfmos for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libfmos for openSUSE:Factory checked in at 2023-11-23 21:40:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfmos (Old) and /work/SRC/openSUSE:Factory/.libfmos.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libfmos" Thu Nov 23 21:40:57 2023 rev:6 rq:1128158 version:20231122 Changes: -------- --- /work/SRC/openSUSE:Factory/libfmos/libfmos.changes 2023-11-21 21:34:18.776425563 +0100 +++ /work/SRC/openSUSE:Factory/.libfmos.new.25432/libfmos.changes 2023-11-23 21:42:24.675387692 +0100 @@ -1,0 +2,6 @@ +Wed Nov 22 13:30:23 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 20231122 + * Build system updates only + +------------------------------------------------------------------- Old: ---- libfmos-experimental-20231121.tar.gz libfmos-experimental-20231121.tar.gz.asc New: ---- libfmos-experimental-20231122.tar.gz libfmos-experimental-20231122.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfmos.spec ++++++ --- /var/tmp/diff_new_pack.QOyML1/_old 2023-11-23 21:42:25.159405520 +0100 +++ /var/tmp/diff_new_pack.QOyML1/_new 2023-11-23 21:42:25.159405520 +0100 @@ -18,7 +18,7 @@ Name: libfmos %define lname libfmos1 -Version: 20231121 +Version: 20231122 Release: 0 Summary: Library for MacOS data types License: LGPL-3.0-or-later ++++++ libfmos-experimental-20231121.tar.gz -> libfmos-experimental-20231122.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/Makefile.am new/libfmos-20231122/Makefile.am --- old/libfmos-20231121/Makefile.am 2023-11-21 05:43:02.000000000 +0100 +++ new/libfmos-20231122/Makefile.am 2023-11-22 05:49:56.000000000 +0100 @@ -23,6 +23,7 @@ dpkg/rules \ dpkg/libfmos.install \ dpkg/libfmos-dev.install \ + dpkg/libfmos-python3.install \ dpkg/source/format GETTEXT_FILES = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/Makefile.in new/libfmos-20231122/Makefile.in --- old/libfmos-20231121/Makefile.in 2023-11-21 05:49:25.000000000 +0100 +++ new/libfmos-20231122/Makefile.in 2023-11-22 05:53:17.000000000 +0100 @@ -483,6 +483,7 @@ dpkg/rules \ dpkg/libfmos.install \ dpkg/libfmos-dev.install \ + dpkg/libfmos-python3.install \ dpkg/source/format GETTEXT_FILES = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/common/config.h new/libfmos-20231122/common/config.h --- old/libfmos-20231121/common/config.h 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/common/config.h 2023-11-22 05:53:27.000000000 +0100 @@ -323,7 +323,7 @@ #define PACKAGE_NAME "libfmos" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libfmos 20231121" +#define PACKAGE_STRING "libfmos 20231122" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libfmos" @@ -332,7 +332,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20231121" +#define PACKAGE_VERSION "20231122" /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -358,7 +358,7 @@ /* #undef STRERROR_R_CHAR_P */ /* Version number of package */ -#define VERSION "20231121" +#define VERSION "20231122" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/configure new/libfmos-20231122/configure --- old/libfmos-20231121/configure 2023-11-21 05:49:24.000000000 +0100 +++ new/libfmos-20231122/configure 2023-11-22 05:53:16.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libfmos 20231121. +# Generated by GNU Autoconf 2.71 for libfmos 20231122. # # Report bugs to <joachim.metz(a)gmail.com>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='libfmos' PACKAGE_TARNAME='libfmos' -PACKAGE_VERSION='20231121' -PACKAGE_STRING='libfmos 20231121' +PACKAGE_VERSION='20231122' +PACKAGE_STRING='libfmos 20231122' PACKAGE_BUGREPORT='joachim.metz(a)gmail.com' PACKAGE_URL='' @@ -1486,7 +1486,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libfmos 20231121 to adapt to many kinds of systems. +\`configure' configures libfmos 20231122 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1557,7 +1557,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libfmos 20231121:";; + short | recursive ) echo "Configuration of libfmos 20231122:";; esac cat <<\_ACEOF @@ -1721,7 +1721,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libfmos configure 20231121 +libfmos configure 20231122 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2442,7 +2442,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libfmos $as_me 20231121, which was +It was created by libfmos $as_me 20231122, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3931,7 +3931,7 @@ # Define the identity of the package. PACKAGE='libfmos' - VERSION='20231121' + VERSION='20231122' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -28600,7 +28600,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libfmos $as_me 20231121, which was +This file was extended by libfmos $as_me 20231122, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28668,7 +28668,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libfmos config.status 20231121 +libfmos config.status 20231122 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/configure.ac new/libfmos-20231122/configure.ac --- old/libfmos-20231121/configure.ac 2023-11-21 05:41:53.000000000 +0100 +++ new/libfmos-20231122/configure.ac 2023-11-22 05:35:57.000000000 +0100 @@ -2,7 +2,7 @@ AC_INIT( [libfmos], - [20231121], + [20231122], [joachim.metz(a)gmail.com]) AC_CONFIG_SRCDIR( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/dpkg/changelog new/libfmos-20231122/dpkg/changelog --- old/libfmos-20231121/dpkg/changelog 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/dpkg/changelog 2023-11-22 05:53:27.000000000 +0100 @@ -1,5 +1,5 @@ -libfmos (20231121-1) unstable; urgency=low +libfmos (20231122-1) unstable; urgency=low * Auto-generated - -- Joachim Metz <joachim.metz(a)gmail.com> Tue, 21 Nov 2023 05:49:35 +0100 + -- Joachim Metz <joachim.metz(a)gmail.com> Wed, 22 Nov 2023 05:53:26 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/dpkg/libfmos-python3.install new/libfmos-20231122/dpkg/libfmos-python3.install --- old/libfmos-20231121/dpkg/libfmos-python3.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libfmos-20231122/dpkg/libfmos-python3.install 2023-11-22 05:35:57.000000000 +0100 @@ -0,0 +1 @@ +/usr/lib/python3* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/include/libfmos/definitions.h new/libfmos-20231122/include/libfmos/definitions.h --- old/libfmos-20231121/include/libfmos/definitions.h 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/include/libfmos/definitions.h 2023-11-22 05:53:27.000000000 +0100 @@ -24,11 +24,11 @@ #include <libfmos/types.h> -#define LIBFMOS_VERSION 20231121 +#define LIBFMOS_VERSION 20231122 /* The version string */ -#define LIBFMOS_VERSION_STRING "20231121" +#define LIBFMOS_VERSION_STRING "20231122" #endif /* !defined( _LIBFMOS_DEFINITIONS_H ) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/libfmos/libfmos.rc new/libfmos-20231122/libfmos/libfmos.rc --- old/libfmos-20231121/libfmos/libfmos.rc 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/libfmos/libfmos.rc 2023-11-22 05:53:27.000000000 +0100 @@ -22,12 +22,12 @@ BLOCK "040904E4" BEGIN VALUE "FileDescription", "Library to support common Mac OS specific formats\0" - VALUE "FileVersion", "20231121" "\0" + VALUE "FileVersion", "20231122" "\0" VALUE "InternalName", "libfmos.dll\0" VALUE "LegalCopyright", "(C) 2019-2023, Joachim Metz <joachim.metz(a)gmail.com>\0" VALUE "OriginalFilename", "libfmos.dll\0" VALUE "ProductName", "libfmos\0" - VALUE "ProductVersion", "20231121" "\0" + VALUE "ProductVersion", "20231122" "\0" VALUE "Comments", "For more information visit https://github.com/libyal/libfmos/\0" END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/libfmos/libfmos_definitions.h new/libfmos-20231122/libfmos/libfmos_definitions.h --- old/libfmos-20231121/libfmos/libfmos_definitions.h 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/libfmos/libfmos_definitions.h 2023-11-22 05:53:27.000000000 +0100 @@ -36,11 +36,11 @@ #else #include <byte_stream.h> -#define LIBFMOS_VERSION 20231121 +#define LIBFMOS_VERSION 20231122 /* The version string */ -#define LIBFMOS_VERSION_STRING "20231121" +#define LIBFMOS_VERSION_STRING "20231122" #endif /* !defined( HAVE_LOCAL_LIBFMOS ) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/libfmos.spec new/libfmos-20231122/libfmos.spec --- old/libfmos-20231121/libfmos.spec 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/libfmos.spec 2023-11-22 05:53:27.000000000 +0100 @@ -1,5 +1,5 @@ Name: libfmos -Version: 20231121 +Version: 20231122 Release: 1 Summary: Library to support common Mac OS specific formats Group: System Environment/Libraries @@ -80,6 +80,6 @@ %{_libdir}/python3*/site-packages/*.so %changelog -* Tue Nov 21 2023 Joachim Metz <joachim.metz(a)gmail.com> 20231121-1 +* Wed Nov 22 2023 Joachim Metz <joachim.metz(a)gmail.com> 20231122-1 - Auto-generated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfmos-20231121/setup.cfg new/libfmos-20231122/setup.cfg --- old/libfmos-20231121/setup.cfg 2023-11-21 05:49:36.000000000 +0100 +++ new/libfmos-20231122/setup.cfg 2023-11-22 05:53:27.000000000 +0100 @@ -1,6 +1,6 @@ [metadata] name = libfmos-python -version = 20231121 +version = 20231122 description = Python bindings module for libfmos long_description = Python bindings module for libfmos long_description_content_type = text/plain

1 0

commit ghc-text-builder for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-text-builder for openSUSE:Factory checked in at 2023-11-23 21:40:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-text-builder (Old) and /work/SRC/openSUSE:Factory/.ghc-text-builder.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-text-builder" Thu Nov 23 21:40:11 2023 rev:3 rq:1127112 version:0.6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-text-builder/ghc-text-builder.changes 2023-10-18 21:26:24.770228670 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-text-builder.new.25432/ghc-text-builder.changes 2023-11-23 21:41:30.845405012 +0100 @@ -1,0 +2,6 @@ +Sat Nov 4 14:55:10 UTC 2023 - Peter Simons <psimons(a)suse.com> + +- Update text-builder to version 0.6.7.2. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- text-builder-0.6.7.1.tar.gz New: ---- text-builder-0.6.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-text-builder.spec ++++++ --- /var/tmp/diff_new_pack.uybvXo/_old 2023-11-23 21:41:31.269420630 +0100 +++ /var/tmp/diff_new_pack.uybvXo/_new 2023-11-23 21:41:31.273420777 +0100 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.7.1 +Version: 0.6.7.2 Release: 0 Summary: Efficient strict text builder License: MIT ++++++ text-builder-0.6.7.1.tar.gz -> text-builder-0.6.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/text-builder-0.6.7.1/text-builder.cabal new/text-builder-0.6.7.2/text-builder.cabal --- old/text-builder-0.6.7.1/text-builder.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/text-builder-0.6.7.2/text-builder.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 3.0 name: text-builder -version: 0.6.7.1 +version: 0.6.7.2 category: Text, Builders synopsis: Efficient strict text builder description: Text formatting library and efficient builder library. @@ -62,7 +62,7 @@ other-modules: Text.Builder.Prelude build-depends: , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.13 , text >=1.2 && <3 , text-builder-dev >=0.3.4.1 && <0.4

1 0

commit picplanner for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package picplanner for openSUSE:Factory checked in at 2023-11-23 21:42:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picplanner (Old) and /work/SRC/openSUSE:Factory/.picplanner.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "picplanner" Thu Nov 23 21:42:32 2023 rev:4 rq:1128347 version:0.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/picplanner/picplanner.changes 2023-04-28 16:25:41.570824306 +0200 +++ /work/SRC/openSUSE:Factory/.picplanner.new.25432/picplanner.changes 2023-11-23 21:43:59.178868469 +0100 @@ -1,0 +2,12 @@ +Thu Nov 23 13:56:15 UTC 2023 - Paolo Stivanin <info(a)paolostivanin.com> + +- Update to 0.5.0: + * Reduced input lag on touch screens significantly + * Complet UI redesign for a more compact view + * Add French translation + * Switch to the GNOME 45 runtime + * Rotate the information on the map if the map is rotated + * Fix a double scrolling bug which caused the map to be unresponsive + * App is now recognized as mobile friendly + +------------------------------------------------------------------- Old: ---- picplanner-v0.4.0.tar.gz New: ---- picplanner-v0.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picplanner.spec ++++++ --- /var/tmp/diff_new_pack.zvp53Z/_old 2023-11-23 21:43:59.610884381 +0100 +++ /var/tmp/diff_new_pack.zvp53Z/_new 2023-11-23 21:43:59.614884529 +0100 @@ -17,7 +17,7 @@ Name: picplanner -Version: 0.4.0 +Version: 0.5.0 Release: 0 Summary: A GTK application for photographers using GNU Linux or especially Linux phones License: GPL-3.0-or-later @@ -66,7 +66,6 @@ %{_datadir}/icons/elevation-symbolic.svg %{_datadir}/icons/hicolor/scalable/apps/de.zwarf.picplanner.svg %{_datadir}/icons/hicolor/symbolic/apps/de.zwarf.picplanner-symbolic.svg -%{_datadir}/icons/map-symbolic.svg %{_datadir}/icons/milky-way-color.svg %{_datadir}/icons/milky-way-symbolic.svg %{_datadir}/icons/moon-full.svg ++++++ picplanner-v0.4.0.tar.gz -> picplanner-v0.5.0.tar.gz ++++++ ++++ 4351 lines of diff (skipped)

1 0

commit python-myst-parser for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-myst-parser for openSUSE:Factory checked in at 2023-11-23 21:38:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-myst-parser (Old) and /work/SRC/openSUSE:Factory/.python-myst-parser.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-myst-parser" Thu Nov 23 21:38:34 2023 rev:4 rq:1128268 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-myst-parser/python-myst-parser.changes 2023-06-12 15:25:02.230549983 +0200 +++ /work/SRC/openSUSE:Factory/.python-myst-parser.new.25432/python-myst-parser.changes 2023-11-23 21:38:36.506983453 +0100 @@ -1,0 +2,81 @@ +Thu Nov 23 07:46:00 UTC 2023 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Update to version 2.0.0: + - This release primarily updates core myst-parser dependencies, with + some minor changes to parsing behaviour: + - UPGRADE: markdown-it-py to v3 (#773) + - This is mainly a non-breaking change, fixing some edge cases in parsing + - See: https://github.com/executablebooks/markdown-it-py/releases/tag/v3.0.0 + - and https://github.com/executablebooks/mdit-py-plugins/releases/tag/v0.4.0 + - UPGRADE: linkify-it-py to v2 (#675) + - Also fixes some edge cases in parsing + - See: https://github.com/tsutsu3/linkify-it-py/blob/main/CHANGELOG.md + - UPGRADE: Add support for docutils v0.20 (#775) + - No significant changes, see https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-20-2023-05-04 + - UPGRADE: Add support for sphinx v7, and remove v5 support (#776) + - No significant changes, see https://www.sphinx-doc.org/en/master/changes.html + - UPGRADE: Remove Python 3.7 support and add testing for Python + 3.11 (#772) + - Improve default slug generation for heading anchors, thanks to + @Cimbali (#777) + - This change makes the slug generation closer to GitHub, in + that, starting/ending whitespace will not be stripped. + - For example, # ` a` b `c ` will now correctly create the slug + -a-b-c- and not a-b-c + - IMPROVE: Substitution extension (#777) + - Allow any value type (including dict, list, datetime) and emit + a myst.substitution warning for errors in resolving the + substitution content. + - Introduce a gate/check GHA job, thanks to @webknjaz (#635) + +- v1.0.0: + - This changes absolutely nothing in the code, or about the + maintenance/release policy of this project. But it does feel + about time :D +- v0.19.2: + - NEW: Add myst_fence_as_directive config by @chrisjsewell in #742 + - Fix the sphinx-design example by @recfab in #738 + - Add html_last_updated_fmt = "" to conf.py by @jeanas in #691 +- v0.19.1: + - FIX NoURI error in doc reference resolution, for texinfo builds by + @chrisjsewell in #734 +- v0.19.0: + - This release brings a number of exciting new features, + improvements + - Rewritten documentation, with a clearer structure, many more + examples, rich hover tips, and a new live preview page (powered + by pyscript) + - The code base API is also now fully documented by + https://sphinx-autodoc2.readthedocs.io/, which even allows for + MyST docstrings! + - Add Sphinx 6 support + - Extended docutils (single-page) support + - Extended Markdown links, including intersphinx support, e.g. + [text](inv:name#target) + - {} New attributes syntax, to extend common Markdown syntaxes, + e.g. ![image](image.png){#id .class width=100px} +- v0.18.1: + - MAINTAIN: Minor fixes by @chrisjsewell in #585 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #586 + - DOCS: redundant trailing ) by @Ab2nour in #588 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #595 + - DOCS: Fix typos in syntax.md by @StefanBrand in #596 + - DOCS: Fix sphinxcontrib.mermaid typo by @bskinn in #599 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #598 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #603 + - DOCS: Fix gallery link by @chrisjsewell in #605 + - FIX: set myst-anchor read/write encoding as utf8 by @chrisjsewell in #610 + - UPGRADE: docutils 0.19 support by @chrisjsewell in #611 + - [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in #608 + - Update MySTyc URL by @astrojuanlu in #616 + - NEW: Add attrs_image (experimental) extension by @chrisjsewell in #620 + - RELEASE: 0.18.1 by @chrisjsewell in #621 +- v0.18.0: + - IMPROVE: Do not let sphinx check the config type by @chrisjsewell in #559 + - Restructure code base and documentation by @chrisjsewell in #566 + - FIX: floor table column widths to integers by @Jean-Abou-Samra in #568 + - Drop Sphinx 3, add Sphinx 5 by @chrisjsewell in #579 + - FIX: parse_directive_text when body followed by options by @chrisjsewell in #580 + - RELEASE: 0.18.0 by @chrisjsewell in #581 + +------------------------------------------------------------------- Old: ---- python-myst-parser-0.17.2.tar.gz New: ---- python-myst-parser-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-myst-parser.spec ++++++ --- /var/tmp/diff_new_pack.BLmt8W/_old 2023-11-23 21:38:37.871033702 +0100 +++ /var/tmp/diff_new_pack.BLmt8W/_new 2023-11-23 21:38:37.871033702 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-myst-parser # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-myst-parser -Version: 0.17.2 +Version: 2.0.0 Release: 0 Summary: An extended commonmark compliant parser, with bridges to docutils & sphinx License: MIT @@ -26,13 +26,24 @@ Source: https://github.com/executablebooks/MyST-Parser/archive/refs/tags/v%{version… # PyPI tarball does not contain tests #Source: https://files.pythonhosted.org/packages/source/m/myst-parser/myst-parser-%%… -BuildRequires: %{python_module flit} +BuildRequires: %{python_module flit-core} +BuildRequires: %{python_module Jinja2} +BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module docutils >= 0.16} BuildRequires: %{python_module markdown-it-py} +BuildRequires: %{python_module markdown-it-py} +BuildRequires: %{python_module mdit-py-plugins} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} -BuildRequires: dos2unix +BuildRequires: %{python_module wheel} + BuildRequires: fdupes BuildRequires: python-rpm-macros +# SECTION tests +BuildRequires: %{python_module beautifulsoup4} +BuildRequires: %{python_module pygments} +BuildRequires: %{python_module pytest-regressions} +BuildRequires: %{python_module pytest} # SECTION docs #BuildRequires: python3-Sphinx #BuildRequires: python3-Jinja2 @@ -42,14 +53,12 @@ #BuildRequires: python3-markdown-it-py >= 1 #BuildRequires: python3-mdit-py-plugins < 0.4 # /SECTION -Requires: python-typing-extensions Requires: python-Jinja2 Requires: python-PyYAML Requires: python-Sphinx -Requires: python-Sphinx >= 3.1 -Requires: python-docutils >= 0.15 -Requires: python-markdown-it-py >= 1 -Requires: python-mdit-py-plugins < 0.4 +Requires: python-docutils >= 0.16 +Requires: python-markdown-it-py +Requires: python-mdit-py-plugins Requires(post): update-alternatives Requires(postun):update-alternatives BuildArch: noarch @@ -63,7 +72,6 @@ %prep %setup -q -n MyST-Parser-%{version} rm docs/.gitignore -dos2unix docs/examples/references.bib %build %pyproject_wheel @@ -81,13 +89,25 @@ %python_clone -a %{buildroot}%{_bindir}/myst-docutils-latex %python_clone -a %{buildroot}%{_bindir}/myst-docutils-pseudoxml %python_clone -a %{buildroot}%{_bindir}/myst-docutils-xml +%python_clone -a %{buildroot}%{_bindir}/myst-docutils-demo +%python_clone -a %{buildroot}%{_bindir}/myst-inv %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pyunittest -v +# no python-sphinx-pytest package +ignore="--ignore=tests/test_renderers/test_fixtures_sphinx.py" +ignore+=" --ignore=tests/test_renderers/test_myst_refs.py" +ignore+=" --ignore=tests/test_sphinx/test_sphinx_builds.py" +# no python-pytest-param-files package +ignore+=" --ignore=tests/test_renderers/test_myst_config.py" + +# no python-pytest-param-files package +donttest="test_parsing or test_errors or test_render or test_html_to_nodes or test_html_ast or test_html_round_trip" + +%pytest $ignore -k "not ($donttest)" %post -%{python_install_alternative myst-anchors myst-docutils-html myst-docutils-html5 myst-docutils-latex myst-docutils-pseudoxml myst-docutils-xml} +%{python_install_alternative myst-anchors myst-docutils-html myst-docutils-html5 myst-docutils-latex myst-docutils-pseudoxml myst-docutils-xml myst-docutils-demo myst-inv} %postun %python_uninstall_alternative myst-anchors @@ -103,5 +123,7 @@ %python_alternative %{_bindir}/myst-docutils-latex %python_alternative %{_bindir}/myst-docutils-pseudoxml %python_alternative %{_bindir}/myst-docutils-xml +%python_alternative %{_bindir}/myst-docutils-demo +%python_alternative %{_bindir}/myst-inv %doc docs ++++++ python-myst-parser-0.17.2.tar.gz -> python-myst-parser-2.0.0.tar.gz ++++++ ++++ 34613 lines of diff (skipped)

1 0

commit kbibtex for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kbibtex for openSUSE:Factory checked in at 2023-11-23 21:42:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbibtex (Old) and /work/SRC/openSUSE:Factory/.kbibtex.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbibtex" Thu Nov 23 21:42:09 2023 rev:13 rq:1128315 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbibtex/kbibtex.changes 2023-11-16 20:28:25.928082947 +0100 +++ /work/SRC/openSUSE:Factory/.kbibtex.new.25432/kbibtex.changes 2023-11-23 21:43:35.481995660 +0100 @@ -1,0 +2,5 @@ +Wed Nov 22 20:01:21 UTC 2023 - Cor Blom <cornelis(a)solcon.nl> + +- Fix RPATH problem with cmake options instead of chrpath + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbibtex.spec ++++++ --- /var/tmp/diff_new_pack.TuGq46/_old 2023-11-23 21:43:35.986014224 +0100 +++ /var/tmp/diff_new_pack.TuGq46/_new 2023-11-23 21:43:35.990014371 +0100 @@ -25,7 +25,6 @@ Group: Productivity/Publishing/TeX/Utilities URL: https://apps.kde.org/nl/kbibtex/ Source: https://download.kde.org/stable/KBibTeX/%{version}/%{name}-%{version}.tar.xz -BuildRequires: chrpath BuildRequires: extra-cmake-modules BuildRequires: libicu-devel BuildRequires: libpoppler-qt5-devel @@ -73,7 +72,7 @@ %autosetup -n %{name}-%{version} %build -%cmake_kf5 -d build +%cmake_kf5 -d build -- -DCMAKE_SKIP_RPATH=FALSE -DCMAKE_SKIP_INSTALL_RPATH=TRUE %cmake_build %install @@ -85,14 +84,6 @@ rm -rf %{buildroot}/%{_kf5_libdir}/libkbibtex*.so rm -rf %{buildroot}/%{_kf5_libdir}/cmake/KBibTeX -# Remove the rpaths that rpmlint complains about -# According to https://en.opensuse.org/openSUSE:Packaging_checks -# this is a last resort option. -# Reported in kde#476502 -chrpath -d %{buildroot}/%{_kf5_bindir}/kbibtex -chrpath -d %{buildroot}%{_kf5_libdir}/libkbibtex*.so.* -chrpath -d %{buildroot}%{_kf5_plugindir}/kbibtexpart.so* - %if %{with lang} %find_lang %{name} %endif

1 0

commit ghc-fgl for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-fgl for openSUSE:Factory checked in at 2023-11-23 21:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-fgl (Old) and /work/SRC/openSUSE:Factory/.ghc-fgl.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-fgl" Thu Nov 23 21:40:33 2023 rev:9 rq:1128071 version:5.8.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-fgl/ghc-fgl.changes 2023-06-30 19:59:10.957754237 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-fgl.new.25432/ghc-fgl.changes 2023-11-23 21:41:53.498239367 +0100 @@ -1,0 +2,28 @@ +Wed Oct 18 08:42:49 UTC 2023 - Peter Simons <psimons(a)suse.com> + +- Update fgl to version 5.8.2.0. + 5.8.2.0 + ------- + + * Data.Graph.Inductive.Graph now only requires Graph, not DynGraph + (issue #100). + + * Documented that some functions are partial (issue #98). + + * Add `insert` function as synonym for `&` (issue #90). + + 5.8.1.1 + ------- + + * Data.Graph.Inductive.Query.Dominators.{dom,iDom} could fail for some + graphs (issue #109, regression in 5.8.1.0). + + 5.8.1.0 + ------- + + * Data.Graph.Inductive.PatriciaTree.Gr and + Data.Graph.Inductive.Tree.Gr now have Functor instances. + + * 'Gr a' is now an instance of Functor. + +------------------------------------------------------------------- Old: ---- fgl-5.8.0.0.tar.gz fgl.cabal New: ---- fgl-5.8.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-fgl.spec ++++++ --- /var/tmp/diff_new_pack.wiAoZL/_old 2023-11-23 21:41:54.446274286 +0100 +++ /var/tmp/diff_new_pack.wiAoZL/_new 2023-11-23 21:41:54.446274286 +0100 @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.8.0.0 +Version: 5.8.2.0 Release: 0 Summary: Martin Erwig's Functional Graph Library License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-array-prof @@ -81,7 +80,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ fgl-5.8.0.0.tar.gz -> fgl-5.8.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/ChangeLog new/fgl-5.8.2.0/ChangeLog --- old/fgl-5.8.0.0/ChangeLog 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/ChangeLog 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,27 @@ +5.8.2.0 +------- + +* Data.Graph.Inductive.Graph now only requires Graph, not DynGraph + (issue #100). + +* Documented that some functions are partial (issue #98). + +* Add `insert` function as synonym for `&` (issue #90). + +5.8.1.1 +------- + +* Data.Graph.Inductive.Query.Dominators.{dom,iDom} could fail for some + graphs (issue #109, regression in 5.8.1.0). + +5.8.1.0 +------- + +* Data.Graph.Inductive.PatriciaTree.Gr and + Data.Graph.Inductive.Tree.Gr now have Functor instances. + +* 'Gr a' is now an instance of Functor. + 5.8.0.0 ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Graph.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Graph.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Graph.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Graph.hs 2001-09-09 03:46:40.000000000 +0200 @@ -34,6 +34,7 @@ Graph(..), DynGraph(..), -- * Operations + insert, order, size, -- ** Graph Folds and Maps @@ -156,9 +157,10 @@ matchAny :: gr a b -> GDecomp gr a b matchAny g = case labNodes g of [] -> error "Match Exception, Empty Graph" - (v,_):_ -> (c,g') - where - (Just c,g') = match v g + (v,_):_ -> + case match v g of + (Just c,g') -> (c,g') + _ -> error "Match Exception, cannot extract node" -- | The number of 'Node's in a 'Graph'. noNodes :: gr a b -> Int @@ -186,6 +188,10 @@ -- in the graph. (&) :: Context a b -> gr a b -> gr a b +-- | A synonym for '&', to avoid conflicts with the similarly named +-- operator in "Data.Function". +insert :: DynGraph gr => Context a b -> gr a b -> gr a b +insert = (&) -- | The number of nodes in the graph. An alias for 'noNodes'. order :: (Graph gr) => gr a b -> Int @@ -302,7 +308,7 @@ -- -- NOTE: in the case of multiple edges with the same label, this -- will only delete the /first/ such edge. To delete all such --- edges, please use 'delAllLedge'. +-- edges, please use 'delAllLEdge'. delLEdge :: (DynGraph gr, Eq b) => LEdge b -> gr a b -> gr a b delLEdge = delLEdgeBy delete @@ -577,7 +583,7 @@ -- | Pretty-print the graph. Note that this loses a lot of -- information, such as edge inverses, etc. -prettify :: (DynGraph gr, Show a, Show b) => gr a b -> String +prettify :: (Graph gr, Show a, Show b) => gr a b -> String prettify g = foldr (showsContext . context g) id (nodes g) "" where showsContext (_,n,l,s) sg = shows n . (':':) . shows l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Internal/RootPath.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Internal/RootPath.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Internal/RootPath.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Internal/RootPath.hs 2001-09-09 03:46:40.000000000 +0200 @@ -29,7 +29,7 @@ | otherwise = findP v ps getPath :: Node -> RTree -> Path -getPath v = reverse . first (\(w:_)->w==v) +getPath v = reverse . first ((==v) . head) getLPath :: Node -> LRTree a -> LPath a getLPath v = LP . reverse . findP v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Monad.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Monad.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Monad.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Monad.hs 2001-09-09 03:46:40.000000000 +0200 @@ -56,8 +56,10 @@ matchAnyM g = do vs <- labNodesM g case vs of [] -> error "Match Exception, Empty Graph" - (v,_):_ -> do ~(Just c,g') <- matchM v g - return (c,g') + (v,_):_ -> do r <- matchM v g + case r of + (Just c,g') -> return (c,g') + _ -> error "Match Exception, cannot extract node" noNodesM :: m (gr a b) -> m Int noNodesM = labNodesM >>. length diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/NodeMap.hs new/fgl-5.8.2.0/Data/Graph/Inductive/NodeMap.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/NodeMap.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/NodeMap.hs 2001-09-09 03:46:40.000000000 +0200 @@ -112,20 +112,22 @@ let (g', _, _) = insMapNode m a g in g' +-- | Partial function: raises exception if passed nodes that are not in the graph. insMapEdge :: (Ord a, DynGraph g) => NodeMap a -> (a, a, b) -> g a b -> g a b insMapEdge m e g = - let (Just e') = mkEdge m e - in insEdge e' g + case mkEdge m e of Just e' -> insEdge e' g + Nothing -> error "insMapEdge: invalid edge" delMapNode :: (Ord a, DynGraph g) => NodeMap a -> a -> g a b -> g a b delMapNode m a g = let (n, _) = mkNode_ m a in delNode n g +-- | Partial function: raises exception if passed nodes that are not in the graph. delMapEdge :: (Ord a, DynGraph g) => NodeMap a -> (a, a) -> g a b -> g a b delMapEdge m (n1, n2) g = - let Just (n1', n2', _) = mkEdge m (n1, n2, ()) - in delEdge (n1', n2') g + case mkEdge m (n1, n2, ()) of Just (n1', n2', _) -> delEdge (n1', n2') g + Nothing -> error "delMapEdge: invalid edge" insMapNodes :: (Ord a, DynGraph g) => NodeMap a -> [a] -> g a b -> (g a b, NodeMap a, [LNode a]) insMapNodes m as g = @@ -137,27 +139,33 @@ let (g', _, _) = insMapNodes m as g in g' +-- | Partial function: raises exception if passed nodes that are not in the graph. insMapEdges :: (Ord a, DynGraph g) => NodeMap a -> [(a, a, b)] -> g a b -> g a b insMapEdges m es g = - let Just es' = mkEdges m es - in insEdges es' g + case mkEdges m es of Just es' -> insEdges es' g + Nothing -> error "insMapEdges: invalid edge" delMapNodes :: (Ord a, DynGraph g) => NodeMap a -> [a] -> g a b -> g a b delMapNodes m as g = let ns = P.map fst $ mkNodes_ m as in delNodes ns g +-- | Partial function: raises exception if passed nodes that are not in the graph. delMapEdges :: (Ord a, DynGraph g) => NodeMap a -> [(a, a)] -> g a b -> g a b delMapEdges m ns g = - let Just ns' = mkEdges m $ P.map (\(a, b) -> (a, b, ())) ns - ns'' = P.map (\(a, b, _) -> (a, b)) ns' - in delEdges ns'' g + case mkEdges m $ P.map (\(a, b) -> (a, b, ())) ns of + Nothing -> error "delMapEdges: invalid edges" + Just ns' -> + let ns'' = P.map (\(a, b, _) -> (a, b)) ns' + in delEdges ns'' g +-- | Partial function: raises exception if passed a node that is not in the graph. mkMapGraph :: (Ord a, DynGraph g) => [a] -> [(a, a, b)] -> (g a b, NodeMap a) mkMapGraph ns es = let (ns', m') = mkNodes new ns - Just es' = mkEdges m' es - in (mkGraph ns' es', m') + in case mkEdges m' es of + Just es' -> (mkGraph ns' es', m') + Nothing -> error "mkMapGraph: invalid edges" -- | Graph construction monad; handles passing both the 'NodeMap' and the -- 'Graph'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/PatriciaTree.hs new/fgl-5.8.2.0/Data/Graph/Inductive/PatriciaTree.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/PatriciaTree.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/PatriciaTree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -134,6 +134,9 @@ rnf (Gr g) = rnf g #endif +instance Functor (Gr a) where + fmap = fastEMap + #if MIN_VERSION_base (4,8,0) instance Bifunctor Gr where bimap = fastNEMap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BCC.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BCC.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BCC.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BCC.hs 2001-09-09 03:46:40.000000000 +0200 @@ -43,10 +43,11 @@ splitGraphs :: (DynGraph gr) => [gr a b] -> [Node] -> [gr a b] splitGraphs gs [] = gs splitGraphs [] _ = error "splitGraphs: empty graph list" -splitGraphs gs (v:vs) = splitGraphs (gs''++gs''') vs - where gs'' = embedContexts c gs' - gs' = gComponents g' - ((Just c,g'), gs''') = findGraph v gs +splitGraphs gs (v:vs) = case findGraph v gs of + ((Nothing, _), _) -> error "splitGraphs: invalid node" + ((Just c,g'), gs''') -> splitGraphs (gs''++gs''') vs + where gs'' = embedContexts c gs' + gs' = gComponents g' {-| Finds the bi-connected components of an undirected connected graph. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BFS.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BFS.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/BFS.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/BFS.hs 2001-09-09 03:46:40.000000000 +0200 @@ -107,10 +107,12 @@ bf :: (Graph gr) => Queue Path -> gr a b -> RTree bf q g | queueEmpty q || isEmpty g = [] | otherwise = - case match v g of - (Just c, g') -> p:bf (queuePutList (map (:p) (suc' c)) q') g' - (Nothing, g') -> bf q' g' - where (p@(v:_),q') = queueGet q + case queueGet q of + ([], _) -> [] + (p@(v:_),q') -> + case match v g of + (Just c, g') -> p:bf (queuePutList (map (:p) (suc' c)) q') g' + (Nothing, g') -> bf q' g' esp :: (Graph gr) => Node -> Node -> gr a b -> Path esp s t = getPath t . bft s @@ -128,11 +130,13 @@ lbf :: (Graph gr) => Queue (LPath b) -> gr a b -> LRTree b lbf q g | queueEmpty q || isEmpty g = [] | otherwise = - case match v g of - (Just c, g') -> - LP p:lbf (queuePutList (map (\v' -> LP (v':p)) (lsuc' c)) q') g' - (Nothing, g') -> lbf q' g' - where (LP (p@((v,_):_)),q') = queueGet q + case queueGet q of + (LP [], _) -> [] + (LP (p@((v,_):_)),q') -> + case match v g of + (Just c, g') -> + LP p:lbf (queuePutList (map (\v' -> LP (v':p)) (lsuc' c)) q') g' + (Nothing, g') -> lbf q' g' lesp :: (Graph gr) => Node -> Node -> gr a b -> LPath b lesp s t = getLPath t . lbft s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Dominators.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Dominators.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Dominators.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Dominators.hs 2001-09-09 03:46:40.000000000 +0200 @@ -17,16 +17,17 @@ import Data.Graph.Inductive.Query.DFS import Data.IntMap (IntMap) import qualified Data.IntMap as I +import Data.Maybe (mapMaybe) import Data.Tree (Tree (..)) import qualified Data.Tree as T {-# ANN iDom "HLint: ignore Use ***" #-} --- | return immediate dominators for each node of a graph, given a root +-- | return immediate dominators for each reachable node of a graph, given a root iDom :: (Graph gr) => gr a b -> Node -> [(Node,Node)] iDom g root = let (result, toNode, _) = idomWork g root in map (\(a, b) -> (toNode ! a, toNode ! b)) (assocs result) --- | return the set of dominators of the nodes of a graph, given a root +-- | return the set of dominators of the reachable nodes of a graph, given a root dom :: (Graph gr) => gr a b -> Node -> [(Node,[Node])] dom g root = let (iD, toNode, fromNode) = idomWork g root @@ -50,24 +51,26 @@ type FromNode = IntMap Node' idomWork :: (Graph gr) => gr a b -> Node -> (IDom, ToNode, FromNode) -idomWork g root = let - -- use depth first tree from root do build the first approximation - trees@(~[tree]) = dff [root] g - -- relabel the tree so that paths from the root have increasing nodes - (s, ntree) = numberTree 0 tree - -- the approximation iDom0 just maps each node to its parent - iD0 = array (1, s-1) (tail $ treeEdges (-1) ntree) - -- fromNode translates graph nodes to relabeled (internal) nodes - fromNode = I.unionWith const (I.fromList (zip (T.flatten tree) (T.flatten ntree))) (I.fromList (zip (nodes g) (repeat (-1)))) - -- toNode translates internal nodes to graph nodes - toNode = array (0, s-1) (zip (T.flatten ntree) (T.flatten tree)) - preds = array (1, s-1) [(i, filter (/= -1) (map (fromNode I.!) - (pre g (toNode ! i)))) | i <- [1..s-1]] - -- iteratively improve the approximation to find iDom. - iD = fixEq (refineIDom preds) iD0 - in - if null trees then error "Dominators.idomWork: root not in graph" - else (iD, toNode, fromNode) +idomWork g root = + case dff [root] g of + [] -> error "Dominators.idomWork: root not in graph" + tree : _ -> + let + nds = reachable root g + -- use depth first tree from root do build the first approximation + -- relabel the tree so that paths from the root have increasing nodes + (s, ntree) = numberTree 0 tree + -- the approximation iDom0 just maps each node to its parent + iD0 = array (1, s-1) (tail $ treeEdges (-1) ntree) + -- fromNode translates graph nodes to relabeled (internal) nodes + fromNode = I.unionWith const (I.fromList (zip (T.flatten tree) (T.flatten ntree))) (I.fromList (zip nds (repeat (-1)))) + -- toNode translates internal nodes to graph nodes + toNode = array (0, s-1) (zip (T.flatten ntree) (T.flatten tree)) + preds = array (1, s-1) [(i, filter (/= -1) (mapMaybe (`I.lookup` fromNode) + (pre g (toNode ! i)))) | i <- [1..s-1]] + -- iteratively improve the approximation to find iDom. + iD = fixEq (refineIDom preds) iD0 + in (iD, toNode, fromNode) -- for each node in iDom, find the intersection of all its predecessor's -- dominating sets, and update iDom accordingly. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Indep.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Indep.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Indep.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Indep.hs 2001-09-09 03:46:40.000000000 +0200 @@ -22,12 +22,14 @@ indepSize :: (DynGraph gr) => gr a b -> ([Node], Int) indepSize g | isEmpty g = ([], 0) - | l1 > l2 = il1 - | otherwise = il2 + | otherwise = + case match v g of + (Nothing,_) -> error "indepSize: unexpected invalid node" + (Just c,g') -> + let il1@(_,l1) = indepSize g' + il2@(_,l2) = ((v:) *** (+1)) $ indepSize (delNodes (neighbors' c) g') + in if l1 > l2 then il1 else il2 where vs = nodes g v = snd . maximumBy (compare `on` fst) . map ((,) =<< deg g) $ vs - (Just c,g') = match v g - il1@(_,l1) = indepSize g' - il2@(_,l2) = ((v:) *** (+1)) $ indepSize (delNodes (neighbors' c) g') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MST.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MST.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MST.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MST.hs 2001-09-09 03:46:40.000000000 +0200 @@ -20,10 +20,12 @@ prim :: (Graph gr,Real b) => H.Heap b (LPath b) -> gr a b -> LRTree b prim h g | H.isEmpty h || isEmpty g = [] prim h g = - case match v g of - (Just c,g') -> p:prim (H.mergeAll (h':newEdges p c)) g' - (Nothing,g') -> prim h' g' - where (_,p@(LP ((v,_):_)),h') = H.splitMin h + case H.splitMin h of + (_,p@(LP ((v,_):_)),h') -> + case match v g of + (Just c,g') -> p:prim (H.mergeAll (h':newEdges p c)) g' + (Nothing,g') -> prim h' g' + _ -> [] msTreeAt :: (Graph gr,Real b) => Node -> gr a b -> LRTree b msTreeAt v = prim (H.unit 0 (LP [(v,0)])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow.hs 2001-09-09 03:46:40.000000000 +0200 @@ -64,10 +64,11 @@ -- residual capacity of that edge's label. Then return the updated -- list. updAdjList::(Num b) => Adj (b,b,b) -> Node -> b -> Bool -> Adj (b,b,b) -updAdjList s v cf fwd = rs ++ ((x,y+cf',z-cf'),w) : rs' +updAdjList s v cf fwd = + case break ((v==) . snd) s of + (rs, ((x,y,z),w):rs') -> rs ++ ((x,y+cf',z-cf'),w) : rs' + _ -> error "updAdjList: invalid node" where - (rs, ((x,y,z),w):rs') = break ((v==) . snd) s - cf' = if fwd then cf else negate cf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow2.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow2.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/MaxFlow2.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/MaxFlow2.hs 2001-09-09 03:46:40.000000000 +0200 @@ -77,7 +77,7 @@ -- Compute an augmenting path augPathFused :: Network -> Node -> Node -> Maybe DirPath augPathFused g s t = listToMaybe $ map reverse $ - filter (\((u,_):_) -> u==t) tree + filter ((==t) . fst . head) tree where tree = bftForEK s g -- Breadth First Search wrapper function @@ -87,8 +87,12 @@ -- Breadth First Search, tailored for Edmonds & Karp bfForEK :: Queue DirPath -> Network -> DirRTree bfForEK q g - | queueEmpty q || isEmpty g = [] - | otherwise = case match v g of + | queueEmpty q || isEmpty g = [] + | otherwise = + case queueGet q of + ([], _) -> [] + (p@((v,_):_), q1) -> + case match v g of (Nothing, g') -> bfForEK q1 g' (Just (preAdj, _, _, sucAdj), g') -> p:bfForEK q2 g' where @@ -100,7 +104,6 @@ -- Traverse edges forwards if flow less than capacity suc2 = [ (sucNode,Forward):p | ((c, f), sucNode) <- sucAdj, c>f] - where (p@((v,_):_), q1)=queueGet q -- Extract augmenting path from network; return path as a sequence of -- edges with direction of traversal, and new network with augmenting @@ -110,13 +113,17 @@ extractPathFused g [] = ([], g) extractPathFused g [(_,_)] = ([], g) extractPathFused g ((u,_):rest@((v,Forward):_)) = - ((u, v, l, Forward):tailedges, newerg) - where (tailedges, newerg) = extractPathFused newg rest - Just (l, newg) = extractEdge g u v (uncurry (>)) + case extractEdge g u v (uncurry (>)) of + Just (l, newg) -> + let (tailedges, newerg) = extractPathFused newg rest + in ((u, v, l, Forward):tailedges, newerg) + Nothing -> error "extractPathFused Forward: invalid edge" extractPathFused g ((u,_):rest@((v,Backward):_)) = - ((v, u, l, Backward):tailedges, newerg) - where (tailedges, newerg) = extractPathFused newg rest - Just (l, newg) = extractEdge g v u (\(_,f)->(f>0)) + case extractEdge g v u (\(_,f)->(f>0)) of + Just (l, newg) -> + let (tailedges, newerg) = extractPathFused newg rest + in ((v, u, l, Backward):tailedges, newerg) + Nothing -> error "extractPathFused Backward: invalid edge" ekFusedStep :: EKStepFunc ekFusedStep g s t = case maybePath of @@ -142,7 +149,7 @@ [(v, u, f) | (u,v,(_,f)) <- labEdges g, f>0]) augPath :: Network -> Node -> Node -> Maybe Path -augPath g s t = listToMaybe $ map reverse $ filter (\(u:_) -> u==t) tree +augPath g s t = listToMaybe $ map reverse $ filter ((==t) . head) tree where tree = bft s (residualGraph g) -- Extract augmenting path from network; return path as a sequence of @@ -168,12 +175,12 @@ -- Return the label on the edge and the graph without the edge extractEdge :: Gr a b -> Node -> Node -> (b->Bool) -> Maybe (b, Gr a b) extractEdge g u v p = - case adj of - Just (el, _) -> Just (el, (p', node, l, rest) & newg) - Nothing -> Nothing - where (Just (p', node, l, s), newg) = match u g - (adj, rest)=extractAdj s - (\(l', dest) -> dest==v && p l') + case match u g of + ((Just (p', node, l, s), newg)) -> + let (adj, rest)=extractAdj s (\(l', dest) -> dest==v && p l') + in do (el, _) <- adj + Just (el, (p', node, l, rest) & newg) + _ -> Nothing -- Extract an item from an adjacency list that satisfies a given -- predicate. Return the item and the rest of the adjacency list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Monad.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Monad.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/Monad.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/Monad.hs 2001-09-09 03:46:40.000000000 +0200 @@ -78,11 +78,11 @@ fmap = liftM instance (Monad m) => Applicative (GT m g) where - pure = return + pure x = MGT (\mg->do {g<-mg; return (x,g)}) (<*>) = ap instance (Monad m) => Monad (GT m g) where - return x = MGT (\mg->do {g<-mg; return (x,g)}) + return = pure f >>= h = MGT (\mg->do {(x,g)<-apply f mg; apply' (h x) g}) condMGT' :: (Monad m) => (s -> Bool) -> GT m s a -> GT m s a -> GT m s a @@ -218,14 +218,15 @@ dffM vs = MGT (\mg-> do g<-mg b<-isEmptyM mg - if b||null vs then return ([],g) else - let (v:vs') = vs in - do (mc,g1) <- matchM v mg + case (b, vs) of + (False, v:vs') -> do + (mc,g1) <- matchM v mg case mc of Nothing -> apply (dffM vs') (return g1) Just c -> do (ts, g2) <- apply (dffM (suc' c)) (return g1) (ts',g3) <- apply (dffM vs') (return g2) return (Node (node' c) ts:ts',g3) + _ -> return ([],g) ) graphDff :: (GraphM m gr) => [Node] -> m (gr a b) -> m [Tree Node] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/SP.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/SP.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/SP.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/SP.hs 2001-09-09 03:46:40.000000000 +0200 @@ -28,10 +28,12 @@ -> LRTree b dijkstra h g | H.isEmpty h || isEmpty g = [] dijkstra h g = - case match v g of - (Just c,g') -> p:dijkstra (H.mergeAll (h':expand d p c)) g' - (Nothing,g') -> dijkstra h' g' - where (_,p@(LP ((v,d):_)),h') = H.splitMin h + case H.splitMin h of + (_,p@(LP ((v,d):_)),h') -> + case match v g of + (Just c,g') -> p:dijkstra (H.mergeAll (h':expand d p c)) g' + (Nothing,g') -> dijkstra h' g' + _ -> [] -- | Tree of shortest paths from a certain node to the rest of the -- (reachable) nodes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Query/TransClos.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Query/TransClos.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Query/TransClos.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Query/TransClos.hs 2001-09-09 03:46:40.000000000 +0200 @@ -18,8 +18,8 @@ outU gr = map toEdge . out gr {-| -Finds the transitive, reflexive closure of a directed graph. -Given a graph G=(V,E), its transitive closure is the graph: +Finds the reflexive-transitive closure of a directed graph. +Given a graph G=(V,E), its reflexive-transitive closure is the graph: G* = (V,E*) where E*={(i,j): i,j in V and either i = j or there is a path from i to j in G} -} trc :: (DynGraph gr) => gr a b -> gr a () @@ -30,11 +30,12 @@ {-| Finds the reflexive closure of a directed graph. -Given a graph G=(V,E), its transitive closure is the graph: +Given a graph G=(V,E), its reflexive closure is the graph: G* = (V,Er union E) where Er = {(i,i): i in V} -} rc :: (DynGraph gr) => gr a b -> gr a () -rc g = newEdges `insEdges` insNodes ln empty +rc g = (newEdges ++ oldEdges) `insEdges` insNodes ln empty where ln = labNodes g newEdges = [ (u, u, ()) | (u, _) <- ln ] + oldEdges = [ (u, v, ()) | (u, v, _) <- labEdges g ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/Data/Graph/Inductive/Tree.hs new/fgl-5.8.2.0/Data/Graph/Inductive/Tree.hs --- old/fgl-5.8.0.0/Data/Graph/Inductive/Tree.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/Data/Graph/Inductive/Tree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -135,6 +135,9 @@ rnf (Gr g) = rnf g #endif +instance Functor (Gr a) where + fmap = emap + #if MIN_VERSION_base (4,8,0) instance Bifunctor Gr where bimap = nemap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/LICENSE new/fgl-5.8.2.0/LICENSE --- old/fgl-5.8.0.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,6 @@ Copyright (c) 1999-2008, Martin Erwig 2010, Ivan Lazar Miljenovic + 2023, Troels Henriksen All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs new/fgl-5.8.2.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs --- old/fgl-5.8.0.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/fgl-arbitrary/Data/Graph/Inductive/Arbitrary.hs 2001-09-09 03:46:40.000000000 +0200 @@ -321,23 +321,24 @@ toConnGraph :: forall ag a b. (ArbGraph ag, Arbitrary a, Arbitrary b) => ag a b -> Gen (Connected ag a b) -toConnGraph ag = do a <- arbitrary - ces <- concat <$> mapM mkE ws - return $ CG { connNode = v - , connArbGraph = fromBaseGraph - . insEdges ces - . insNode (v,a) - $ g - } +toConnGraph ag = case newNodes 1 g of + [] -> error "toConnGraph: cannot make node" + v:_ -> do + a <- arbitrary + ces <- concat <$> mapM (mkE v) ws + return $ CG { connNode = v + , connArbGraph = fromBaseGraph + . insEdges ces + . insNode (v,a) + $ g + } where g = toBaseGraph ag - [v] = newNodes 1 g - ws = nodes g - mkE w = do b <- arbitrary - return (edgeF p [(v,w,b)]) + mkE v w = do b <- arbitrary + return (edgeF p [(v,w,b)]) p :: GrProxy ag p = GrProxy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/fgl.cabal new/fgl-5.8.2.0/fgl.cabal --- old/fgl-5.8.0.0/fgl.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/fgl.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,9 +1,9 @@ name: fgl -version: 5.8.0.0 +version: 5.8.2.0 license: BSD3 license-file: LICENSE author: Martin Erwig, Ivan Lazar Miljenovic -maintainer: Ivan.Miljenovic(a)gmail.com +maintainer: athas(a)sigkill.dk category: Data Structures, Graphs synopsis: Martin Erwig's Functional Graph Library @@ -20,7 +20,7 @@ tested-with: GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.2, GHC == 8.8.2, GHC == 8.10.7, GHC == 9.0.2, - GHC == 9.2.3, GHC == 9.4.2 + GHC == 9.2.4, GHC == 9.4.4, GHC == 9.6.3, GHC == 9.8.1 source-repository head type: git @@ -73,7 +73,7 @@ if flag(containers042) build-depends: containers >= 0.4.2 - , deepseq >= 1.1.0.0 && < 1.5 + , deepseq >= 1.1.0.0 && < 1.6 else build-depends: containers < 0.4.2 @@ -93,7 +93,7 @@ build-depends: fgl , base , QuickCheck >= 2.8 && < 2.15 - , hspec >= 2.1 && < 2.11 + , hspec >= 2.1 && < 2.12 , containers hs-source-dirs: test @@ -107,6 +107,8 @@ , Data.Graph.Inductive.Query.Properties ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wall -Wno-star-is-type } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/test/Data/Graph/Inductive/Graph/Properties.hs new/fgl-5.8.2.0/test/Data/Graph/Inductive/Graph/Properties.hs --- old/fgl-5.8.0.0/test/Data/Graph/Inductive/Graph/Properties.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/test/Data/Graph/Inductive/Graph/Properties.hs 2001-09-09 03:46:40.000000000 +0200 @@ -194,18 +194,17 @@ -- current behaviour is to throw an error if an existing node is -- used. valid_insNode :: (DynGraph gr, Ord a, Ord b) => gr a b -> a -> Bool -valid_insNode g l = gelem v g' - && sort (labNodes g') == sort (vl : labNodes g) - && sort (labEdges g') == sort (labEdges g) - -- Note: not testing whether this changes - -- nodeRange because newNodes /might/ return - -- unused nodes in the middle. - where - [v] = newNodes 1 g - - vl = (v,l) - - g' = insNode vl g +valid_insNode g l = + case newNodes 1 g of + [v] -> let vl = (v,l) + g' = insNode vl g + in gelem v g' + && sort (labNodes g') == sort (vl : labNodes g) + && sort (labEdges g') == sort (labEdges g) + -- Note: not testing whether this changes + -- nodeRange because newNodes /might/ return + -- unused nodes in the middle. + _ -> False -- | Insert a node for every label in the list, but don't add any new -- edges. @@ -329,12 +328,13 @@ -- adding the specified number to the graph and then deleting them. valid_delAllLEdge :: (DynGraph gr, Eq a, Eq b) => gr a b -> NonNegative Int -> a -> a -> b -> Bool -valid_delAllLEdge g (NonNegative c) a1 a2 b = equal g' (delAllLEdge le g'') - where - [v,w] = newNodes 2 g - g' = insNodes [(v,a1),(w,a2)] g - le = (v,w,b) - g'' = insEdges (replicate c le) g' +valid_delAllLEdge g (NonNegative c) a1 a2 b = + case newNodes 2 g of + [v,w] -> let g' = insNodes [(v,a1),(w,a2)] g + le = (v,w,b) + g'' = insEdges (replicate c le) g' + in equal g' (delAllLEdge le g'') + _ -> False -- | There is a version of 'mkGraph' in its documentation that uses -- 'DynGraph' (hence why it isn't used by default). This ensures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/test/Data/Graph/Inductive/Query/Properties.hs new/fgl-5.8.2.0/test/Data/Graph/Inductive/Query/Properties.hs --- old/fgl-5.8.0.0/test/Data/Graph/Inductive/Query/Properties.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/test/Data/Graph/Inductive/Query/Properties.hs 2001-09-09 03:46:40.000000000 +0200 @@ -133,14 +133,25 @@ -- Dominators test_dom :: Spec -test_dom = it "dom" $ - sortIt (dom domGraph 1) `shouldMatchList` [ (1, [1]) - , (2, [1,2]) - , (3, [1,2,3]) - , (4, [1,2,4]) - , (5, [1,2,5]) - , (6, [1,2,6]) - ] +test_dom = describe "dom" $ do + it "regular dom" $ + sortIt (dom domGraph 1) `shouldMatchList` [ (1, [1]) + , (2, [1,2]) + , (3, [1,2,3]) + , (4, [1,2,4]) + , (5, [1,2,5]) + , (6, [1,2,6]) + ] + it "multiple components dom" $ + sortIt (dom domGraph1 1) `shouldMatchList` [ (1, [1]) + , (2, [1, 2]) + ] + it "directed reachable components dom" $ + sortIt (dom domGraph2 1) `shouldMatchList` [ (1, [1]) ] + + it "unreachable nodes dom" $ + sortIt (dom domGraph3 1) `shouldMatchList` [(1,[1]), (2,[1,2])] + where sortIt = map (second sort) @@ -160,6 +171,23 @@ , (5,2) ] +-- This graph has two components (independent subgraphs) +domGraph1 :: Gr () () +domGraph1 = mkUGraph [1..3] + [ (1,2) + ] + +-- This graph has no reachables from 1 (but 1 is reachable) +domGraph2 :: Gr () () +domGraph2 = mkUGraph [1..3] + [ (2,1) + , (2,2) + ] + +-- From #109: 1 -> 2 <- 3 +domGraph3 :: Gr () () +domGraph3 = mkUGraph [1..3] [(1,2), (3,2)] + -- ----------------------------------------------------------------------------- -- GVD @@ -333,26 +361,29 @@ test_sp_Just :: (ArbGraph gr, Graph gr, Real b) => Proxy (gr a b) -> gr a b -> Property test_sp_Just _ g = - (noNodes g >= 2 && v `elem` bfs u g) ==> - isJust (spLength u v g) && - isJust maybePath && - not (null path) && - head path == u && - last path == v - where - [u,v] = take 2 (nodes g) - maybePath@(Just path) = sp u v g + case nodes g of + u:v:_ -> + v `elem` bfs u g ==> + isJust (spLength u v g) && + case sp u v g of + Nothing -> False + Just path -> + not (null path) && + head path == u && + last path == v + _ -> property True -- | Test that 'spLength' and 'sp' return 'Nothing' when destination -- is not reachable from source. test_sp_Nothing :: (ArbGraph gr, Graph gr, Real b) => Proxy (gr a b) -> gr a b -> Property test_sp_Nothing _ g = - (noNodes g >= 2 && not (v `elem` bfs u g)) ==> - isNothing (spLength u v g) && - isNothing (sp u v g) - where - [u,v] = take 2 (nodes g) + case nodes g of + u:v:_ -> + not (v `elem` bfs u g) ==> + isNothing (spLength u v g) && + isNothing (sp u v g) + _ -> property True -- ----------------------------------------------------------------------------- -- TransClos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.0.0/test/TestSuite.hs new/fgl-5.8.2.0/test/TestSuite.hs --- old/fgl-5.8.0.0/test/TestSuite.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.2.0/test/TestSuite.hs 2001-09-09 03:46:40.000000000 +0200 @@ -79,7 +79,7 @@ propType "subgraph" valid_subgraph where - proxyProp str = prop str . ($p) + proxyProp str = prop str . ($ p) propType :: (Testable pr) => String -> (GraphType gr -> pr) -> Spec propType = prop @@ -126,7 +126,7 @@ propP "tc" test_tc propP "rc" test_rc where - propP str = prop str . ($p) + propP str = prop str . ($ p) p :: PatriciaTreeP p = Proxy

1 0

commit ghc-unix-compat for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-unix-compat for openSUSE:Factory checked in at 2023-11-23 21:40:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-unix-compat (Old) and /work/SRC/openSUSE:Factory/.ghc-unix-compat.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-unix-compat" Thu Nov 23 21:40:46 2023 rev:26 rq:1128089 version:0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-unix-compat/ghc-unix-compat.changes 2023-04-04 21:24:35.682615270 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-unix-compat.new.25432/ghc-unix-compat.changes 2023-11-23 21:42:13.874989889 +0100 @@ -1,0 +2,8 @@ +Wed Mar 30 19:44:09 UTC 2023 - Peter Simons <psimons(a)suse.com> + +- Update unix-compat to version 0.7. + ## Version 0.7 (2023-03-15) + + - Remote `System.PosixCompat.User` module + +------------------------------------------------------------------- Old: ---- unix-compat-0.6.tar.gz unix-compat.cabal New: ---- unix-compat-0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-unix-compat.spec ++++++ --- /var/tmp/diff_new_pack.w4NoFG/_old 2023-11-23 21:42:14.423010074 +0100 +++ /var/tmp/diff_new_pack.w4NoFG/_new 2023-11-23 21:42:14.423010074 +0100 @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6 +Version: 0.7 Release: 0 Summary: Portable POSIX-compatibility layer License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof @@ -82,7 +81,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ unix-compat-0.6.tar.gz -> unix-compat-0.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-compat-0.6/CHANGELOG.md new/unix-compat-0.7/CHANGELOG.md --- old/unix-compat-0.6/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/unix-compat-0.7/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +## Version 0.7 (2023-03-15) + +- Remote `System.PosixCompat.User` module + ## Version 0.6 (2022-05-22) - Better support for symbolic links diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-compat-0.6/src/System/PosixCompat/User.hsc new/unix-compat-0.7/src/System/PosixCompat/User.hsc --- old/unix-compat-0.6/src/System/PosixCompat/User.hsc 2001-09-09 03:46:40.000000000 +0200 +++ new/unix-compat-0.7/src/System/PosixCompat/User.hsc 1970-01-01 01:00:00.000000000 +0100 @@ -1,133 +0,0 @@ -{-# LANGUAGE CPP #-} - -{-| -This module makes the operations exported by @System.Posix.User@ -available on all platforms. On POSIX systems it re-exports operations from -@System.Posix.User@. On other platforms it provides dummy implementations. --} -module System.PosixCompat.User ( - -- * User environment - -- ** Querying the user environment - getRealUserID - , getRealGroupID - , getEffectiveUserID - , getEffectiveGroupID - , getGroups - , getLoginName - , getEffectiveUserName - - -- *** The group database - , GroupEntry(..) - , getGroupEntryForID - , getGroupEntryForName - , getAllGroupEntries - - -- *** The user database - , UserEntry(..) - , getUserEntryForID - , getUserEntryForName - , getAllUserEntries - - -- ** Modifying the user environment - , setUserID - , setGroupID - ) where - -#ifndef mingw32_HOST_OS - -#include "HsUnixCompat.h" - -import System.Posix.User - -#if __GLASGOW_HASKELL__<605 -getAllGroupEntries :: IO [GroupEntry] -getAllGroupEntries = return [] - -getAllUserEntries :: IO [UserEntry] -getAllUserEntries = return [] -#endif - -#else /* Portable implementation */ - -import System.IO.Error -import System.PosixCompat.Types - -unsupported :: String -> IO a -unsupported f = ioError $ mkIOError illegalOperationErrorType x Nothing Nothing - where x = "System.PosixCompat.User." ++ f ++ ": not supported" - --- ----------------------------------------------------------------------------- --- User environment - -getRealUserID :: IO UserID -getRealUserID = unsupported "getRealUserID" - -getRealGroupID :: IO GroupID -getRealGroupID = unsupported "getRealGroupID" - -getEffectiveUserID :: IO UserID -getEffectiveUserID = unsupported "getEffectiveUserID" - -getEffectiveGroupID :: IO GroupID -getEffectiveGroupID = unsupported "getEffectiveGroupID" - -getGroups :: IO [GroupID] -getGroups = return [] - -getLoginName :: IO String -getLoginName = unsupported "getLoginName" - -setUserID :: UserID -> IO () -setUserID _ = return () - -setGroupID :: GroupID -> IO () -setGroupID _ = return () - --- ----------------------------------------------------------------------------- --- User names - -getEffectiveUserName :: IO String -getEffectiveUserName = unsupported "getEffectiveUserName" - --- ----------------------------------------------------------------------------- --- The group database - -data GroupEntry = GroupEntry - { groupName :: String - , groupPassword :: String - , groupID :: GroupID - , groupMembers :: [String] - } deriving (Show, Read, Eq) - -getGroupEntryForID :: GroupID -> IO GroupEntry -getGroupEntryForID _ = unsupported "getGroupEntryForID" - -getGroupEntryForName :: String -> IO GroupEntry -getGroupEntryForName _ = unsupported "getGroupEntryForName" - -getAllGroupEntries :: IO [GroupEntry] -getAllGroupEntries = return [] - --- ----------------------------------------------------------------------------- --- The user database (pwd.h) - -data UserEntry = UserEntry - { userName :: String - , userPassword :: String - , userID :: UserID - , userGroupID :: GroupID - , userGecos :: String - , homeDirectory :: String - , userShell :: String - } deriving (Show, Read, Eq) - -getUserEntryForID :: UserID -> IO UserEntry -getUserEntryForID _ = unsupported "getUserEntryForID" - -getUserEntryForName :: String -> IO UserEntry -getUserEntryForName _ = unsupported "getUserEntryForName" - -getAllUserEntries :: IO [UserEntry] -getAllUserEntries = return [] - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-compat-0.6/src/System/PosixCompat.hs new/unix-compat-0.7/src/System/PosixCompat.hs --- old/unix-compat-0.6/src/System/PosixCompat.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/unix-compat-0.7/src/System/PosixCompat.hs 2001-09-09 03:46:40.000000000 +0200 @@ -11,7 +11,6 @@ , module System.PosixCompat.Time , module System.PosixCompat.Types , module System.PosixCompat.Unistd - , module System.PosixCompat.User , usingPortableImpl ) where @@ -20,7 +19,6 @@ import System.PosixCompat.Time import System.PosixCompat.Types import System.PosixCompat.Unistd -import System.PosixCompat.User -- | 'True' if unix-compat is using its portable implementation, -- or 'False' if the unix package is simply being re-exported. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-compat-0.6/unix-compat.cabal new/unix-compat-0.7/unix-compat.cabal --- old/unix-compat-0.6/unix-compat.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/unix-compat-0.7/unix-compat.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,16 +1,16 @@ name: unix-compat -version: 0.6 +version: 0.7 synopsis: Portable POSIX-compatibility layer. description: This package provides portable implementations of parts of the unix package. This package re-exports the unix package when available. When it isn't available, portable implementations are used. -homepage: http://github.com/jacobstanley/unix-compat +homepage: http://github.com/haskell-pkg-janitors/unix-compat license: BSD3 license-file: LICENSE author: Björn Bringert, Duncan Coutts, Jacob Stanley, Bryan O'Sullivan -maintainer: Jacob Stanley <jacob(a)stanley.io> +maintainer: Mitchell Rosen <mitchellwrosen(a)gmail.com> category: System build-type: Simple cabal-version: >= 1.10 @@ -20,7 +20,7 @@ source-repository head type: git - location: git@github.com:jacobstanley/unix-compat.git + location: git@github.com:haskell-pkg-janitors/unix-compat.git flag old-time description: build against old-time package @@ -40,7 +40,6 @@ System.PosixCompat.Time System.PosixCompat.Types System.PosixCompat.Unistd - System.PosixCompat.User if os(windows) c-sources:

1 0

commit python-markdown-it-py for openSUSE:Factory
by Source-Sync 25 Nov '23

25 Nov '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-markdown-it-py for openSUSE:Factory checked in at 2023-11-23 21:38:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-markdown-it-py (Old) and /work/SRC/openSUSE:Factory/.python-markdown-it-py.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-markdown-it-py" Thu Nov 23 21:38:32 2023 rev:5 rq:1128266 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-markdown-it-py/python-markdown-it-py.changes 2023-05-09 13:06:53.916864125 +0200 +++ /work/SRC/openSUSE:Factory/.python-markdown-it-py.new.25432/python-markdown-it-py.changes 2023-11-23 21:38:34.602913309 +0100 @@ -1,0 +2,50 @@ +Thu Nov 23 07:22:11 UTC 2023 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Update to version 3.0.0: + * drop python 3.7 support + * Update from upstream markdown-it 12.2.0 to 13.0.0 + - A key change is the addition of a new Token type, text_special, + which is used to represent HTML entities and backslash escaped + characters. + - This ensures that (core) typographic transformation rules are not + incorrectly applied to these texts. + - The final core rule is now the new text_join rule, which joins + adjacent text/text_special tokens, and so no text_special tokens + should be present in the final token stream. + - Any custom typographic rules should be inserted before text_join. + - A new linkify rule has also been added to the inline chain, which + will linkify full URLs (e.g. https://example.com), and fixes + collision of emphasis and linkifier (so + http://example.org/foo._bar_-_baz is now a single link, not + emphasized). + - Emails and fuzzy links are not affected by this. + * REFACTOR: Replace most character code use with strings + - The use of StateBase.srcCharCode is deprecated (with + backward-compatibility), and all core uses are replaced by + StateBase.src. + - Conversion of source string characters to an integer + representing the Unicode character is prevalent in the upstream + JavaScript implementation, to improve performance. However, it + is unnecessary in Python and leads to harder to read code and + performance deprecations (during the conversion in the StateBase + initialisation). + * Centralise indented code block tests + - For CommonMark, the presence of indented code blocks prevent any + other block element from having an indent of greater than 4 + spaces. + - Certain Markdown flavors and derivatives, such as mdx and djot, + disable these code blocks though, since it is more common to use + code fences and/or arbitrary indenting is desirable. + - Previously, disabling code blocks did not remove the indent + limitation, since most block elements had the 3 space limitation + hard-coded. + - This change centralised the logic of applying this limitation + (in StateBlock.is_code_block), and only applies it when indented + code blocks are enabled. + * Maintenance changes + - Strict type annotation checking has been applied to the whole + code base, ruff is now used for linting, and fuzzing tests have + been added to the CI, to integrate with Google OSS-Fuzz testing, + thanks to @DavidKorczynski. + +------------------------------------------------------------------- Old: ---- python-markdown-it-py-2.2.0.tar.gz New: ---- python-markdown-it-py-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-markdown-it-py.spec ++++++ --- /var/tmp/diff_new_pack.OBsFcP/_old 2023-11-23 21:38:35.206935561 +0100 +++ /var/tmp/diff_new_pack.OBsFcP/_new 2023-11-23 21:38:35.206935561 +0100 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-markdown-it-py -Version: 2.2.0 +Version: 3.0.0 Release: 0 Summary: Python port of markdown-it Markdown parsing License: MIT @@ -26,9 +26,10 @@ Source: https://github.com/executablebooks/markdown-it-py/archive/refs/tags/v%{vers… #Source: https://files.pythonhosted.org/packages/source/m/markdown-it-py/markdown-it… BuildRequires: python-rpm-macros -BuildRequires: %{python_module flit} +BuildRequires: %{python_module flit-core} BuildRequires: %{python_module mdurl} BuildRequires: %{python_module pip} +BuildRequires: %{python_module wheel} # SECTION tests BuildRequires: %{python_module linkify-it-py} BuildRequires: %{python_module pytest-regressions} @@ -48,7 +49,7 @@ It follows the CommonMark spec for baseline parsing, has a configurable syntax and is pluggable. %prep -%setup -q -n markdown-it-py-%{version} +%autosetup -p1 -n markdown-it-py-%{version} sed -i '1{/\/usr\/bin\/env python*/d;}' markdown_it/cli/parse.py %build ++++++ python-markdown-it-py-2.2.0.tar.gz -> python-markdown-it-py-3.0.0.tar.gz ++++++ ++++ 6352 lines of diff (skipped)

1 0