Hello community, here is the log from the commit of package python-Paver for openSUSE:Factory checked in at 2020-12-16 10:59:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Paver (Old) and /work/SRC/openSUSE:Factory/.python-Paver.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Paver" Wed Dec 16 10:59:39 2020 rev:3 rq:855667 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Paver/python-Paver.changes 2019-08-24 18:49:07.077741592 +0200 +++ /work/SRC/openSUSE:Factory/.python-Paver.new.2328/python-Paver.changes 2020-12-16 10:59:42.715524182 +0100 @@ -1,0 +2,23 @@ +Mon Dec 14 00:45:00 UTC 2020 - Benjamin Greiner <c...@bnavigator.de> + +- Fix condition around BuildRequirement + +------------------------------------------------------------------- +Sun Dec 13 20:54:48 UTC 2020 - Matej Cepl <mc...@suse.com> + +- We don't need to break Python 2.7 + +------------------------------------------------------------------- +Mon Dec 7 07:45:39 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add remove_external_pkgs.patch to remove use of external + packages (gh#paver/paver#206). + Remove remove_nose.patch, because it is merged into that patch + as well. + +------------------------------------------------------------------- +Sat Dec 5 23:00:15 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add remove_nose.patch to remove dependency on nose. + +------------------------------------------------------------------- New: ---- remove_external_pkgs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Paver.spec ++++++ --- /var/tmp/diff_new_pack.9LPMAN/_old 2020-12-16 10:59:43.739525187 +0100 +++ /var/tmp/diff_new_pack.9LPMAN/_new 2020-12-16 10:59:43.743525192 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Paver # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,13 +25,17 @@ Group: Development/Libraries/Python URL: https://github.com/paver/paver Source: https://files.pythonhosted.org/packages/source/P/Paver/Paver-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM remove_external_pkgs.patch gh#paver/paver#206 mc...@suse.com +# make package independent of external packages +Patch0: remove_external_pkgs.patch BuildRequires: %{python_module cogapp} -BuildRequires: %{python_module mock} -BuildRequires: %{python_module nose} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} -BuildRequires: %{python_module virtualenv} BuildRequires: %{python_module wheel} +%if 0%{?suse_version} <= 1500 +BuildRequires: python-mock +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-six @@ -46,7 +50,8 @@ used Python libraries. %prep -%setup -q -n Paver-%{version} +%autosetup -p1 -n Paver-%{version} + rm paver/docs/.buildinfo chmod a-x paver/docs/*.* chmod a-x paver/docs/*/*.* @@ -60,7 +65,7 @@ %python_clone -a %{buildroot}%{_bindir}/paver %check -%python_exec setup.py test +%pytest %post %python_install_alternative paver ++++++ remove_external_pkgs.patch ++++++ --- a/pavement.py +++ b/pavement.py @@ -10,7 +10,7 @@ from paver.setuputils import setup options = environment.options setup(**setup_meta) - + options( minilib=Bunch( extra_files=['doctools', 'virtual'], @@ -22,7 +22,7 @@ options( sourcedir="source" ), virtualenv=Bunch( - packages_to_install=["nose", "Sphinx>=0.6b1", "docutils", "virtualenv", "six"], + packages_to_install=["Sphinx>=0.6b1", "docutils", "virtualenv", "six"], install_paver=False, script_name='bootstrap.py', paver_command_line=None, @@ -36,12 +36,12 @@ options( ) ) -# not only does paver bootstrap itself, but it should work even with just +# not only does paver bootstrap itself, but it should work even with just # distutils if paver.setuputils.has_setuptools: old_sdist = "setuptools.command.sdist" options.setup.update(dict( - test_suite='nose.collector', + test_suite='paver.tests', zip_safe=False, entry_points=""" [console_scripts] @@ -64,7 +64,7 @@ if paver.doctools.has_sphinx: destdir = path("paver") / "docs" destdir.rmtree_p() builtdocs.move(destdir) - + @task @needs('html', "minilib", "generate_setup", old_sdist) def sdist(): @@ -87,7 +87,7 @@ if paver.virtual.has_virtualenv: """import paver.command; paver.command.main()', """ """'develop'])""", dest_dir=options.virtualenv.dest_dir) - + @task def clean(): """Cleans up this paver directory. Removes the virtualenv traces and @@ -96,7 +96,7 @@ def clean(): path("bin").rmtree_p() path("lib").rmtree_p() path(".Python").remove_p() - + @task @needs("uncog") @consume_args --- a/paver/release.py +++ b/paver/release.py @@ -8,9 +8,9 @@ setup_meta=Bunch( version=VERSION, description='Easy build, distribution and deployment scripting', long_description="""Paver is a Python-based build/distribution/deployment scripting tool along the -lines of Make or Rake. What makes Paver unique is its integration with -commonly used Python libraries. Common tasks that were easy before remain -easy. More importantly, dealing with *your* applications specific needs and +lines of Make or Rake. What makes Paver unique is its integration with +commonly used Python libraries. Common tasks that were easy before remain +easy. More importantly, dealing with *your* applications specific needs and requirements is also easy.""", author='Kevin Dangoor', author_email='dangoor+pa...@gmail.com', @@ -19,7 +19,7 @@ requirements is also easy.""", url='https://github.com/paver/paver', packages=['paver', 'paver.deps'], install_requires=['six'], - tests_require=['nose', 'virtualenv', 'mock', 'cogapp'], + tests_require=['virtualenv', 'cogapp'], classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", --- a/paver/tests/test_doctools.py +++ b/paver/tests/test_doctools.py @@ -1,6 +1,6 @@ import sys -from nose.plugins.skip import SkipTest +from unittest import SkipTest from six import print_ from paver.easy import * @@ -69,7 +69,7 @@ Second one. assert str(e) == """section 'foo' redefined (in file 'None', first section at line 2, second at line 6)""", \ "error was: %s" % (str(e)) - + def test_endmarker_without_start(): myfile = """ @@ -102,7 +102,7 @@ def test_whole_file(): Hi there. Yo. """, "All was: %s" % (f.all) - + def test_bad_section(): f = doctools.SectionedFile(from_string="") try: @@ -112,7 +112,7 @@ def test_bad_section(): e = sys.exc_info()[1] assert str(e) == "No section 'foo' in file 'None'", \ "Error: '%s'" % (str(e)) - + def test_include_lookup(): basedir = path(__file__).dirname() / "data" include = doctools.Includer(basedir, include_markers={}) @@ -130,7 +130,7 @@ print "Hi!" assert second == """# section 'second.inner' in file 't2.py' print sys.path """, "Second was '%s'" % (second) - + def test_cogging(): if not paver.doctools.has_cog: raise SkipTest("Cog must be installed for this test") @@ -153,7 +153,7 @@ def test_cogging(): with open(textfile) as f: data = f.read() assert "print sys.path" not in data - + def test_cogging_with_markers_removed(): if not paver.doctools.has_cog: raise SkipTest("Cog must be installed for this test") --- a/paver/tests/test_git.py +++ b/paver/tests/test_git.py @@ -1,36 +1,44 @@ -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from paver import git import os + @patch('paver.git.sh') def test_simple_clone(sh): git.clone("git://foo/foo.git", "bar") assert sh.called assert sh.call_args[0][0] == "git clone git://foo/foo.git bar" + @patch('paver.git.sh') def test_simple_pull(sh): git.pull("repo_path", "origin_remote", "master_branch") assert sh.called assert sh.call_args[0][0] == "cd repo_path; git pull origin_remote master_branch" + @patch('paver.git.sh') def test_simple_branch_checkout(sh): git.branch_checkout("my_branch", path="repo_path") assert sh.called assert sh.call_args[0][0] == "cd repo_path; git checkout my_branch" - + + @patch('paver.git.sh') def test_branch_chekout_cwd(sh): """it should get the CWD and assume that is the repo""" - + git.branch_checkout("my_branch") assert sh.called assert sh.call_args[0][0] == "cd %(current_path)s; git checkout my_branch" % dict( current_path=os.getcwd() ) - + + @patch('paver.git.sh') def test_branch_list_correctly_parses_git_output(sh): output = git.branch_list(path="repo_path", __override__=""" @@ -38,27 +46,29 @@ def test_branch_list_correctly_parses_gi master virtualenv_in_folder """) - + assert output == ("git_support", ["git_support", "master", "virtualenv_in_folder"]) - + + @patch('paver.git.sh') def test_branch_list_correctly_parses_remote_branch_output(sh): - output = git.branch_list(path="repo_path", + output = git.branch_list(path="repo_path", remote_branches_only = True, __override__=""" github/gh-pages github/git_support github/master""") - + assert output == ('', ["github/gh-pages", "github/git_support", "github/master"]) + @patch('paver.git.sh') def test_branch_track_remote(sh): git.branch_track_remote("origin/alpha_two", path="repo_path") - + assert sh.called assert sh.call_args[0][0] == "cd %(current_path)s; git checkout -b alpha_two --track origin/alpha_two" % dict( current_path="repo_path" ) - + --- a/paver/tests/test_hg.py +++ b/paver/tests/test_hg.py @@ -1,4 +1,7 @@ -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from paver import hg @@ -79,4 +82,3 @@ def test_branches_with_closed(sh): assert current_branch == 'tag1' assert branches == ['branch1', 'branch2'] - --- a/paver/tests/test_shell.py +++ b/paver/tests/test_shell.py @@ -1,6 +1,9 @@ import sys from six import b -from mock import patch, Mock +try: + from unittest.mock import patch +except ImportError: + from mock import patch from paver import easy from subprocess import PIPE, STDOUT --- a/paver/tests/test_svn.py +++ b/paver/tests/test_svn.py @@ -1,4 +1,7 @@ -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from paver import svn @patch('paver.svn.sh') @@ -59,4 +62,4 @@ Last Changed Date: 2008-04-10 11:44:52 - assert output.path == "dojotoolkit/dojo" assert output.url == "http://svn.dojotoolkit.org/src/dojo/trunk"; assert output.last_changed_date == "2008-04-10 11:44:52 -0400 (Thu, 10 Apr 2008)" - + _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
