diff --git a/no-python2.patch b/no-python2.patch deleted file mode 100644 index 8bca4aa..0000000 --- a/no-python2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: plumbum-1.6.9/tests/test_local.py -=================================================================== ---- plumbum-1.6.9.orig/tests/test_local.py -+++ plumbum-1.6.9/tests/test_local.py -@@ -966,7 +966,7 @@ class TestLocalEncoding: - - name = self.richstr + six.str("_program") - with open(name, 'w') as f: -- f.write("#!/usr/bin/env python\nprint('yes')") -+ f.write("#!{}\nprint('yes')".format(sys.executable)) - - st = os.stat(name) - os.chmod(name, st.st_mode | stat.S_IEXEC) diff --git a/plumbum-1.7.2.tar.gz b/plumbum-1.7.2.tar.gz new file mode 100644 index 0000000..14c2346 --- /dev/null +++ b/plumbum-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa82147485b7346509ba30c64a19b4204b994b15a0f056ab007505ea087fd2e2 +size 317365 diff --git a/python-plumbum.changes b/python-plumbum.changes index a61cb1c..4a44499 100644 --- a/python-plumbum.changes +++ b/python-plumbum.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Jan 19 22:56:55 UTC 2022 - Ben Greiner + +- Update to 1.7.2 + * This is the final release for Python 2 and 3.5. + * Some DeprecationWarnings changed to FutureWarnings (#567) +- Version 1.7.1 + * Paths: glob with local paths no longer expands the existing + path too (#552) + * Paramiko: support reverse tunnels (#562) + * SSHMachine: support forwarding Unix sockets in .tunnel() (#550) + * CLI: Support COLOR_GROUP_TITLES (#553) + * Fix a deprecated in Python 3.10 warning (#563) + * Extended testing and checking on Python 3.10 and various PyPy + versions. Nox is supported for easier new-user development. +- Version 1.7.0 + * Commands: support .with_cwd() (#513) + * Commands: make iter_lines deal with decoding errors during + iteration (#525) + * Commands: fix handling of env-vars passed to plumbum + BoundEnvCommands (#513) + * Paths: fix incorrect __getitem__ method in Path (#506) + * Paths: Remote path stat had odd OSError (#505) + * Paths: Fix RemotePath.copy() (#527) + * Paths: missing __fspath__ added (#498) + * SSH: better error reporting on SshSession error (#515) + * Internal: redesigned CI, major cleanup to setuptools + distribution, Black formatting, style checking throughout. + * If you install from the auto-generated tarball for Git + releases, you should either use + SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} pip install . (where + pkgver is the package version, 1.7.0 in this case), or (not + recommended) install setuptools_scm before running + SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} python setup.py + install. PyPI SDists have the version file already, and git + checkouts will get the version from git tags. +- Drop no-python2.patch merged upstream + ------------------------------------------------------------------- Mon Apr 27 07:26:40 UTC 2020 - Tomáš Chvátal diff --git a/python-plumbum.spec b/python-plumbum.spec index 9ad0222..2abe6db 100644 --- a/python-plumbum.spec +++ b/python-plumbum.spec @@ -1,7 +1,7 @@ # # spec file for package python-plumbum # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-plumbum -Version: 1.6.9 +Version: 1.7.2 Release: 0 Summary: Shell combinators library License: MIT URL: https://github.com/tomerfiliba/plumbum -Source: https://github.com/tomerfiliba/plumbum/archive/v%{version}.tar.gz -Patch0: no-python2.patch +Source: https://github.com/tomerfiliba/plumbum/archive/v%{version}.tar.gz#/plumbum-%{version}.tar.gz +BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -32,8 +32,8 @@ BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module paramiko} BuildRequires: %{python_module psutil} -BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest-mock} +BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest} BuildRequires: openssh BuildRequires: sudo @@ -51,25 +51,27 @@ application toolkit. %prep %setup -q -n plumbum-%{version} -%patch0 -p1 -# remote tests won't work in OBS -rm tests/test_remote.py +sed -i '/addopts/d' setup.cfg %build +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %python_build %install +export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check export LANG=en_US.UTF8 -# the skipped tests need running local SSH server or root privs -%pytest -k 'not (test_iterdir or test_iter_lines_timeout or test_iter_lines_error or test_atomic_file2 or test_pid_file or test_atomic_counter or test_as_user or test_copy_move_delete)' +# timeouts too fast on obs +donttest="test_iter_lines_line_timeout" +%pytest --ignore tests/test_remote.py -k "not ($donttest)" %files %{python_files} %doc README.rst %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/plumbum +%{python_sitelib}/plumbum-%{version}*-info %changelog diff --git a/v1.6.9.tar.gz b/v1.6.9.tar.gz deleted file mode 100644 index e651247..0000000 --- a/v1.6.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f3b5db1ab309d5cff5ba04a2335d522c6e5eb019b910938685b08800af006c9 -size 311240