Hello community,
here is the log from the commit of package python-catkin-pkg for
openSUSE:Factory checked in at 2020-03-31 17:14:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-catkin-pkg (Old)
and /work/SRC/openSUSE:Factory/.python-catkin-pkg.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-catkin-pkg"
Tue Mar 31 17:14:20 2020 rev:3 rq:789778 version:0.4.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-catkin-pkg/python-catkin-pkg.changes
2020-01-24 14:12:12.946430839 +0100
+++
/work/SRC/openSUSE:Factory/.python-catkin-pkg.new.3160/python-catkin-pkg.changes
2020-03-31 17:14:33.131601190 +0200
@@ -1,0 +2,7 @@
+Mon Mar 30 12:51:38 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- update to 0.4.16
+ * add Python 3.7 and 3.8 to Travis matrix
+ * allow different CMake minimum version in metapackage
+
+-------------------------------------------------------------------
Old:
----
0.4.15.tar.gz
New:
----
0.4.16.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-catkin-pkg.spec ++++++
--- /var/tmp/diff_new_pack.luIZTZ/_old 2020-03-31 17:14:33.855601650 +0200
+++ /var/tmp/diff_new_pack.luIZTZ/_new 2020-03-31 17:14:33.859601653 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-catkin-pkg
-Version: 0.4.15
+Version: 0.4.16
Release: 0
Summary: Catkin package library
License: BSD-3-Clause
++++++ 0.4.15.tar.gz -> 0.4.16.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/catkin_pkg-0.4.15/.travis.yml
new/catkin_pkg-0.4.16/.travis.yml
--- old/catkin_pkg-0.4.15/.travis.yml 2019-12-09 20:41:50.000000000 +0100
+++ new/catkin_pkg-0.4.16/.travis.yml 2020-01-25 22:09:42.000000000 +0100
@@ -1,11 +1,13 @@
language: python
-dist: trusty
+dist: xenial
sudo: false
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
+ - "3.7"
+ - "3.8"
# command to install dependencies
install:
# newer versions of docutils dropped support for Python 3.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/catkin_pkg-0.4.15/setup.py
new/catkin_pkg-0.4.16/setup.py
--- old/catkin_pkg-0.4.15/setup.py 2019-12-09 20:41:50.000000000 +0100
+++ new/catkin_pkg-0.4.16/setup.py 2020-01-25 22:09:42.000000000 +0100
@@ -20,7 +20,7 @@
# same version as in:
# - src/catkin_pkg/__init__.py
# - stdeb.cfg
- 'version': '0.4.15',
+ 'version': '0.4.16',
'packages': ['catkin_pkg', 'catkin_pkg.cli'],
'package_dir': {'': 'src'},
'package_data': {'catkin_pkg': ['templates/*.in']},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/catkin_pkg-0.4.15/src/catkin_pkg/__init__.py
new/catkin_pkg-0.4.16/src/catkin_pkg/__init__.py
--- old/catkin_pkg-0.4.15/src/catkin_pkg/__init__.py 2019-12-09
20:41:50.000000000 +0100
+++ new/catkin_pkg-0.4.16/src/catkin_pkg/__init__.py 2020-01-25
22:09:42.000000000 +0100
@@ -35,4 +35,4 @@
# same version as in:
# - setup.py
# - stdeb.cfg
-__version__ = '0.4.15'
+__version__ = '0.4.16'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/catkin_pkg-0.4.15/src/catkin_pkg/metapackage.py
new/catkin_pkg-0.4.16/src/catkin_pkg/metapackage.py
--- old/catkin_pkg-0.4.15/src/catkin_pkg/metapackage.py 2019-12-09
20:41:50.000000000 +0100
+++ new/catkin_pkg-0.4.16/src/catkin_pkg/metapackage.py 2020-01-25
22:09:42.000000000 +0100
@@ -40,6 +40,7 @@
from __future__ import print_function
import os
+import re
from catkin_pkg.cmake import configure_file
from catkin_pkg.cmake import get_metapackage_cmake_template_path
@@ -119,7 +120,13 @@
"""
cmakelists_txt = get_cmakelists_txt(path)
expected = get_expected_cmakelists_txt(metapackage_name)
- return cmakelists_txt == expected
+ prefix, suffix = expected.split('2.8.3', 1)
+ if not cmakelists_txt.startswith(prefix):
+ return False
+ if not cmakelists_txt.endswith(suffix):
+ return False
+ version = cmakelists_txt[len(prefix):-len(suffix)]
+ return re.match(r'^\d+\.\d+\.\d+$', version)
def validate_metapackage(path, package):
@@ -147,12 +154,14 @@
raise InvalidMetapackage('No CMakeLists.txt', path, package)
# Is the CMakeLists.txt correct, else raise
if not has_valid_cmakelists_txt(path, package.name):
+ expected = get_expected_cmakelists_txt(package.name)
+ expected = expected.replace('2.8.3', '<version x.y.z>')
raise InvalidMetapackage("""\
Invalid CMakeLists.txt
Expected:
<<<%s>>>
Got:
-<<<%s>>>""" % (get_expected_cmakelists_txt(package.name),
get_cmakelists_txt(path)), path, package
+<<<%s>>>""" % (expected, get_cmakelists_txt(path)), path, package
)
# Does it buildtool depend on catkin, else raise
if not package.has_buildtool_depend_on_catkin():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/catkin_pkg-0.4.15/stdeb.cfg
new/catkin_pkg-0.4.16/stdeb.cfg
--- old/catkin_pkg-0.4.15/stdeb.cfg 2019-12-09 20:41:50.000000000 +0100
+++ new/catkin_pkg-0.4.16/stdeb.cfg 2020-01-25 22:09:42.000000000 +0100
@@ -3,11 +3,11 @@
; catkin-pkg-modules same version as in:
; - setup.py
; - src/catkin_pkg/__init__.py
-Depends: python-argparse, python-catkin-pkg-modules (>= 0.4.15),
python-dateutil, python-docutils
+Depends: python-argparse, python-catkin-pkg-modules (>= 0.4.16),
python-dateutil, python-docutils
; catkin-pkg-modules same version as in:
; - setup.py
; - src/catkin_pkg/__init__.py
-Depends3: python3-catkin-pkg-modules (>= 0.4.15), python3-dateutil,
python3-docutils
+Depends3: python3-catkin-pkg-modules (>= 0.4.16), python3-dateutil,
python3-docutils
Conflicts: catkin, python3-catkin-pkg
Conflicts3: catkin, python-catkin-pkg
Copyright-File: LICENSE
