October 2017 - openSUSE Commits - openSUSE Mailing Lists

commit acl for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package acl for openSUSE:Factory checked in at 2017-10-02 16:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acl (Old) and /work/SRC/openSUSE:Factory/.acl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "acl" Mon Oct 2 16:43:33 2017 rev:44 rq:528598 version:2.2.52 Changes: -------- --- /work/SRC/openSUSE:Factory/acl/acl.changes 2017-06-05 18:49:05.739759462 +0200 +++ /work/SRC/openSUSE:Factory/.acl.new/acl.changes 2017-10-02 16:43:35.403803007 +0200 @@ -1,0 +2,5 @@ +Sun Sep 24 08:30:07 UTC 2017 - coolo(a)suse.com + +- refresh acl-2.2.52-tests.patch to work with perl 5.26 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acl-2.2.52-tests.patch ++++++ --- /var/tmp/diff_new_pack.zx8nqX/_old 2017-10-02 16:43:36.331672551 +0200 +++ /var/tmp/diff_new_pack.zx8nqX/_new 2017-10-02 16:43:36.335671989 +0200 @@ -9,11 +9,11 @@ test/root/setfacl.test | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/test/root/permissions.test b/test/root/permissions.test -index afaf5f0..4880bd2 100644 ---- a/test/root/permissions.test -+++ b/test/root/permissions.test -@@ -20,7 +20,7 @@ defined permissions. +Index: acl-2.2.52/test/root/permissions.test +=================================================================== +--- acl-2.2.52.orig/test/root/permissions.test ++++ acl-2.2.52/test/root/permissions.test +@@ -19,7 +19,7 @@ defined permissions. $ cd d $ umask 027 $ touch f @@ -22,7 +22,7 @@ > -rw-r----- root root -@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this +@@ -39,7 +39,7 @@ Now, change the ownership of the file to gives user bin write access. $ chown bin:bin f @@ -31,7 +31,7 @@ > -rw-r----- bin bin $ su bin $ echo bin >> f -@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. +@@ -256,12 +256,12 @@ directories if the file has an ACL and o $ mkdir -m 600 x $ chown daemon:daemon x $ echo j > x/j @@ -46,11 +46,11 @@ > -rw-r----- root root (With the bug this gives: `ls: x/j: Permission denied'.) -diff --git a/test/root/restore.test b/test/root/restore.test -index 6003cd4..5dbf73c 100644 ---- a/test/root/restore.test -+++ b/test/root/restore.test -@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes +Index: acl-2.2.52/test/root/restore.test +=================================================================== +--- acl-2.2.52.orig/test/root/restore.test ++++ acl-2.2.52/test/root/restore.test +@@ -21,7 +21,7 @@ Cry immediately if we are not running as $ chown bin passwd $ chmod u+s passwd $ setfacl --restore passwd.acl @@ -59,11 +59,11 @@ > -rwsr-xr-x root root $ rm passwd passwd.acl -diff --git a/test/root/setfacl.test b/test/root/setfacl.test -index 630e9fb..dd7fe08 100644 ---- a/test/root/setfacl.test -+++ b/test/root/setfacl.test -@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support. +Index: acl-2.2.52/test/root/setfacl.test +=================================================================== +--- acl-2.2.52.orig/test/root/setfacl.test ++++ acl-2.2.52/test/root/setfacl.test +@@ -12,7 +12,7 @@ Cry immediately if we are not running as $ sg bin $ umask 027 $ touch g @@ -72,7 +72,16 @@ > -rw-r----- $ setfacl -m m:- g --- -1.7.1 - - +Index: acl-2.2.52/test/run +=================================================================== +--- acl-2.2.52.orig/test/run ++++ acl-2.2.52/test/run +@@ -92,7 +92,7 @@ for (;;) { + if (defined $line) { + # Substitute %VAR and %{VAR} with environment variables. + $line =~ s[%(\w+)][$ENV{$1}]eg; +- $line =~ s[%{(\w+)}][$ENV{$1}]eg; ++ $line =~ s[%\{(\w+)}][$ENV{$1}]eg; + } + if (defined $line) { + if ($line =~ s/^\s*< ?//) {

1 0

commit console-setup for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package console-setup for openSUSE:Factory checked in at 2017-10-02 16:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/console-setup (Old) and /work/SRC/openSUSE:Factory/.console-setup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "console-setup" Mon Oct 2 16:43:24 2017 rev:4 rq:528597 version:1.134 Changes: -------- --- /work/SRC/openSUSE:Factory/console-setup/console-setup.changes 2016-02-09 13:30:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.console-setup.new/console-setup.changes 2017-10-02 16:43:28.416785358 +0200 @@ -1,0 +2,6 @@ +Sun Sep 24 08:50:06 UTC 2017 - coolo(a)suse.com + +- add console-setup-1.134-perl526.patch to work with perl 5.26, + fixed upstream in 1.143 + +------------------------------------------------------------------- New: ---- console-setup-1.134-perl526.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ console-setup.spec ++++++ --- /var/tmp/diff_new_pack.MooDjr/_old 2017-10-02 16:43:30.036557623 +0200 +++ /var/tmp/diff_new_pack.MooDjr/_new 2017-10-02 16:43:30.040557061 +0200 @@ -1,7 +1,7 @@ # # spec file for package console-setup # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -28,6 +28,8 @@ Patch0: console-setup-1.76-paths.patch # Fixes FSF address, sent to upstream Patch1: console-setup-1.76-fsf-address.patch +# Backport fix from 1.143 +Patch2: console-setup-1.134-perl526.patch BuildRequires: perl BuildRequires: perl(encoding) @@ -46,6 +48,7 @@ %setup -q %patch0 -p1 -b .paths %patch1 -p1 -b .fsf-address +%patch2 -p1 -b .perl526 %build make build-linux ++++++ console-setup-1.134-perl526.patch ++++++ Index: console-setup-1.134/Keyboard/compose_translator =================================================================== --- console-setup-1.134.orig/Keyboard/compose_translator +++ console-setup-1.134/Keyboard/compose_translator @@ -19,7 +19,7 @@ use warnings 'all'; use strict; -use encoding 'utf8'; +use utf8; binmode STDOUT, ':bytes'; sub debug {

1 0

commit pesign-obs-integration for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package pesign-obs-integration for openSUSE:Factory checked in at 2017-10-02 16:43:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pesign-obs-integration (Old) and /work/SRC/openSUSE:Factory/.pesign-obs-integration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pesign-obs-integration" Mon Oct 2 16:43:16 2017 rev:23 rq:528596 version:10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pesign-obs-integration/pesign-obs-integration.changes 2017-09-18 19:52:37.490647494 +0200 +++ /work/SRC/openSUSE:Factory/.pesign-obs-integration.new/pesign-obs-integration.changes 2017-10-02 16:43:17.354340698 +0200 @@ -1,0 +2,5 @@ +Sun Sep 24 09:20:31 UTC 2017 - coolo(a)suse.com + +- escape regexp in pesign-gen-repackage-spec for perl 5.26 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pesign-gen-repackage-spec ++++++ --- /var/tmp/diff_new_pack.89lc5L/_old 2017-10-02 16:43:18.202221490 +0200 +++ /var/tmp/diff_new_pack.89lc5L/_new 2017-10-02 16:43:18.202221490 +0200 @@ -487,7 +487,7 @@ open(my $fh, '<', $cert_subpackage) or die "$cert_subpackage: $!\n"; my $template = <$fh>; close($fh); - $template =~ s/\%{-n\*}/$kmp_basename/g; + $template =~ s/\%\{-n\*}/$kmp_basename/g; $template =~ s/\@CERTS\@/$certs/g; print SPEC $template; }

1 0

commit python-setuptools_scm for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package python-setuptools_scm for openSUSE:Factory checked in at 2017-10-02 16:43:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-setuptools_scm (Old) and /work/SRC/openSUSE:Factory/.python-setuptools_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-setuptools_scm" Mon Oct 2 16:43:11 2017 rev:9 rq:528594 version:1.15.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-setuptools_scm/python-setuptools_scm.changes 2017-07-04 11:57:58.236946708 +0200 +++ /work/SRC/openSUSE:Factory/.python-setuptools_scm.new/python-setuptools_scm.changes 2017-10-02 16:43:12.551016028 +0200 @@ -1,0 +2,37 @@ +Sun Sep 24 21:52:54 UTC 2017 - arun(a)gmx.de + +- specfile: + * removed no-generic-python.patch, included upstream + +- update to version 1.15.6: + * fix #174 by normalizing windows path using windows apis + +- changes from version 1.15.6: + * fix #171 by unpinning the py version to allow a fixed one to get + installed + +- changes from version 1.15.5: + * fix #167 by correctly respecting preformatted version metadata + from PKG-INFO/EGG-INFO + +- changes from version 1.15.4: + * fix issue #164: iterate all found entry points to avoid erros when + pip remakes egg-info + * enhance self-use to enable pip install from github again + +- changes from version 1.15.3: + * bring back correctly getting our version in the own sdist, + finalizes #114 + * fix issue #150: strip local components of tags + +- changes from version 1.15.2: + * fix issue #128: return None when a scm specific parse fails in a + worktree to ease parse reuse + +- changes from version 1.15.1: + * fix issue #126: the local part of any tags is discarded when + guessing new versions + * minor performance optimization by doing fewer git calls in the + usual cases + +------------------------------------------------------------------- Old: ---- no-generic-python.patch setuptools_scm-1.15.0.tar.gz New: ---- setuptools_scm-1.15.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setuptools_scm.spec ++++++ --- /var/tmp/diff_new_pack.y2GxIN/_old 2017-10-02 16:43:13.114936743 +0200 +++ /var/tmp/diff_new_pack.y2GxIN/_new 2017-10-02 16:43:13.118936181 +0200 @@ -19,15 +19,13 @@ %bcond_with test %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-setuptools_scm -Version: 1.15.0 +Version: 1.15.6 Release: 0 Summary: Manage your versions by scm tags License: MIT Group: Development/Languages/Python Url: https://github.com/pypa/setuptools_scm Source: https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_… -# PATCH-FIX-UPSTREAM use sys.executable for running python in test_regressions.py -Patch0: no-generic-python.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros @@ -51,7 +49,6 @@ %prep %setup -q -n setuptools_scm-%{version} -%patch0 -p1 %build %python_build ++++++ setuptools_scm-1.15.0.tar.gz -> setuptools_scm-1.15.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/.hgtags new/setuptools_scm-1.15.6/.hgtags --- old/setuptools_scm-1.15.0/.hgtags 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/.hgtags 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -1092123ef78598eade56aa9c57e484f3670c8da8 v1.9.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/.travis.yml new/setuptools_scm-1.15.6/.travis.yml --- old/setuptools_scm-1.15.0/.travis.yml 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/.travis.yml 2017-06-15 21:24:23.000000000 +0200 @@ -6,7 +6,7 @@ - '3.3' - '3.4' - '3.5' -- '3.6-dev' +- '3.6' env: - TOXENV=py-test @@ -16,13 +16,17 @@ env: TOXENV=flake8 - python: '3.5' env: TOXENV=flake8 + - python: '2.7' + env: SELFINSTALL=1 + - python: '3.5' + env: SELFINSTALL=1 cache: files: - $HOME/.pip/cache - $Home/.cache/pip install: pip install tox script: -- tox -e $TOXENV +- python testing/runtests_travis.py @@ -42,4 +46,4 @@ - <<: *pypi on: tags: true - distributions: "bdist_egg" \ No newline at end of file + distributions: "bdist_egg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/CHANGELOG.rst new/setuptools_scm-1.15.6/CHANGELOG.rst --- old/setuptools_scm-1.15.0/CHANGELOG.rst 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/CHANGELOG.rst 2017-06-15 21:24:23.000000000 +0200 @@ -1,3 +1,42 @@ + +v1.15.6 +======= + +* fix #171 by unpinning the py version to allow a fixed one to get installed + +v1.15.5 +======= + +* fix #167 by correctly respecting preformatted version metadata + from PKG-INFO/EGG-INFO + +v1.15.4 +======= + +* fix issue #164: iterate all found entry points to avoid erros when pip remakes egg-info +* enhance self-use to enable pip install from github again + +v1.15.3 +======= + +* bring back correctly getting our version in the own sdist, finalizes #114 +* fix issue #150: strip local components of tags + +v1.15.2 +======= + +* fix issue #128: return None when a scm specific parse fails in a worktree to ease parse reuse + + +v1.15.1 +======= + +* fix issue #126: the local part of any tags is discarded + when guessing new versions +* minor performance optimization by doing fewer git calls + in the usual cases + + v1.15.0 ======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/PKG-INFO new/setuptools_scm-1.15.6/PKG-INFO --- old/setuptools_scm-1.15.0/PKG-INFO 2016-10-20 23:55:36.000000000 +0200 +++ new/setuptools_scm-1.15.6/PKG-INFO 2017-06-15 21:24:45.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools_scm -Version: 1.15.0 +Version: 1.15.6 Summary: the blessed package to manage your versions by scm tags Home-page: https://github.com/pypa/setuptools_scm/ Author: Ronny Pfannschmidt @@ -26,7 +26,6 @@ 1. Add :code:`'setuptools_scm'` to the :code:`setup_requires` parameter 2. Add the :code:`use_scm_version` parameter and set it to ``True`` - E.g.: .. code:: python @@ -39,18 +38,47 @@ ..., ) + Arguments to ``get_version()`` (see below) may be passed as a + dictionary to ``use_scm_version``. For example: + + .. code:: python + + from setuptools import setup + setup( + ..., + use_scm_version = {"root": "..", "relative_to": __file__}, + setup_requires=['setuptools_scm'], + ..., + ) + + + 3. Access the version number in your package via :code:`pkg_resources` + + E.g. (`PEP-0396 <https://www.python.org/dev/peps/pep-0396>`_): + + .. code:: python + + from pkg_resources import get_distribution, DistributionNotFound + try: + __version__ = get_distribution(__name__).version + except DistributionNotFound: + # package is not installed + pass + Programmatic usage ------------------ - In order to use setuptools_scm from code - that one directory deeper than the project's root, you can use: + In order to use ``setuptools_scm`` from code that one directory deeper + than the project's root, you can use: .. code:: python from setuptools_scm import get_version version = get_version(root='..', relative_to=__file__) + See `setup.py Usage`_ above for how to use this within setup.py. + Usage from sphinx ----------------- @@ -61,8 +89,8 @@ .. code:: python from pkg_resources import get_distribution - release = pkg_resources('myproject').version - # for the example take major/minor + release = get_distribution('myproject').version + # for example take major/minor version = '.'.join(release.split('.')[:2]) The underlying reason is, that services like readthedocs sometimes change @@ -94,15 +122,18 @@ :code:`no distance and clean`: :code:`{tag}` :code:`distance and clean`: - :code:`{next_version}.dev{distance}+n{revision hash}` + :code:`{next_version}.dev{distance}+{scm letter}{revision hash}` :code:`no distance and not clean`: :code:`{tag}+dYYYMMMDD` :code:`distance and not clean`: - :code:`{next_version}.dev{distance}+n{revision hash}.dYYYMMMDD` + :code:`{next_version}.dev{distance}+{scm letter}{revision hash}.dYYYMMMDD` The next version is calculated by adding ``1`` to the last numeric component of the tag. + For git projects, the version relies on `git describe <https://git-scm.com/docs/git-describe>`_, + so you will see an additional ``g`` prepended to the ``{revision hash}``. + Semantic Versioning (SemVer) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/README.rst new/setuptools_scm-1.15.6/README.rst --- old/setuptools_scm-1.15.0/README.rst 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/README.rst 2017-06-15 21:24:23.000000000 +0200 @@ -18,7 +18,6 @@ 1. Add :code:`'setuptools_scm'` to the :code:`setup_requires` parameter 2. Add the :code:`use_scm_version` parameter and set it to ``True`` - E.g.: .. code:: python @@ -31,18 +30,47 @@ ..., ) + Arguments to ``get_version()`` (see below) may be passed as a + dictionary to ``use_scm_version``. For example: + + .. code:: python + + from setuptools import setup + setup( + ..., + use_scm_version = {"root": "..", "relative_to": __file__}, + setup_requires=['setuptools_scm'], + ..., + ) + + +3. Access the version number in your package via :code:`pkg_resources` + + E.g. (`PEP-0396 <https://www.python.org/dev/peps/pep-0396>`_): + + .. code:: python + + from pkg_resources import get_distribution, DistributionNotFound + try: + __version__ = get_distribution(__name__).version + except DistributionNotFound: + # package is not installed + pass + Programmatic usage ------------------ -In order to use setuptools_scm from code -that one directory deeper than the project's root, you can use: +In order to use ``setuptools_scm`` from code that one directory deeper +than the project's root, you can use: .. code:: python from setuptools_scm import get_version version = get_version(root='..', relative_to=__file__) +See `setup.py Usage`_ above for how to use this within setup.py. + Usage from sphinx ----------------- @@ -53,8 +81,8 @@ .. code:: python from pkg_resources import get_distribution - release = pkg_resources('myproject').version - # for the example take major/minor + release = get_distribution('myproject').version + # for example take major/minor version = '.'.join(release.split('.')[:2]) The underlying reason is, that services like readthedocs sometimes change @@ -86,15 +114,18 @@ :code:`no distance and clean`: :code:`{tag}` :code:`distance and clean`: - :code:`{next_version}.dev{distance}+n{revision hash}` + :code:`{next_version}.dev{distance}+{scm letter}{revision hash}` :code:`no distance and not clean`: :code:`{tag}+dYYYMMMDD` :code:`distance and not clean`: - :code:`{next_version}.dev{distance}+n{revision hash}.dYYYMMMDD` + :code:`{next_version}.dev{distance}+{scm letter}{revision hash}.dYYYMMMDD` The next version is calculated by adding ``1`` to the last numeric component of the tag. +For git projects, the version relies on `git describe <https://git-scm.com/docs/git-describe>`_, +so you will see an additional ``g`` prepended to the ``{revision hash}``. + Semantic Versioning (SemVer) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/appveyor.yml new/setuptools_scm-1.15.6/appveyor.yml --- old/setuptools_scm-1.15.0/appveyor.yml 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/appveyor.yml 2017-06-15 21:24:23.000000000 +0200 @@ -1,22 +1,22 @@ environment: matrix: - PYTHON: "C:\\Python27" - TOX_ENV: "py27" + TOX_ENV: "py-test" - PYTHON: "C:\\Python27-x64" - TOX_ENV: "py27" + TOX_ENV: "py-test" - PYTHON: "C:\\Python33" - TOX_ENV: "py33" + TOX_ENV: "py-test" - PYTHON: "C:\\Python33-x64" - TOX_ENV: "py33" + TOX_ENV: "py-test" - PYTHON: "C:\\Python34" - TOX_ENV: "py34" + TOX_ENV: "py-test" - PYTHON: "C:\\Python34-x64" - TOX_ENV: "py34" + TOX_ENV: "py-test" init: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/default.nix new/setuptools_scm-1.15.6/default.nix --- old/setuptools_scm-1.15.0/default.nix 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/default.nix 2017-06-15 21:24:23.000000000 +0200 @@ -4,6 +4,12 @@ name = "setuptools_scm"; src = ./.; version = "git"; - buildInputs = [setuptools pip pytest pkgs.git pkgs.mercurial]; + buildInputs = [ + setuptools + pip + pytest + pkgs.git + pkgs.mercurial + ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setup.cfg new/setuptools_scm-1.15.6/setup.cfg --- old/setuptools_scm-1.15.0/setup.cfg 2016-10-20 23:55:36.000000000 +0200 +++ new/setuptools_scm-1.15.6/setup.cfg 2017-06-15 21:24:45.000000000 +0200 @@ -1,6 +1,9 @@ [bdist_wheel] universal = 1 +[metadata] +license_file = LICENSE + [devpi:upload] formats = sdist,bdist_wheel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setup.py new/setuptools_scm-1.15.6/setup.py --- old/setuptools_scm-1.15.0/setup.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setup.py 2017-06-15 21:24:23.000000000 +0200 @@ -15,25 +15,39 @@ import setuptools -PROBLEMATIC_COMMANDS = 'install', 'develop', 'easy_install', 'bdist_egg' - -if not os.path.isdir('setuptools_scm.egg-info'): - print(__doc__) - - if any(c in sys.argv for c in PROBLEMATIC_COMMANDS): - sys.exit('please run `python setup.py egg_info` first') - - def scm_config(): + here = os.path.dirname(os.path.abspath(__file__)) + egg_info = os.path.join(here, 'setuptools_scm.egg-info') + has_entrypoints = os.path.isdir(egg_info) + + sys.path.insert(0, here) + from setuptools_scm.hacks import parse_pkginfo + from setuptools_scm.git import parse as parse_git from setuptools_scm.version import ( + guess_next_dev_version, get_local_node_and_date, ) - return dict( + + def parse(root): + try: + return parse_pkginfo(root) + except IOError: + return parse_git(root) + + config = dict( version_scheme=guess_next_dev_version, local_scheme=get_local_node_and_date, ) + if has_entrypoints: + return dict(use_scm_version=config) + else: + from setuptools_scm import get_version + return dict(version=get_version( + root=here, parse=parse, **config)) + + with open('README.rst') as fp: long_description = fp.read() @@ -42,8 +56,6 @@ name='setuptools_scm', url='https://github.com/pypa/setuptools_scm/', zip_safe=True, - # pass here since entrypints are not yet registred - use_scm_version=scm_config, author='Ronny Pfannschmidt', author_email='opensource(a)ronnypfannschmidt.de', description=('the blessed package to manage your versions by scm tags'), @@ -63,13 +75,10 @@ .hg = setuptools_scm.hg:parse .git = setuptools_scm.git:parse - # those are left here for backward compatibility in the 1.x series - .hg_archival.txt = setuptools_scm.hg:parse_archival - PKG-INFO = setuptools_scm.hacks:parse_pkginfo - [setuptools_scm.parse_scm_fallback] .hg_archival.txt = setuptools_scm.hg:parse_archival PKG-INFO = setuptools_scm.hacks:parse_pkginfo + pip-egg-info = setuptools_scm.hacks:parse_pip_egg_info [setuptools_scm.files_command] .hg = setuptools_scm.hg:FILES_COMMAND @@ -103,4 +112,5 @@ ) if __name__ == '__main__': + arguments.update(scm_config()) setuptools.setup(**arguments) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/__init__.py new/setuptools_scm-1.15.6/setuptools_scm/__init__.py --- old/setuptools_scm-1.15.0/setuptools_scm/__init__.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/__init__.py 2017-06-15 21:24:23.000000000 +0200 @@ -8,7 +8,7 @@ from .utils import trace from .version import format_version, meta, ScmVersion -from .discover import find_matching_entrypoint +from .discover import iter_matching_entrypoints PRETEND_KEY = 'SETUPTOOLS_SCM_PRETEND_VERSION' @@ -32,9 +32,10 @@ def _version_from_entrypoint(root, entrypoint): - ep = find_matching_entrypoint(root, entrypoint) - if ep: - return ep.load()(root) + for ep in iter_matching_entrypoints(root, entrypoint): + version = ep.load()(root) + if version: + return version def dump_version(root, version, write_to, template=None): @@ -79,7 +80,8 @@ root, 'setuptools_scm.parse_scm_fallback') else: # include fallbacks after dropping them from the main entrypoint - version = version_from_scm(root) + version = version_from_scm(root) or _version_from_entrypoint( + root, 'setuptools_scm.parse_scm_fallback') if version: return version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/discover.py new/setuptools_scm-1.15.6/setuptools_scm/discover.py --- old/setuptools_scm-1.15.0/setuptools_scm/discover.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/discover.py 2017-06-15 21:24:23.000000000 +0200 @@ -3,11 +3,11 @@ from .utils import trace -def find_matching_entrypoint(path, entrypoint): +def iter_matching_entrypoints(path, entrypoint): trace('looking for ep', entrypoint, path) for ep in iter_entry_points(entrypoint): if os.path.exists(os.path.join(path, ep.name)): if os.path.isabs(ep.name): trace('ignoring bad ep', ep) trace('found ep', ep) - return ep + yield ep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/git.py new/setuptools_scm-1.15.6/setuptools_scm/git.py --- old/setuptools_scm-1.15.0/setuptools_scm/git.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/git.py 2017-06-15 21:24:23.000000000 +0200 @@ -4,7 +4,7 @@ import warnings FILES_COMMAND = 'git ls-files' -DEFAULT_DESCRIBE = 'git describe --tags --long --match *.*' +DEFAULT_DESCRIBE = 'git describe --dirty --tags --long --match *.*' def _normalized(path): @@ -77,24 +77,37 @@ """ if not has_command('git'): return - wd = GitWorkdir(root) + + wd = GitWorkdir.from_potential_worktree(root) + if wd is None: + return if pre_parse: pre_parse(wd) - rev_node = wd.node() - dirty = wd.is_dirty() - - if rev_node is None: - return meta('0.0', distance=0, dirty=dirty) out, err, ret = do_ex(describe_command, root) if ret: + # If 'git describe' failed, try to get the information otherwise. + rev_node = wd.node() + dirty = wd.is_dirty() + + if rev_node is None: + return meta('0.0', distance=0, dirty=dirty) + return meta( '0.0', distance=wd.count_all_nodes(), - node=rev_node, + node='g' + rev_node, dirty=dirty, ) + # 'out' looks e.g. like 'v1.5.0-0-g4060507' or + # 'v1.15.1rc1-37-g9bd1298-dirty'. + if out.endswith('-dirty'): + dirty = True + out = out[:-6] + else: + dirty = False + tag, number, node = out.rsplit('-', 2) number = int(number) if number: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/hacks.py new/setuptools_scm-1.15.6/setuptools_scm/hacks.py --- old/setuptools_scm-1.15.0/setuptools_scm/hacks.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/hacks.py 2017-06-15 21:24:23.000000000 +0200 @@ -10,4 +10,15 @@ data = data_from_mime(pkginfo) version = data.get('Version') if version != 'UNKNOWN': - return meta(version) + return meta(version, preformatted=True) + + +def parse_pip_egg_info(root): + pipdir = os.path.join(root, 'pip-egg-info') + if not os.path.isdir(pipdir): + return + items = os.listdir(pipdir) + trace('pip-egg-info', pipdir, items) + if not items: + return + return parse_pkginfo(os.path.join(pipdir, items[0])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/hg.py new/setuptools_scm-1.15.6/setuptools_scm/hg.py --- old/setuptools_scm-1.15.0/setuptools_scm/hg.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/hg.py 2017-06-15 21:24:23.000000000 +0200 @@ -7,7 +7,7 @@ def _hg_tagdist_normalize_tagcommit(root, tag, dist, node): dirty = node.endswith('+') - node = node.strip('+') + node = 'h' + node.strip('+') revset = ("(branch(.) and tag({tag!r})::. and file('re:^(?!\.hgtags).*$')" " - tag({tag!r}))").format(tag=tag) if tag != '0.0': @@ -26,6 +26,8 @@ if not has_command('hg'): return l = do('hg id -i -t', root).split() + if not l: + return node = l.pop(0) tags = tags_to_versions(l) # filter tip in degraded mode on old setuptools @@ -56,14 +58,17 @@ def archival_to_version(data): trace('data', data) + node = data.get('node', '')[:12] + if node: + node = 'h' + node if 'tag' in data: return meta(data['tag']) elif 'latesttag' in data: return meta(data['latesttag'], distance=data['latesttagdistance'], - node=data['node'][:12]) + node=node) else: - return meta('0.0', node=data.get('node', '')[:12]) + return meta('0.0', node=node) def parse_archival(root): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/integration.py new/setuptools_scm-1.15.6/setuptools_scm/integration.py --- old/setuptools_scm-1.15.0/setuptools_scm/integration.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/integration.py 2017-06-15 21:24:23.000000000 +0200 @@ -2,7 +2,7 @@ from .version import _warn_if_setuptools_outdated from .utils import do -from .discover import find_matching_entrypoint +from .discover import iter_matching_entrypoints from . import get_version @@ -14,7 +14,10 @@ value = {} if getattr(value, '__call__', None): value = value() - if os.path.exists('PKG-INFO'): + # this piece of code is a hack to counter the mistake in root finding + matching_fallbacks = iter_matching_entrypoints( + '.', 'setuptools_scm.parse_scm_fallback') + if any(matching_fallbacks): value.pop('root', None) dist.metadata.version = get_version(**value) @@ -23,7 +26,8 @@ if not path: path = '.' abs = os.path.abspath(path) - ep = find_matching_entrypoint(abs, 'setuptools_scm.files_command') + ep = next(iter_matching_entrypoints( + abs, 'setuptools_scm.files_command'), None) if ep: command = ep.load() try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm/version.py new/setuptools_scm-1.15.6/setuptools_scm/version.py --- old/setuptools_scm-1.15.0/setuptools_scm/version.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm/version.py 2017-06-15 21:24:23.000000000 +0200 @@ -1,5 +1,6 @@ from __future__ import print_function import datetime +import warnings import re from .utils import trace @@ -23,6 +24,7 @@ trace('ep', (group, callable_or_name)) if isinstance(callable_or_name, str): for ep in iter_entry_points(group, callable_or_name): + trace("ep found:", ep.name) return ep.load() else: return callable_or_name @@ -30,8 +32,12 @@ def tag_to_version(tag): trace('tag', tag) + if '+' in tag: + warnings.warn("tag %r will be stripped of the local component" % tag) + tag = tag.split('+')[0] # lstrip the v because of py2/py3 differences in setuptools # also required for old versions of setuptools + version = tag.rsplit('-', 1)[-1].lstrip('v') if parse_version is None: return version @@ -49,7 +55,10 @@ class ScmVersion(object): def __init__(self, tag_version, distance=None, node=None, dirty=False, + preformatted=False, **kw): + if kw: + trace("unknown args", kw) self.tag = tag_version if dirty and distance is None: distance = 0 @@ -58,6 +67,7 @@ self.time = datetime.datetime.now() self.extra = kw self.dirty = dirty + self.preformatted = preformatted @property def exact(self): @@ -78,24 +88,45 @@ return self.format_with(dirty_format if self.dirty else clean_format) -def meta(tag, distance=None, dirty=False, node=None, **kw): +def _parse_tag(tag, preformatted): + if preformatted: + return tag if SetuptoolsVersion is None or not isinstance(tag, SetuptoolsVersion): tag = tag_to_version(tag) - trace('version', tag) + return tag + +def meta(tag, distance=None, dirty=False, node=None, preformatted=False, **kw): + tag = _parse_tag(tag, preformatted) + trace('version', tag) assert tag is not None, 'cant parse version %s' % tag - return ScmVersion(tag, distance, node, dirty, **kw) + return ScmVersion(tag, distance, node, dirty, preformatted, **kw) def guess_next_version(tag_version, distance): - version = str(tag_version) - if '.dev' in version: - prefix, tail = version.rsplit('.dev', 1) - assert tail == '0', 'own dev numbers are unsupported' - return '%s.dev%s' % (prefix, distance) - else: - prefix, tail = re.match('(.*?)(\d+)$', version).groups() - return '%s%d.dev%s' % (prefix, int(tail) + 1, distance) + version = _strip_local(str(tag_version)) + bumped = _bump_dev(version) or _bump_regex(version) + suffix = '.dev%s' % distance + return bumped + suffix + + +def _strip_local(version_string): + public, sep, local = version_string.partition('+') + return public + + +def _bump_dev(version): + if '.dev' not in version: + return + + prefix, tail = version.rsplit('.dev', 1) + assert tail == '0', 'own dev numbers are unsupported' + return prefix + + +def _bump_regex(version): + prefix, tail = re.match('(.*?)(\d+)$', version).groups() + return '%s%d' % (prefix, int(tail) + 1) def guess_next_dev_version(version): @@ -109,7 +140,7 @@ if version.exact or version.node is None: return version.format_choice("", "+d{time:%Y%m%d}") else: - return version.format_choice("+n{node}", "+n{node}.d{time:%Y%m%d}") + return version.format_choice("+{node}", "+{node}.d{time:%Y%m%d}") def get_local_dirty_tag(version): @@ -126,6 +157,8 @@ def format_version(version, **config): trace('scm version', version) trace('config', config) + if version.preformatted: + return version.tag version_scheme = callable_or_entrypoint( 'setuptools_scm.version_scheme', config['version_scheme']) local_scheme = callable_or_entrypoint( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm.egg-info/PKG-INFO new/setuptools_scm-1.15.6/setuptools_scm.egg-info/PKG-INFO --- old/setuptools_scm-1.15.0/setuptools_scm.egg-info/PKG-INFO 2016-10-20 23:55:36.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm.egg-info/PKG-INFO 2017-06-15 21:24:45.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools-scm -Version: 1.15.0 +Version: 1.15.6 Summary: the blessed package to manage your versions by scm tags Home-page: https://github.com/pypa/setuptools_scm/ Author: Ronny Pfannschmidt @@ -26,7 +26,6 @@ 1. Add :code:`'setuptools_scm'` to the :code:`setup_requires` parameter 2. Add the :code:`use_scm_version` parameter and set it to ``True`` - E.g.: .. code:: python @@ -39,18 +38,47 @@ ..., ) + Arguments to ``get_version()`` (see below) may be passed as a + dictionary to ``use_scm_version``. For example: + + .. code:: python + + from setuptools import setup + setup( + ..., + use_scm_version = {"root": "..", "relative_to": __file__}, + setup_requires=['setuptools_scm'], + ..., + ) + + + 3. Access the version number in your package via :code:`pkg_resources` + + E.g. (`PEP-0396 <https://www.python.org/dev/peps/pep-0396>`_): + + .. code:: python + + from pkg_resources import get_distribution, DistributionNotFound + try: + __version__ = get_distribution(__name__).version + except DistributionNotFound: + # package is not installed + pass + Programmatic usage ------------------ - In order to use setuptools_scm from code - that one directory deeper than the project's root, you can use: + In order to use ``setuptools_scm`` from code that one directory deeper + than the project's root, you can use: .. code:: python from setuptools_scm import get_version version = get_version(root='..', relative_to=__file__) + See `setup.py Usage`_ above for how to use this within setup.py. + Usage from sphinx ----------------- @@ -61,8 +89,8 @@ .. code:: python from pkg_resources import get_distribution - release = pkg_resources('myproject').version - # for the example take major/minor + release = get_distribution('myproject').version + # for example take major/minor version = '.'.join(release.split('.')[:2]) The underlying reason is, that services like readthedocs sometimes change @@ -94,15 +122,18 @@ :code:`no distance and clean`: :code:`{tag}` :code:`distance and clean`: - :code:`{next_version}.dev{distance}+n{revision hash}` + :code:`{next_version}.dev{distance}+{scm letter}{revision hash}` :code:`no distance and not clean`: :code:`{tag}+dYYYMMMDD` :code:`distance and not clean`: - :code:`{next_version}.dev{distance}+n{revision hash}.dYYYMMMDD` + :code:`{next_version}.dev{distance}+{scm letter}{revision hash}.dYYYMMMDD` The next version is calculated by adding ``1`` to the last numeric component of the tag. + For git projects, the version relies on `git describe <https://git-scm.com/docs/git-describe>`_, + so you will see an additional ``g`` prepended to the ``{revision hash}``. + Semantic Versioning (SemVer) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm.egg-info/SOURCES.txt new/setuptools_scm-1.15.6/setuptools_scm.egg-info/SOURCES.txt --- old/setuptools_scm-1.15.0/setuptools_scm.egg-info/SOURCES.txt 2016-10-20 23:55:36.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm.egg-info/SOURCES.txt 2017-06-15 21:24:45.000000000 +0200 @@ -1,5 +1,4 @@ .gitignore -.hgtags .travis.yml CHANGELOG.rst LICENSE @@ -25,6 +24,7 @@ setuptools_scm.egg-info/top_level.txt setuptools_scm.egg-info/zip-safe testing/conftest.py +testing/runtests_travis.py testing/test_basic_api.py testing/test_functions.py testing/test_git.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/setuptools_scm.egg-info/entry_points.txt new/setuptools_scm-1.15.6/setuptools_scm.egg-info/entry_points.txt --- old/setuptools_scm-1.15.0/setuptools_scm.egg-info/entry_points.txt 2016-10-20 23:55:36.000000000 +0200 +++ new/setuptools_scm-1.15.6/setuptools_scm.egg-info/entry_points.txt 2017-06-15 21:24:45.000000000 +0200 @@ -9,13 +9,10 @@ .hg = setuptools_scm.hg:parse .git = setuptools_scm.git:parse - # those are left here for backward compatibility in the 1.x series - .hg_archival.txt = setuptools_scm.hg:parse_archival - PKG-INFO = setuptools_scm.hacks:parse_pkginfo - [setuptools_scm.parse_scm_fallback] .hg_archival.txt = setuptools_scm.hg:parse_archival PKG-INFO = setuptools_scm.hacks:parse_pkginfo + pip-egg-info = setuptools_scm.hacks:parse_pip_egg_info [setuptools_scm.files_command] .hg = setuptools_scm.hg:FILES_COMMAND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/conftest.py new/setuptools_scm-1.15.6/testing/conftest.py --- old/setuptools_scm-1.15.0/testing/conftest.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/testing/conftest.py 2017-06-15 21:24:23.000000000 +0200 @@ -52,14 +52,26 @@ self(self.add_command) self.commit(reason=reason) - @property - def version(self): + def get_version(self, **kw): __tracebackhide__ = True from setuptools_scm import get_version - version = get_version(root=str(self.cwd)) + version = get_version(root=str(self.cwd), **kw) print(version) return version + @property + def version(self): + __tracebackhide__ = True + return self.get_version() + + +(a)pytest.yield_fixture(autouse=True) +def debug_mode(): + from setuptools_scm import utils + utils.DEBUG = True + yield + utils.DEBUG = False + @pytest.fixture def wd(tmpdir): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/runtests_travis.py new/setuptools_scm-1.15.6/testing/runtests_travis.py --- old/setuptools_scm-1.15.0/testing/runtests_travis.py 1970-01-01 01:00:00.000000000 +0100 +++ new/setuptools_scm-1.15.6/testing/runtests_travis.py 2017-06-15 21:24:23.000000000 +0200 @@ -0,0 +1,17 @@ + +from subprocess import call + +import os + +if os.environ.get('TOXENV'): + # normal tox run, lets jsut have tox do its job + import tox + tox.cmdline() +elif os.environ.get('SELFINSTALL'): + # self install testing needs some clarity + # so its being executed without any other tools running + call('python setup.py sdist', shell=True) + call('easy_install dist/*', shell=True) + import pkg_resources + dist = pkg_resources.get_distribution('setuptools_scm') + assert set(dist.version) == set(".0"), dist.version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/test_basic_api.py new/setuptools_scm-1.15.6/testing/test_basic_api.py --- old/setuptools_scm-1.15.0/testing/test_basic_api.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/testing/test_basic_api.py 2017-06-15 21:24:23.000000000 +0200 @@ -30,6 +30,9 @@ wd.write('PKG-INFO', 'Version: 0.1') assert wd.version == '0.1' + # replicate issue 167 + assert wd.get_version(version_scheme="1.{0.distance}.0".format) == '0.1' + def assert_root(monkeypatch, expected_root): """ @@ -45,9 +48,9 @@ setuptools_scm.get_version() -def test_root_parameter_pass_by(monkeypatch): - assert_root(monkeypatch, '/tmp') - setuptools_scm.get_version(root='/tmp') +def test_root_parameter_pass_by(monkeypatch, tmpdir): + assert_root(monkeypatch, tmpdir) + setuptools_scm.get_version(root=tmpdir.strpath) def test_pretended(monkeypatch): @@ -56,9 +59,9 @@ assert setuptools_scm.get_version() == pretense -def test_root_relative_to(monkeypatch): - assert_root(monkeypatch, '/tmp/alt') - __file__ = '/tmp/module/file.py' +def test_root_relative_to(monkeypatch, tmpdir): + assert_root(monkeypatch, tmpdir.join('alt').strpath) + __file__ = tmpdir.join('module/file.py').strpath setuptools_scm.get_version(root='../alt', relative_to=__file__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/test_functions.py new/setuptools_scm-1.15.6/testing/test_functions.py --- old/setuptools_scm-1.15.0/testing/test_functions.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/testing/test_functions.py 2017-06-15 21:24:23.000000000 +0200 @@ -14,6 +14,7 @@ ('1.1', '1.2.dev0'), ('1.2.dev', '1.2.dev0'), ('1.1a2', '1.1a3.dev0'), + ('23.24.post2+deadbeef', '23.24.post3.dev0'), ]) def test_next_tag(tag, expected): version = pkg_resources.parse_version(tag) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/test_git.py new/setuptools_scm-1.15.6/testing/test_git.py --- old/setuptools_scm-1.15.0/testing/test_git.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/testing/test_git.py 2017-06-15 21:24:23.000000000 +0200 @@ -19,21 +19,25 @@ assert wd.version == '0.1.dev0' wd.commit_testfile() - assert wd.version.startswith('0.1.dev1+') + assert wd.version.startswith('0.1.dev1+g') assert not wd.version.endswith('1-') wd('git tag v0.1') assert wd.version == '0.1' wd.write('test.txt', 'test2') - assert wd.version.startswith('0.2.dev0+') + assert wd.version.startswith('0.2.dev0+g') wd.commit_testfile() - assert wd.version.startswith('0.2.dev1+') + assert wd.version.startswith('0.2.dev1+g') wd('git tag version-0.2') assert wd.version.startswith('0.2') + wd.commit_testfile() + wd('git tag version-0.2.post210+gbe48adfpost3+g0cc25f2') + assert wd.version.startswith('0.2') + @pytest.mark.issue(108) @pytest.mark.issue(109) @@ -92,7 +96,13 @@ assert integration.find_files(str(wd.cwd/'project')) == [] +(a)pytest.mark.issue(128) +def test_parse_no_worktree(tmpdir): + ret = git.parse(str(tmpdir)) + assert ret is None + + def test_alphanumeric_tags_match(wd): wd.commit_testfile() wd('git tag newstyle-development-started') - assert wd.version.startswith('0.1.dev1+') + assert wd.version.startswith('0.1.dev1+g') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/test_mercurial.py new/setuptools_scm-1.15.6/testing/test_mercurial.py --- old/setuptools_scm-1.15.0/testing/test_mercurial.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/testing/test_mercurial.py 2017-06-15 21:24:23.000000000 +0200 @@ -1,5 +1,5 @@ from setuptools_scm import format_version -from setuptools_scm.hg import archival_to_version +from setuptools_scm.hg import archival_to_version, parse from setuptools_scm import integration import pytest @@ -12,9 +12,10 @@ wd.commit_command = 'hg commit -m test-{reason} -u test -d "0 0"' return wd + archival_mapping = { '1.0': {'tag': '1.0'}, - '1.1.dev3+n000000000000': { + '1.1.dev3+h000000000000': { 'latesttag': '1.0', 'latesttagdistance': '3', 'node': '0'*20, @@ -90,7 +91,7 @@ 'latesttagdistance: 3\n' ) - assert wd.version == '0.2.dev3+n000000000000' + assert wd.version == '0.2.dev3+h000000000000' @pytest.mark.issue('#72') @@ -101,3 +102,9 @@ wd.commit_testfile() wd('hg merge --tool :merge') assert wd.version is not None + + +(a)pytest.mark.issue(128) +def test_parse_no_worktree(tmpdir): + ret = parse(str(tmpdir)) + assert ret is None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/testing/test_regressions.py new/setuptools_scm-1.15.6/testing/test_regressions.py --- old/setuptools_scm-1.15.0/testing/test_regressions.py 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/testing/test_regressions.py 2017-06-15 21:24:23.000000000 +0200 @@ -1,9 +1,12 @@ import sys +import subprocess -import pytest +from setuptools_scm import get_version from setuptools_scm.git import parse from setuptools_scm.utils import do_ex, do +import pytest + def test_pkginfo_noscmroot(tmpdir, monkeypatch): """if we are indeed a sdist, the root does not apply""" @@ -16,19 +19,45 @@ 'from setuptools import setup;' 'setup(use_scm_version={"root": ".."})') - _, stderr, ret = do_ex('python setup.py --version', p) + _, stderr, ret = do_ex((sys.executable, 'setup.py', '--version'), p) assert 'setuptools-scm was unable to detect version for' in stderr assert ret == 1 p.join("PKG-INFO").write('Version: 1.0') - res = do('python setup.py --version', p) + res = do((sys.executable, 'setup.py', '--version'), p) assert res == '1.0' do('git init', p.dirpath()) - res = do('python setup.py --version', p) + res = do((sys.executable, 'setup.py', '--version'), p) assert res == '1.0' +def test_pip_egg_info(tmpdir, monkeypatch): + """if we are indeed a sdist, the root does not apply""" + + # we should get the version from pkg-info if git is broken + p = tmpdir.ensure('sub/package', dir=1) + tmpdir.mkdir('.git') + p.join('setup.py').write( + 'from setuptools import setup;' + 'setup(use_scm_version={"root": ".."})') + + with pytest.raises(LookupError): + get_version(root=p.strpath) + + p.ensure('pip-egg-info/random.egg-info/PKG-INFO').write('Version: 1.0') + assert get_version(root=p.strpath) == '1.0' + + +(a)pytest.mark.issue(164) +def test_pip_download(tmpdir, monkeypatch): + monkeypatch.chdir(tmpdir) + subprocess.check_call([ + sys.executable, '-c', + 'import pip;pip.main()', 'download', 'lz4==0.9.0', + ]) + + def test_use_scm_version_callable(tmpdir, monkeypatch): """use of callable as use_scm_version argument""" monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG") @@ -45,7 +74,7 @@ ''') p.join("PKG-INFO").write('Version: 1.0') - res = do('python setup.py --version', p) + res = do((sys.executable, 'setup.py', '--version'), p) assert res == '1.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools_scm-1.15.0/tox.ini new/setuptools_scm-1.15.6/tox.ini --- old/setuptools_scm-1.15.0/tox.ini 2016-10-20 23:55:22.000000000 +0200 +++ new/setuptools_scm-1.15.6/tox.ini 2017-06-15 21:24:23.000000000 +0200 @@ -8,7 +8,6 @@ [testenv] usedevelop=True deps= - py==1.4.26 pytest commands= test: py.test []

1 0

commit latex2html for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package latex2html for openSUSE:Factory checked in at 2017-10-02 16:43:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/latex2html (Old) and /work/SRC/openSUSE:Factory/.latex2html.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "latex2html" Mon Oct 2 16:43:07 2017 rev:34 rq:528581 version:2017.2 Changes: -------- --- /work/SRC/openSUSE:Factory/latex2html/latex2html.changes 2017-07-11 08:23:55.475702285 +0200 +++ /work/SRC/openSUSE:Factory/.latex2html.new/latex2html.changes 2017-10-02 16:43:11.627145921 +0200 @@ -1,0 +2,5 @@ +Sun Sep 24 09:32:42 UTC 2017 - coolo(a)suse.com + +- add latex2html-perl526.patch to work with perl 5.26 + +------------------------------------------------------------------- New: ---- latex2html-perl526.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ latex2html.spec ++++++ --- /var/tmp/diff_new_pack.NVMhvp/_old 2017-10-02 16:43:12.267055952 +0200 +++ /var/tmp/diff_new_pack.NVMhvp/_new 2017-10-02 16:43:12.267055952 +0200 @@ -35,6 +35,7 @@ Patch2: latex2html-dest-dir.diff Patch3: latex2html-binmode.diff Patch4: latex2html-backref-workaround.diff +Patch5: latex2html-perl526.patch BuildRequires: fdupes BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-x11 @@ -79,6 +80,7 @@ %patch2 %patch3 %patch4 +%patch5 -p1 cp %{SOURCE2} README.SUSE cp %{SOURCE4} . ++++++ latex2html-perl526.patch ++++++ Index: latex2html-2017.2/versions/html3_2.pl =================================================================== --- latex2html-2017.2.orig/versions/html3_2.pl +++ latex2html-2017.2/versions/html3_2.pl @@ -607,7 +607,7 @@ sub process_tabular { if ($color_env) { local($color_test) = join(',',@$open_tags_R); - if ($color_test =~ /(color{[^}]*})/g ) { + if ($color_test =~ /(color\{[^}]*})/g ) { $color_env = $1; } } Index: latex2html-2017.2/versions/html4_01.pl =================================================================== --- latex2html-2017.2.orig/versions/html4_01.pl +++ latex2html-2017.2/versions/html4_01.pl @@ -976,7 +976,7 @@ sub process_tabular { if ($color_env) { local($color_test) = join(',',@$open_tags_R); - if ($color_test =~ /(color{[^}]*})/g ) { + if ($color_test =~ /(color\{[^}]*})/g ) { $color_env = $1; } } Index: latex2html-2017.2/versions/html4_1.pl =================================================================== --- latex2html-2017.2.orig/versions/html4_1.pl +++ latex2html-2017.2/versions/html4_1.pl @@ -976,7 +976,7 @@ sub process_tabular { if ($color_env) { local($color_test) = join(',',@$open_tags_R); - if ($color_test =~ /(color{[^}]*})/g ) { + if ($color_test =~ /(color\{[^}]*})/g ) { $color_env = $1; } } Index: latex2html-2017.2/configure =================================================================== --- latex2html-2017.2.orig/configure +++ latex2html-2017.2/configure @@ -1225,7 +1225,7 @@ if test "$?" != "0"; then fi # this is used to get the values from the config file -eval `perl -w -e 'use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'` +eval `perl -w -e 'use lib q[.]; use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'` Index: latex2html-2017.2/latex2html.pin =================================================================== --- latex2html-2017.2.orig/latex2html.pin +++ latex2html-2017.2/latex2html.pin @@ -123,7 +123,7 @@ if($ENV{'L2HCONFIG'}) { require $ENV{'L2HCONFIG'} || die "Fatal (require $ENV{'L2HCONFIG'}): $!"; } else { - eval 'use l2hconf'; + eval 'use lib "."; use l2hconf'; if($@) { die "Fatal (use l2hconf): $@\n"; } @@ -1922,7 +1922,7 @@ sub mark_string { } $_[0] = join('',$before,"\{",$after) if($change); # MRO: mark one opening brace - if($_[0] =~ s/^([^{]*){/push(@processedB,$1);join('',$O,++$id,$C)/eos) { + if($_[0] =~ s/^([^{]*)\{/push(@processedB,$1);join('',$O,++$id,$C)/eos) { $before=''; $after=$'; } if ($after =~ /\}/) { Index: latex2html-2017.2/config/build.pl =================================================================== --- latex2html-2017.2.orig/config/build.pl +++ latex2html-2017.2/config/build.pl @@ -145,6 +145,7 @@ my ($VERSION) = q$Revision: 1.6 $ =~ /:\ # Read in the system's configuration use FindBin; use lib "$FindBin::Bin/.."; +use lib "$FindBin::Bin"; use cfgcache; my $dd = $cfg{'dd'}; Index: latex2html-2017.2/config/config.pl =================================================================== --- latex2html-2017.2.orig/config/config.pl +++ latex2html-2017.2/config/config.pl @@ -435,6 +435,7 @@ use IO::File; use FindBin; use lib "$FindBin::Bin/.."; +use lib "$FindBin::Bin"; use L2hos; #use diagnostics; Index: latex2html-2017.2/config/install.pl =================================================================== --- latex2html-2017.2.orig/config/install.pl +++ latex2html-2017.2/config/install.pl @@ -183,6 +183,7 @@ my ($VERSION) = q$Revision: 1.12 $ =~ /: use FindBin; use lib "$FindBin::Bin/.."; +use lib "$FindBin::Bin"; use cfgcache; use L2hos;

1 0

commit perl for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package perl for openSUSE:Factory checked in at 2017-10-02 16:43:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl (Old) and /work/SRC/openSUSE:Factory/.perl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl" Mon Oct 2 16:43:01 2017 rev:104 rq:528515 version:5.26.1 Changes: -------- --- /work/SRC/openSUSE:Factory/perl/perl.changes 2017-05-24 16:45:53.596355154 +0200 +++ /work/SRC/openSUSE:Factory/.perl.new/perl.changes 2017-10-02 16:43:10.339326983 +0200 @@ -1,0 +2,26 @@ +Sat Sep 23 10:40:59 UTC 2017 - coolo(a)suse.com + +- update to perl-5.26.1 + * [CVE-2017-12837] Heap buffer overflow in regular expression compiler + * [CVE-2017-12883] Buffer over-read in regular expression parser + * tons of bug fixes +- update list of obsoletes + +------------------------------------------------------------------- +Wed Aug 30 14:44:49 CEST 2017 - mls(a)suse.de + +- update to perl-5.26.0 + * "." no longer in @INC + * "do" may now warn + * regexp: a literal left brace "{" should be escaped + * lexical subroutines are no longer experimental + * indented Here-documents + * new regular expression modifier /xx + * declaring a reference to a variable + * unicode 9.0 is now supported + * new Hash Function For 64-bit Builds +- rename perl-5.24.0.dif to perl-5.26.0.dif +- remove obsolete perl-avoid-warnings.patch +- remove obsolete Compress-Raw-Zlib-2.071-zlib-1.2.11.patch + +------------------------------------------------------------------- Old: ---- Compress-Raw-Zlib-2.071-zlib-1.2.11.patch perl-5.24.0.dif perl-5.24.1.tar.xz perl-avoid-warnings.patch New: ---- perl-5.26.0.dif perl-5.26.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl.spec ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.223202714 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.227202151 +0200 @@ -21,16 +21,16 @@ Summary: The Perl interpreter License: Artistic-1.0 or GPL-2.0+ Group: Development/Languages/Perl -Version: 5.24.1 +Version: 5.26.1 Release: 0 -%define pversion 5.24.1 +%define pversion 5.26.1 Url: http://www.perl.org/ Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.xz Source1: %name-rpmlintrc Source2: macros.perl Source3: README.macros Source4: baselibs.conf -Patch0: perl-5.24.0.dif +Patch0: perl-5.26.0.dif Patch2: perl-regexp-refoverflow.diff Patch3: perl-nroff.diff Patch4: perl-netcmdutf8.diff @@ -41,10 +41,6 @@ Patch8: skip_time_hires.patch Patch9: perl-incfix.diff Patch11: perl-5.18.2-overflow.diff -# PATCH-FIX-UPSTREAM Fix a warning in cop.h , upstream commit f2b9631d5d19d2b71c1776e1193173d13f3620bf -Patch12: perl-avoid-warnings.patch -# PATCH-FIX-UPSTREAM RT#119762 -Patch13: Compress-Raw-Zlib-2.071-zlib-1.2.11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: perl-base = %version #PreReq: %fillup_prereq @@ -63,60 +59,60 @@ Provides: perl-500 Provides: perl(:MODULE_COMPAT_%pversion) %global versionlist %nil -Provides: perl-Filter-Simple = 0.92 -Obsoletes: perl-Filter-Simple <= 0.92 -Provides: perl-I18N-LangTags = 0.40 -Obsoletes: perl-I18N-LangTags <= 0.40 +Provides: perl-Filter-Simple = 0.93 +Obsoletes: perl-Filter-Simple <= 0.93 +Provides: perl-I18N-LangTags = 0.42 +Obsoletes: perl-I18N-LangTags <= 0.42 Provides: perl-MIME-Base64 = 3.15 Obsoletes: perl-MIME-Base64 <= 3.15 -Provides: perl-Storable = 2.56 -Obsoletes: perl-Storable <= 2.56 -Provides: perl-Test-Simple = 1.001014 -Obsoletes: perl-Test-Simple <= 1.001014 +Provides: perl-Storable = 2.62 +Obsoletes: perl-Storable <= 2.62 +Provides: perl-Test-Simple = 1.302073 +Obsoletes: perl-Test-Simple <= 1.302073 Provides: perl-Text-Balanced = 2.03 Obsoletes: perl-Text-Balanced <= 2.03 -Provides: perl-Time-HiRes = 1.9733 -Obsoletes: perl-Time-HiRes <= 1.9733 +Provides: perl-Time-HiRes = 1.9741 +Obsoletes: perl-Time-HiRes <= 1.9741 Provides: perl-libnet = 3.08 Obsoletes: perl-libnet <= 3.08 -Provides: perl-Compress-Raw-Zlib = 2.069 -Obsoletes: perl-Compress-Raw-Zlib <= 2.069 -Provides: perl-Compress-Zlib = 2.069 -Obsoletes: perl-Compress-Zlib <= 2.069 -Provides: perl-IO-Compress-Base = 2.069 -Obsoletes: perl-IO-Compress-Base <= 2.069 -Provides: perl-IO-Compress-Zlib = 2.069 -Obsoletes: perl-IO-Compress-Zlib <= 2.069 +Provides: perl-Compress-Raw-Zlib = 2.074 +Obsoletes: perl-Compress-Raw-Zlib <= 2.074 +Provides: perl-Compress-Zlib = 2.074 +Obsoletes: perl-Compress-Zlib <= 2.074 +Provides: perl-IO-Compress-Base = 2.074 +Obsoletes: perl-IO-Compress-Base <= 2.074 +Provides: perl-IO-Compress-Zlib = 2.074 +Obsoletes: perl-IO-Compress-Zlib <= 2.074 Provides: perl-IO-Zlib = 1.10 Obsoletes: perl-IO-Zlib <= 1.10 -Provides: perl-Archive-Tar = 2.04 -Obsoletes: perl-Archive-Tar <= 2.04 +Provides: perl-Archive-Tar = 2.24 +Obsoletes: perl-Archive-Tar <= 2.24 Provides: perl-Locale-Maketext-Simple = 0.21 Obsoletes: perl-Locale-Maketext-Simple <= 0.21 Provides: perl-Pod-Escapes = 1.07 Obsoletes: perl-Pod-Escapes <= 1.07 -Provides: perl-Pod-Simple = 3.32 -Obsoletes: perl-Pod-Simple <= 3.32 -Provides: perl-ExtUtils-ParseXS = 3.31 -Obsoletes: perl-ExtUtils-ParseXS <= 3.31 -Provides: perl-CPAN-Meta = 2.150005 -Obsoletes: perl-CPAN-Meta <= 2.150005 +Provides: perl-Pod-Simple = 3.35 +Obsoletes: perl-Pod-Simple <= 3.35 +Provides: perl-ExtUtils-ParseXS = 3.34 +Obsoletes: perl-ExtUtils-ParseXS <= 3.34 +Provides: perl-CPAN-Meta = 2.150010 +Obsoletes: perl-CPAN-Meta <= 2.150010 Provides: perl-CPAN-Meta-YAML = 0.018 Obsoletes: perl-CPAN-Meta-YAML <= 0.018 Provides: perl-ExtUtils-CBuilder = 0.280225 Obsoletes: perl-ExtUtils-CBuilder <= 0.280225 -Provides: perl-IO-Socket-IP = 0.37 -Obsoletes: perl-IO-Socket-IP <= 0.37 +Provides: perl-IO-Socket-IP = 0.38 +Obsoletes: perl-IO-Socket-IP <= 0.38 Provides: perl-Parse-CPAN-Meta = 1.4417 Obsoletes: perl-Parse-CPAN-Meta <= 1.4417 Provides: perl-PathTools = 3.63 Obsoletes: perl-PathTools <= 3.63 Provides: perl-autodie = 2.29 Obsoletes: perl-autodie <= 2.29 -Provides: perl-Test-Harness = 3.36 -Obsoletes: perl-Test-Harness <= 3.36 -Provides: perl-version = 0.9916 -Obsoletes: perl-version <= 0.9916 +Provides: perl-Test-Harness = 3.38 +Obsoletes: perl-Test-Harness <= 3.38 +Provides: perl-version = 0.9917 +Obsoletes: perl-version <= 0.9917 %description perl - Practical Extraction and Report Language @@ -186,8 +182,6 @@ %endif %patch9 %patch11 -%patch12 -p1 -%patch13 -p1 %build cp -a lib savelib ++++++ perl-5.22.0_wrong_rpm_provides.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.307190905 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.311190343 +0200 @@ -1,10 +1,8 @@ -Index: cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm -=================================================================== ---- cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm.orig -+++ cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm -@@ -7,7 +7,8 @@ use warnings; - our $VERSION = '1.999715'; - $VERSION = eval $VERSION; +--- ./cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm 2017-08-30 12:16:04.561183753 +0000 +@@ -6,7 +6,8 @@ use warnings; + + our $VERSION = '1.999806'; -package Math::BigInt; +package Math::BigInt # line break to prevent wrong rpm provides @@ -12,10 +10,8 @@ # See SYNOPSIS below. -Index: lib/sigtrap.pm -=================================================================== ---- lib/sigtrap.pm.orig -+++ lib/sigtrap.pm +--- ./lib/sigtrap.pm.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./lib/sigtrap.pm 2017-08-30 12:16:04.561183753 +0000 @@ -80,7 +80,8 @@ sub handler_die { } ++++++ perl-5.24.0.dif -> perl-5.26.0.dif ++++++ ++++ 718 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/perl/perl-5.24.0.dif ++++ and /work/SRC/openSUSE:Factory/.perl.new/perl-5.26.0.dif ++++++ perl-5.24.1.tar.xz -> perl-5.26.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/perl/perl-5.24.1.tar.xz /work/SRC/openSUSE:Factory/.perl.new/perl-5.26.1.tar.xz differ: char 26, line 1 ++++++ perl-HiRes.t-timeout.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.375181346 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.375181346 +0200 @@ -1,8 +1,6 @@ -Index: dist/Time-HiRes/t/alarm.t -=================================================================== ---- dist/Time-HiRes/t/alarm.t.orig -+++ dist/Time-HiRes/t/alarm.t -@@ -7,7 +7,7 @@ BEGIN { require_ok "Time::HiRes"; } +--- ./dist/Time-HiRes/t/alarm.t.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./dist/Time-HiRes/t/alarm.t 2017-08-30 12:15:18.729183834 +0000 +@@ -8,7 +8,7 @@ BEGIN { require_ok "Time::HiRes"; } use Config; @@ -10,12 +8,10 @@ +my $limit = 0.60; # 25% is acceptable slosh for testing timers my $xdefine = ''; - if (open(XDEFINE, "xdefine")) { -Index: dist/Time-HiRes/t/clock.t -=================================================================== ---- dist/Time-HiRes/t/clock.t.orig -+++ dist/Time-HiRes/t/clock.t -@@ -28,7 +28,7 @@ note sprintf "have_clock = %d" + if (open(XDEFINE, "<", "xdefine")) { +--- ./dist/Time-HiRes/t/clock.t.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./dist/Time-HiRes/t/clock.t 2017-08-30 12:15:18.729183834 +0000 +@@ -29,7 +29,7 @@ printf("# have_clock = %d\n", # completes fine with (say) 30% slosh, and fail otherwise. If you do that, # consider changing over to test.pl at the same time. # --A.D., Nov 27, 2001 @@ -24,12 +20,10 @@ SKIP: { skip "no clock_gettime", 1 -Index: dist/Time-HiRes/t/itimer.t -=================================================================== ---- dist/Time-HiRes/t/itimer.t.orig -+++ dist/Time-HiRes/t/itimer.t -@@ -28,7 +28,7 @@ BEGIN { - use Test::More 0.82 tests => 2; +--- ./dist/Time-HiRes/t/itimer.t.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./dist/Time-HiRes/t/itimer.t 2017-08-30 12:15:18.729183834 +0000 +@@ -29,7 +29,7 @@ use Test::More tests => 2; + BEGIN { push @INC, '.' } use t::Watchdog; -my $limit = 0.25; # 25% is acceptable slosh for testing timers @@ -37,11 +31,9 @@ my $i = 3; my $r = [Time::HiRes::gettimeofday()]; -Index: dist/Time-HiRes/t/usleep.t -=================================================================== ---- dist/Time-HiRes/t/usleep.t.orig -+++ dist/Time-HiRes/t/usleep.t -@@ -15,7 +15,7 @@ eval { Time::HiRes::usleep(-2) }; +--- ./dist/Time-HiRes/t/usleep.t.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./dist/Time-HiRes/t/usleep.t 2017-08-30 12:15:18.730183834 +0000 +@@ -16,7 +16,7 @@ eval { Time::HiRes::usleep(-2) }; like $@, qr/::usleep$-2$: negative time not invented yet/, "negative time error"; ++++++ perl-incfix.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.391179097 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.395178535 +0200 @@ -2,7 +2,7 @@ =================================================================== --- perl.c.orig +++ perl.c -@@ -4544,11 +4544,13 @@ S_init_perllib(pTHX) +@@ -4579,11 +4579,13 @@ S_init_perllib(pTHX) # endif #endif @@ -16,7 +16,7 @@ if (!TAINTING_get) { #ifndef VMS -@@ -4590,20 +4592,19 @@ S_init_perllib(pTHX) +@@ -4625,20 +4627,19 @@ S_init_perllib(pTHX) #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST) /* Search for version-specific dirs below here */ S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM), ++++++ perl-netcmdutf8.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.419175161 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.423174598 +0200 @@ -24,16 +24,3 @@ return 1 unless length($line); -Index: t/porting/customized.dat -=================================================================== ---- t/porting/customized.dat.orig -+++ t/porting/customized.dat -@@ -164,7 +164,7 @@ bignum cpan/bignum/lib/bignum.pm e999973 - bignum cpan/bignum/lib/bigrat.pm 7fccc9df30e43dbbae6e5ea91b26c8046545c9a9 - bignum cpan/bignum/lib/Math/BigFloat/Trace.pm a6b4b995e18f4083252e6dc72e9bef69671893dd - bignum cpan/bignum/lib/Math/BigInt/Trace.pm d9596963673760cae3eeeb752c1eeeec50bb2290 --libnet cpan/libnet/lib/Net/Cmd.pm a44a10c939a4c35f923c4638054178c32f1d283a -+libnet cpan/libnet/lib/Net/Cmd.pm 3f34ca6479008268714bd02962624d270d04a01e - libnet cpan/libnet/lib/Net/Config.pm 2167a2653b40c9f94e6d52574829532e62394a17 - libnet cpan/libnet/lib/Net/Domain.pm 1bbed50f70fd1ff3e1cdf087b19a9349cddfaced - libnet cpan/libnet/lib/Net/FTP.pm 40dba553c8d44e1530daec2d07a6e50910401f2e ++++++ perl-nroff.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.431173474 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.435172911 +0200 @@ -1,11 +1,9 @@ -Index: cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm -=================================================================== ---- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig -+++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +--- ./cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2017-04-19 13:37:05.000000000 +0000 ++++ ./cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm 2017-08-30 12:12:38.967184117 +0000 @@ -64,7 +64,7 @@ sub _roffer_candidates { my( $self ) = @_; - if( $self->is_openbsd || $self->is_bitrig ) { qw( mandoc groff nroff ) } + if( $self->is_openbsd || $self->is_freebsd || $self->is_bitrig ) { qw( mandoc groff nroff ) } - else { qw( groff nroff mandoc ) } + else { qw( nroff groff mandoc ) } } ++++++ perl-regexp-refoverflow.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.447171225 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.447171225 +0200 @@ -2,7 +2,7 @@ =================================================================== --- regcomp.c.orig +++ regcomp.c -@@ -10742,7 +10742,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I +@@ -10988,7 +10988,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I ret = reg2Lanode(pRExC_state, GOSUB, num, RExC_recurse_count); if (!SIZE_ONLY) { ++++++ perl-saverecontext.diff ++++++ --- /var/tmp/diff_new_pack.lJfNZC/_old 2017-10-02 16:43:11.467168413 +0200 +++ /var/tmp/diff_new_pack.lJfNZC/_new 2017-10-02 16:43:11.471167851 +0200 @@ -2,7 +2,7 @@ =================================================================== --- regcomp.c.orig +++ regcomp.c -@@ -19613,8 +19613,21 @@ Perl_save_re_context(pTHX) +@@ -19959,8 +19959,21 @@ Perl_save_re_context(pTHX) if (gvp) { GV * const gv = *gvp;

1 0

commit perl-Unicode-Collate for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package perl-Unicode-Collate for openSUSE:Factory checked in at 2017-10-02 16:42:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Unicode-Collate (Old) and /work/SRC/openSUSE:Factory/.perl-Unicode-Collate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Unicode-Collate" Mon Oct 2 16:42:52 2017 rev:2 rq:528476 version:1.19 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Unicode-Collate/perl-Unicode-Collate.changes 2017-06-25 19:20:48.675482620 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Unicode-Collate.new/perl-Unicode-Collate.changes 2017-10-02 16:42:58.261025146 +0200 @@ -1,0 +2,6 @@ +Sun Sep 24 06:55:18 UTC 2017 - coolo(a)suse.com + +- add no-dot-inc.patch to compile with perl 5.26 + (https://rt.cpan.org/Public/Bug/Display.html?id=121664) + +------------------------------------------------------------------- New: ---- no-dot-inc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Unicode-Collate.spec ++++++ --- /var/tmp/diff_new_pack.Uz9yIw/_old 2017-10-02 16:42:58.804948673 +0200 +++ /var/tmp/diff_new_pack.Uz9yIw/_new 2017-10-02 16:42:58.808948110 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Unicode-Collate # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -24,8 +24,9 @@ License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Unicode-Collate/ -Source0: http://www.cpan.org/authors/id/S/SA/SADAHIRO/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/S/SA/SADAHIRO/%{cpan_name}-%{version}.… Source1: cpanspec.yml +Patch0: no-dot-inc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -37,6 +38,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" ++++++ cpanspec.yml ++++++ --- /var/tmp/diff_new_pack.Uz9yIw/_old 2017-10-02 16:42:58.868939676 +0200 +++ /var/tmp/diff_new_pack.Uz9yIw/_new 2017-10-02 16:42:58.868939676 +0200 @@ -4,9 +4,8 @@ #sources: # - source1 # - source2 -#patches: -# foo.patch: -p1 -# bar.patch: +patches: + no-dot-inc.patch: -p1 #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- ++++++ no-dot-inc.patch ++++++ Index: Unicode-Collate-1.19/Makefile.PL =================================================================== --- Unicode-Collate-1.19.orig/Makefile.PL +++ Unicode-Collate-1.19/Makefile.PL @@ -6,7 +6,7 @@ my $clean = {}; if (-f "Collate.xs") { print "Making header files for XS...\n"; - do 'mkheader' or die $@ || "mkheader: $!"; + do './mkheader' or die $@ || "mkheader: $!"; $clean = { FILES => 'ucatbl.h' }; }

1 0

commit perl-Term-ReadKey for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package perl-Term-ReadKey for openSUSE:Factory checked in at 2017-10-02 16:42:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Term-ReadKey (Old) and /work/SRC/openSUSE:Factory/.perl-Term-ReadKey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Term-ReadKey" Mon Oct 2 16:42:44 2017 rev:11 rq:528475 version:2.37 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Term-ReadKey/perl-Term-ReadKey.changes 2014-06-02 07:03:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Term-ReadKey.new/perl-Term-ReadKey.changes 2017-10-02 16:42:48.902340939 +0200 @@ -1,0 +2,20 @@ +Sun Sep 24 06:47:38 UTC 2017 - coolo(a)suse.com + +- update to 2.37 + * Better support parallel builds by making 'dynamic' a dependency of the ReadKey.pm + * Add a package declaration to the ReadKey_pm.PL to aid indexing + * Use FULLPERLRUNINST to run the ReadKey_pm.PL to get the 'blib' + * Fix GetTerminalSize() argument handling + * Fix miniperl build on Win32 + * Remove unused Cwd + * Fix TAP output + * Fix warnings in XS file + * Don't attempt some tests if STDIN is not a terminal + * Generate ReadKey.pm from ReadKey_pm.PL to expand blockoptions + * demand-load Carp, + * remove unneeded AutoLoader, + * Improve genchars.pl, support make -s silence. + * Improve Makefile.PL add SIGN, fix pure_site_install, support dual-life, fix realclean + + +------------------------------------------------------------------- Old: ---- TermReadKey-2.32.tar.gz New: ---- TermReadKey-2.37.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Term-ReadKey.spec ++++++ --- /var/tmp/diff_new_pack.DI4yrx/_old 2017-10-02 16:42:49.430266716 +0200 +++ /var/tmp/diff_new_pack.DI4yrx/_new 2017-10-02 16:42:49.434266153 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Term-ReadKey # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,7 +17,7 @@ Name: perl-Term-ReadKey -Version: 2.32 +Version: 2.37 Release: 0 Summary: Module for Simple Terminal Control License: GPL-1.0+ or Artistic-1.0 @@ -58,9 +58,6 @@ make test %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc README ++++++ TermReadKey-2.32.tar.gz -> TermReadKey-2.37.tar.gz ++++++ ++++ 3835 lines of diff (skipped)

1 0

commit perl-File-HomeDir for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package perl-File-HomeDir for openSUSE:Factory checked in at 2017-10-02 16:42:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-File-HomeDir (Old) and /work/SRC/openSUSE:Factory/.perl-File-HomeDir.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-File-HomeDir" Mon Oct 2 16:42:38 2017 rev:24 rq:528412 version:1.002 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-File-HomeDir/perl-File-HomeDir.changes 2013-06-06 15:05:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-File-HomeDir.new/perl-File-HomeDir.changes 2017-10-02 16:42:40.035587568 +0200 @@ -1,0 +2,6 @@ +Sat Sep 23 15:06:50 UTC 2017 - coolo(a)suse.com + +- updated to 1.002 + see /usr/share/doc/packages/perl-File-HomeDir/Changes + +------------------------------------------------------------------- Old: ---- File-HomeDir-1.00.tar.gz New: ---- File-HomeDir-1.002.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-HomeDir.spec ++++++ --- /var/tmp/diff_new_pack.R0kqzs/_old 2017-10-02 16:42:40.531517842 +0200 +++ /var/tmp/diff_new_pack.R0kqzs/_new 2017-10-02 16:42:40.535517280 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-File-HomeDir # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,37 +17,24 @@ Name: perl-File-HomeDir -Version: 1.00 +Version: 1.002 Release: 0 %define cpan_name File-HomeDir Summary: Find your home and other directories on any platform License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/File-HomeDir/ -Source: http://www.cpan.org/authors/id/A/AD/ADAMK/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/R/RE/REHSACK/%{cpan_name}-%{version}.t… +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(File::Path) >= 2.01 +BuildRequires: perl(File::Path) >= 2.010000 BuildRequires: perl(File::Temp) >= 0.19 BuildRequires: perl(File::Which) >= 0.05 -#BuildRequires: perl(File::HomeDir) -#BuildRequires: perl(File::HomeDir::Darwin) -#BuildRequires: perl(File::HomeDir::Darwin::Cocoa) -#BuildRequires: perl(File::HomeDir::Driver) -#BuildRequires: perl(File::HomeDir::Test) -#BuildRequires: perl(File::HomeDir::Unix) -#BuildRequires: perl(inc::Module::Install) >= 1.06 -#BuildRequires: perl(JSON) -#BuildRequires: perl(LWP::Simple) -#BuildRequires: perl(Mac::Files) -#BuildRequires: perl(Mac::SystemDirectory) -#BuildRequires: perl(Module::Build) -#BuildRequires: perl(Module::Install::Base) -#BuildRequires: perl(Parse::CPAN::Meta) -#BuildRequires: perl(YAML::Tiny) -Requires: perl(File::Path) >= 2.01 +BuildRequires: perl(Test::More) >= 0.9 +Requires: perl(File::Path) >= 2.010000 Requires: perl(File::Temp) >= 0.19 Requires: perl(File::Which) >= 0.05 %{perl_requires} @@ -63,9 +50,9 @@ This module provides two main interfaces. -The first is a modern the File::Spec manpage-style interface with a -consistent OO API and different implementation modules to support various -platforms. You are *strongly* recommended to use this interface. +The first is a modern File::Spec-style interface with a consistent OO API +and different implementation modules to support various platforms. You are +*strongly* recommended to use this interface. The second interface is for legacy support of the original 0.07 interface that exported a 'home()' function by default and tied the '%~' variable. @@ -96,6 +83,7 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE MYMETA.json README +%doc Changes README.md +%license LICENSE %changelog ++++++ File-HomeDir-1.00.tar.gz -> File-HomeDir-1.002.tar.gz ++++++ ++++ 3847 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test ignore_requires: Mac::SystemDirectory

1 0

commit perl-Encode-HanExtra for openSUSE:Factory
by root＠hilbert.suse.de 02 Oct '17

02 Oct '17

Hello community, here is the log from the commit of package perl-Encode-HanExtra for openSUSE:Factory checked in at 2017-10-02 16:42:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Encode-HanExtra (Old) and /work/SRC/openSUSE:Factory/.perl-Encode-HanExtra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Encode-HanExtra" Mon Oct 2 16:42:33 2017 rev:24 rq:528411 version:0.23 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Encode-HanExtra/perl-Encode-HanExtra.changes 2015-02-06 10:17:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Encode-HanExtra.new/perl-Encode-HanExtra.changes 2017-10-02 16:42:34.408378729 +0200 @@ -1,0 +2,5 @@ +Sat Sep 23 15:03:00 UTC 2017 - coolo(a)suse.com + +- compile with perl 5.26 by patching the Makefile + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Encode-HanExtra.spec ++++++ --- /var/tmp/diff_new_pack.lbxxzp/_old 2017-10-02 16:42:35.000295508 +0200 +++ /var/tmp/diff_new_pack.lbxxzp/_new 2017-10-02 16:42:35.000295508 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Encode-HanExtra # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -41,17 +41,12 @@ several megabytes; hence, this CPAN module tries to provide the rest of them. - - -Authors: --------- - Autrijus Tang <autrijus(a)autrijus.org> - %prep %setup -q -n Encode-HanExtra-%{version} %patch1 -p1 %build +sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL make %{?_smp_mflags}

1 0