From fb95c1f026eeeb72cbda853cd158c106020746e09a7f7699ec5a2f5da0c86b72 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Sun, 24 Feb 2019 08:05:48 +0000 Subject: [PATCH] Accepting request 678442 from home:jayvdb:coala:python3-bears - Activate test suite - Update to v0.10.0 * Changes see https://github.com/uiri/toml/compare/0.9.4...0.10.0 * Includes tests not previously included in source tarball - Remove superfluous devel dependency for noarch package - Update to version 0.9.4 + Changes see https://github.com/uiri/toml/compare/0.9.3...0.9.4 + Contain again test which are run - Packaging + spec-cleaner minimal (date, license) + Resurection to be included in d:l:p and Factory to be used by Cloud people and others - Update to version 0.9.3.1 (no real changelog) Changes see https://github.com/uiri/toml/compare/0.9.2...0.9.3 - Packaging hardcode version in setup (tarball has only 0.9.3) + Add comment about test. None are executed, upstream has removed them from tarball (Work in progress) - remove python-coverage runtime requires - Fix define line for build on Leap - Move to singlespec packaging - Update copyright year - Add fdupes - specfile: * update copyright year - update to version 0.9.2: * Use xrange (_range) in Python 2. * Prefix internal object/function names with an underscore. * Fix candidate groups handling. * Fix digit matching. * Fix usage of isdigit. * Optimize use of regexps (precompile, single-regexp substitution) * Fix code style. * Peephole optimizations. * Merge #51: Do not raise base Exception. * Remove dead code. * Fix inadvertently broken long integer test * s.decode should assign its result to s. * Remove unnecessary indent level/else branches * Fix #43 by adding Z timezone. tzinfos don't do DST * Fix UTC offsets specified as hours and minutes * update test command * add travis testing * Update copyright notice. Update toml-test repo in README * Close #42 and simplify. Manual testing shows this works. * Support } whithin string in inline objects within arrays * Remove test toml files * Clean load_inline_objects * fix for array in inlinetable * Handle commas inside strings within inline objects * Fix multiline-string and raw-multiline-string tests * Fix key-equals-nospace test * Add support for inline objects inside arrays * Add support for inline objects - specfile: * changed to https for source url * updated source url to files.pythonhosted.org - Initial packaging on obs for python3 changes are stored in README.rst OBS-URL: https://build.opensuse.org/request/show/678442 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-toml?expand=0&rev=7 --- python-toml.changes | 10 +++++- python-toml.spec | 18 ++++++++--- test.toml | 65 +++++++++++++++++++++++++++++++++++++++ toml-0.10.0.tar.gz | 3 ++ toml-0.9.4.tar.gz | 3 -- toml-test-39bb76d6.tar.gz | 3 ++ 6 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 test.toml create mode 100644 toml-0.10.0.tar.gz delete mode 100644 toml-0.9.4.tar.gz create mode 100644 toml-test-39bb76d6.tar.gz diff --git a/python-toml.changes b/python-toml.changes index 0f7b5d2..a6f611f 100644 --- a/python-toml.changes +++ b/python-toml.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Feb 23 00:41:14 UTC 2019 - John Vandenberg + +- Activate test suite +- Update to v0.10.0 + * Changes see https://github.com/uiri/toml/compare/0.9.4...0.10.0 + * Includes tests not previously included in source tarball + ------------------------------------------------------------------- Tue Dec 4 12:55:22 UTC 2018 - Matej Cepl @@ -7,7 +15,7 @@ Tue Dec 4 12:55:22 UTC 2018 - Matej Cepl Tue May 15 16:56:14 UTC 2018 - bruno@ioda-net.ch - Update to version 0.9.4 - + Changes see https://github.com/uiri/toml/compare/0.9.3...0.9.x + + Changes see https://github.com/uiri/toml/compare/0.9.3...0.9.4 + Contain again test which are run - Packaging + spec-cleaner minimal (date, license) diff --git a/python-toml.spec b/python-toml.spec index 085281f..61ba699 100644 --- a/python-toml.spec +++ b/python-toml.spec @@ -1,7 +1,7 @@ # # spec file for package python-toml # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,18 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-toml -Version: 0.9.4 +Version: 0.10.0 Release: 0 Summary: Python module which parses and emits TOML License: MIT Group: Development/Languages/Python URL: https://github.com/uiri/toml Source: https://files.pythonhosted.org/packages/source/t/toml/toml-%{version}.tar.gz -BuildRequires: %{python_module base} +# Untagged test data https://github.com/uiri/toml/issues/232 +Source1: https://github.com/BurntSushi/toml-test/archive/39bb76d6.tar.gz#/toml-test-39bb76d6.tar.gz +# Missing file https://github.com/uiri/toml/pull/231 +Source2: https://raw.githubusercontent.com/uiri/toml/%{version}/test.toml +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: coreutils BuildRequires: fdupes @@ -51,6 +55,9 @@ https://github.com/mojombo/toml/blob/v0.4.0/README.md %prep %setup -q -n toml-%{version} +tar -xzf %{SOURCE1} +ln -s toml-test*/ toml-test +cp %{SOURCE2} . %build %python_build @@ -60,10 +67,11 @@ https://github.com/mojombo/toml/blob/v0.4.0/README.md %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py test +export LANG=en_US.UTF-8 +%python_exec -m pytest %files %{python_files} -%defattr(-,root,root) +# See https://github.com/uiri/toml/issues/216 re change log %license LICENSE %doc README.rst %{python_sitelib} diff --git a/test.toml b/test.toml new file mode 100644 index 0000000..a6397cb --- /dev/null +++ b/test.toml @@ -0,0 +1,65 @@ +# This is a TOML document. Boom. + +a = "C:\\Users\\n" + +title = "TOML Example" +the-void = [[[[[]]]]] +mixed = [[1, +2], ["a", "b"], [1.0, 2.0]] +avogadro = 6.23e23 + +[owner] +name = "Tom \\ / Preston-Werner" +organization = "GitHub" +bio = "GitHub Cofounder & CEO\nLikes tater tots and beer." +dob = 1979-05-27T07:32:00Z # First class dates? Why not? + +[database] +server = "192.168.1.1" +ports = [ 8001, 8001, 8002 ] +connection_max = 5000 +enabled = true +test = [["a"], ["b"], ["c"]] + +[servers] + + # You can indent as you please. Tabs or spaces. TOML don't care. + [servers.alpha] + ip = "10.0.0.1" + dc = "eqdc10" + + [servers.beta] + ip = "\u000a\u1000\u1000\u0002" + dc = "eqdc10" + +[clients] +data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it + +# Line breaks are OK when inside arrays +hosts = [ + "alpha", + "omega" +] + +[[fruit]] + name = "apple" + + [fruit.physical] + color = "red" + shape = "round" + + [[fruit.variety]] + name = "red delicious" + + #[fruit.variety] + # name = "granny smith" + +[[fruit]] + name = "banana" + + [[fruit.variety]] + name = "plantain" + + [[fruit.variety]] + name = "whatever" + thing=34 + "l.mao" = 42 diff --git a/toml-0.10.0.tar.gz b/toml-0.10.0.tar.gz new file mode 100644 index 0000000..775608d --- /dev/null +++ b/toml-0.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c +size 16719 diff --git a/toml-0.9.4.tar.gz b/toml-0.9.4.tar.gz deleted file mode 100644 index e74b648..0000000 --- a/toml-0.9.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e86bd6ce8cc11b9620cb637466453d94f5d57ad86f17e98a98d1f73e3baab2d -size 12752 diff --git a/toml-test-39bb76d6.tar.gz b/toml-test-39bb76d6.tar.gz new file mode 100644 index 0000000..bcb60c6 --- /dev/null +++ b/toml-test-39bb76d6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cef08690950e191ce58967638b133aa4a8560c3986761d833f08bbc4fdfd5e70 +size 19304