Hello community, here is the log from the commit of package python-abimap for openSUSE:Factory checked in at 2019-08-23 11:05:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-abimap (Old) and /work/SRC/openSUSE:Factory/.python-abimap.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-abimap" Fri Aug 23 11:05:44 2019 rev:4 rq:725248 version:0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-abimap/python-abimap.changes 2018-08-22 14:19:42.390259803 +0200 +++ /work/SRC/openSUSE:Factory/.python-abimap.new.7948/python-abimap.changes 2019-08-23 11:05:45.134492407 +0200 @@ -1,0 +2,15 @@ +Thu Aug 22 08:35:33 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Drop no longer needed abimap-0.3.0-disable-pytest-console-script-tests.patch + and properly depend on pytest-console-scripts + +------------------------------------------------------------------- +Thu Aug 22 08:28:28 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Update to 0.3.2: + * Fixed broken builds due to changes in warning output + * Changed tests to check error messages + * Added python 3.7 to testing matrix + * Added requirement to verify SNI when checking URLs in docs + +------------------------------------------------------------------- Old: ---- abimap-0.3.0-disable-pytest-console-script-tests.patch abimap-0.3.1.tar.gz New: ---- abimap-0.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-abimap.spec ++++++ --- /var/tmp/diff_new_pack.FHbWIq/_old 2019-08-23 11:05:45.998492266 +0200 +++ /var/tmp/diff_new_pack.FHbWIq/_new 2019-08-23 11:05:46.002492265 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-abimap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-abimap -Version: 0.3.1 +Version: 0.3.2 Release: 0 Summary: A helper for library maintainers to use symbol versioning License: MIT Group: Development/Languages/Python URL: https://github.com/ansasaki/abimap Source: https://files.pythonhosted.org/packages/source/a/abimap/abimap-%{version}.tar.gz -Patch0: abimap-0.3.0-disable-pytest-console-script-tests.patch BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module setuptools} @@ -34,8 +33,8 @@ Requires: python-setuptools BuildArch: noarch # SECTION test requirements -#BuildRequires: %%{python_module pytest-console-scripts} BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module pytest-console-scripts} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest} # /SECTION @@ -57,8 +56,6 @@ %prep %setup -q -n abimap-%{version} -%patch0 -p1 - %build %python_build @@ -77,7 +74,7 @@ %check make -j1 -C tests ABIMAP_NAME_VERSION="abimap-%{version}" ABIMAP_VERSION="%{version}" -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:${PWD}/tests py.test-%{$python_version} -vv tests +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:${PWD}/tests py.test-%{$python_version} -vv tests -k 'not test_main' %files %{python_files} %doc AUTHORS.rst CHANGELOG.rst README.rst ++++++ abimap-0.3.1.tar.gz -> abimap-0.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/.bumpversion.cfg new/abimap-0.3.2/.bumpversion.cfg --- old/abimap-0.3.1/.bumpversion.cfg 2018-08-20 10:26:24.000000000 +0200 +++ new/abimap-0.3.2/.bumpversion.cfg 2019-08-05 13:35:17.000000000 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.1 +current_version = 0.3.2 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/.travis.yml new/abimap-0.3.2/.travis.yml --- old/abimap-0.3.1/.travis.yml 2018-08-17 19:30:06.000000000 +0200 +++ new/abimap-0.3.2/.travis.yml 2019-08-05 13:35:17.000000000 +0200 @@ -34,6 +34,14 @@ - python: '3.6' env: - TOXENV=3.6-nocov + - python: '3.7' + dist: xenial + env: + - TOXENV=3.7-cover,report,coveralls,codecov + - python: '3.7' + dist: xenial + env: + - TOXENV=3.7-nocov - python: 'pypy-5.4' env: - TOXENV=pypy-cover,report,coveralls,codecov diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/CHANGELOG.rst new/abimap-0.3.2/CHANGELOG.rst --- old/abimap-0.3.1/CHANGELOG.rst 2018-08-20 10:24:55.000000000 +0200 +++ new/abimap-0.3.2/CHANGELOG.rst 2019-08-05 13:35:17.000000000 +0200 @@ -2,6 +2,14 @@ Changelog ========= +0.3.2 (2019-08-05) +------------------ + +* Fixed broken builds due to changes in warning output +* Changed tests to check error messages +* Added python 3.7 to testing matrix +* Added requirement to verify SNI when checking URLs in docs + 0.3.1 (2018-08-20) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/HISTORY.rst new/abimap-0.3.2/HISTORY.rst --- old/abimap-0.3.1/HISTORY.rst 2018-08-20 10:24:54.000000000 +0200 +++ new/abimap-0.3.2/HISTORY.rst 2019-08-05 13:35:17.000000000 +0200 @@ -2,6 +2,14 @@ History ======= +0.3.2 (2019-08-05) +------------------ + +* Fixed broken builds due to changes in warning output +* Changed tests to check error messages +* Added python 3.7 to testing matrix +* Added requirement to verify SNI when checking URLs in docs + 0.3.1 (2018-08-20) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/Makefile new/abimap-0.3.2/Makefile --- old/abimap-0.3.1/Makefile 2018-08-20 10:20:34.000000000 +0200 +++ new/abimap-0.3.2/Makefile 2018-12-19 14:52:24.000000000 +0100 @@ -74,8 +74,7 @@ tox coverage: ## check code coverage quickly with the default Python - py.test --cov=abimap --cov-config .coveragerc --cov-report=term-missing -vv tests - coverage combine --append + py.test --cov=abimap --cov-append --cov-config .coveragerc --cov-report=term-missing -vv tests coverage report coverage html $(BROWSER) htmlcov/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/PKG-INFO new/abimap-0.3.2/PKG-INFO --- old/abimap-0.3.1/PKG-INFO 2018-08-20 10:30:53.000000000 +0200 +++ new/abimap-0.3.2/PKG-INFO 2019-08-05 13:41:58.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: abimap -Version: 0.3.1 +Version: 0.3.2 Summary: A helper for library maintainers to use symbol versioning Home-page: https://github.com/ansasaki/abimap Author: Anderson Toshiyuki Sasaki @@ -308,13 +308,21 @@ .. [ABI] https://en.wikipedia.org/wiki/Application_binary_interface .. [API] https://en.wikipedia.org/wiki/Application_programming_interface .. [HOW_TO] https://www.akkadia.org/drepper/dsohowto.pdf, How to write shared libraries by Ulrich Drepper - .. _Read the docs: http://abimap.readthedocs.io/en/latest/index.html + .. _Read the docs: https://abimap.readthedocs.io/en/latest/index.html ======= History ======= + 0.3.2 (2019-08-05) + ------------------ + + * Fixed broken builds due to changes in warning output + * Changed tests to check error messages + * Added python 3.7 to testing matrix + * Added requirement to verify SNI when checking URLs in docs + 0.3.1 (2018-08-20) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/README.rst new/abimap-0.3.2/README.rst --- old/abimap-0.3.1/README.rst 2018-08-20 10:20:34.000000000 +0200 +++ new/abimap-0.3.2/README.rst 2019-08-05 10:20:14.000000000 +0200 @@ -300,4 +300,4 @@ .. [ABI] https://en.wikipedia.org/wiki/Application_binary_interface .. [API] https://en.wikipedia.org/wiki/Application_programming_interface .. [HOW_TO] https://www.akkadia.org/drepper/dsohowto.pdf, How to write shared libraries by Ulrich Drepper -.. _Read the docs: http://abimap.readthedocs.io/en/latest/index.html +.. _Read the docs: https://abimap.readthedocs.io/en/latest/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/ci/templates/.travis.yml new/abimap-0.3.2/ci/templates/.travis.yml --- old/abimap-0.3.1/ci/templates/.travis.yml 2018-05-09 13:35:45.000000000 +0200 +++ new/abimap-0.3.2/ci/templates/.travis.yml 2019-08-05 13:35:17.000000000 +0200 @@ -12,9 +12,12 @@ include: {%- for env, config in tox_environments|dictsort %}{{ '' }} - python: '{{ '{0[0]}-5.4'.format(env.split('-')) if env.startswith('pypy') else env.split('-')[0] }}' + {% if not env.startswith('pypy') and env.split('-')[0] >= "3.7" %} + dist: xenial + {% endif %} env: - - TOXENV={{ env }}{% if "true" in config.cover %},report,coveralls,codecov{% endif -%} -{% endfor %} + - TOXENV={{ env }}{% if "true" in config.cover %},report,coveralls,codecov{% endif %} +{%- endfor %} before_install: - python --version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/ci/templates/tox.ini new/abimap-0.3.2/ci/templates/tox.ini --- old/abimap-0.3.1/ci/templates/tox.ini 2018-08-20 10:20:34.000000000 +0200 +++ new/abimap-0.3.2/ci/templates/tox.ini 2019-08-02 14:40:59.000000000 +0200 @@ -26,7 +26,7 @@ commands = make bootstrap-tests nocov: {posargs:py.test -vv --ignore=src} - cover: {posargs:py.test --cov --cov-report=term-missing -vv} + cover: {posargs:py.test --cov --cov-append --cov-report=term-missing -vv} [testenv:bootstrap] deps = @@ -97,7 +97,6 @@ skip_install = true usedevelop = false commands = - coverage combine --append coverage report coverage html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/docs/conf.py new/abimap-0.3.2/docs/conf.py --- old/abimap-0.3.1/docs/conf.py 2018-08-20 10:26:24.000000000 +0200 +++ new/abimap-0.3.2/docs/conf.py 2019-08-05 13:35:17.000000000 +0200 @@ -28,7 +28,7 @@ year = '2018' author = u'Anderson Toshiyuki Sasaki <ansas...@redhat.com>' copyright = '{0}, {1}'.format(year, author) -version = release = u'0.3.1' +version = release = u'0.3.2' pygments_style = 'trac' templates_path = ['.'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/docs/readme.rst new/abimap-0.3.2/docs/readme.rst --- old/abimap-0.3.1/docs/readme.rst 2018-08-20 10:20:34.000000000 +0200 +++ new/abimap-0.3.2/docs/readme.rst 2019-08-05 10:20:14.000000000 +0200 @@ -300,4 +300,4 @@ .. [ABI] https://en.wikipedia.org/wiki/Application_binary_interface .. [API] https://en.wikipedia.org/wiki/Application_programming_interface .. [HOW_TO] https://www.akkadia.org/drepper/dsohowto.pdf, How to write shared libraries by Ulrich Drepper -.. _Read the docs: http://abimap.readthedocs.io/en/latest/index.html +.. _Read the docs: https://abimap.readthedocs.io/en/latest/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/docs/requirements.txt new/abimap-0.3.2/docs/requirements.txt --- old/abimap-0.3.1/docs/requirements.txt 2018-05-09 11:28:30.000000000 +0200 +++ new/abimap-0.3.2/docs/requirements.txt 2019-08-05 13:35:17.000000000 +0200 @@ -1,3 +1,4 @@ sphinx>=1.3 sphinx-rtd-theme +requests[security] -e . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/docs/templates/readme.template new/abimap-0.3.2/docs/templates/readme.template --- old/abimap-0.3.1/docs/templates/readme.template 2018-08-20 10:20:34.000000000 +0200 +++ new/abimap-0.3.2/docs/templates/readme.template 2018-10-26 12:45:19.000000000 +0200 @@ -193,4 +193,4 @@ .. [ABI] https://en.wikipedia.org/wiki/Application_binary_interface .. [API] https://en.wikipedia.org/wiki/Application_programming_interface .. [HOW_TO] https://www.akkadia.org/drepper/dsohowto.pdf, How to write shared libraries by Ulrich Drepper -.. _Read the docs: http://abimap.readthedocs.io/en/latest/index.html +.. _Read the docs: https://abimap.readthedocs.io/en/latest/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/setup.cfg new/abimap-0.3.2/setup.cfg --- old/abimap-0.3.1/setup.cfg 2018-08-20 10:30:53.000000000 +0200 +++ new/abimap-0.3.2/setup.cfg 2019-08-05 13:41:58.000000000 +0200 @@ -49,6 +49,7 @@ 3.4 3.5 3.6 + 3.7 pypy coverage_flags = cover diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/src/abimap/_version.py new/abimap-0.3.2/src/abimap/_version.py --- old/abimap-0.3.1/src/abimap/_version.py 2018-08-20 10:26:24.000000000 +0200 +++ new/abimap-0.3.2/src/abimap/_version.py 2019-08-05 13:35:17.000000000 +0200 @@ -1 +1 @@ -__version__ = '0.3.1' +__version__ = '0.3.2' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/src/abimap/symver.py new/abimap-0.3.2/src/abimap/symver.py --- old/abimap-0.3.1/src/abimap/symver.py 2018-08-08 18:37:34.000000000 +0200 +++ new/abimap-0.3.2/src/abimap/symver.py 2019-08-05 13:35:17.000000000 +0200 @@ -231,10 +231,10 @@ msg = "Duplicated Release identifier \'{}\'"\ .format(name) # This is non-critical, only warning - self.logger.warn(ParserError(self.filename, - lines[index], - index, - column, msg)) + self.logger.warning(ParserError(self.filename, + lines[index], + index, + column, msg)) # Search for the special release marker comment m = re.match(r'\s*#.\s*released.*$', @@ -317,10 +317,10 @@ " \'{0}\'. Symbols considered in"\ " 'global:\'".format(identifier) # Non-critical, only warning - self.logger.warn(ParserError(self.filename, - lines[last[0]], - last[0], last[1], - msg)) + self.logger.warning(ParserError(self.filename, + lines[last[0]], + last[0], last[1], + msg)) else: # Symbol found v.append(identifier) @@ -513,11 +513,14 @@ d = self.duplicates() if d: for release, duplicates in d: - self.logger.warn("Duplicates found in release \'%s\':", release) + self.logger.warning("Duplicates found in release \'%s\':", + release) for scope, symbols in duplicates: - self.logger.warn(" %s:", scope) - self.logger.warn("\n".join( - (" " * 8 + symbol for symbol in symbols))) + self.logger.warning(" %s:", scope) + self.logger.warning("\n".join( + (" " * 8 + + symbol for symbol in + symbols))) # Check '*' wildcard usage for release in self.releases: @@ -529,13 +532,14 @@ " wildcard", release.name) if release.previous: # Predecessor version and local: *; are present - self.logger.warn("%s should not contain the" - " local wildcard because it" - " is not the base version" - " (it refers to version %s" - " as its predecessor)", - release.name, - release.previous) + self.logger.warning("%s should not contain the" + " local wildcard because" + " it is not the base" + " version (it refers to" + " version %s" + " as its predecessor)", + release.name, + release.previous) else: # Release seems to be base: empty predecessor msg = "{} seems to be the base version"\ @@ -550,40 +554,41 @@ if symbols: if "*" in symbols: # Release contains '*' wildcard in global scope - self.logger.warn("%s contains the \'*\' wildcard" - " in global scope. It is probably" - " exporting symbols" - " it should not.", - release.name) + self.logger.warning("%s contains the \'*\'" + " wildcard in" + " global scope. It is probably" + " exporting symbols" + " it should not.", + release.name) have_wildcard.append((release.name, scope)) else: # Release contains unknown visibility scopes (not global or # local) - self.logger.warn("%s contains unknown scope named %s" - " (different from \'global\' and" - " \'local\')", release.name, scope) + self.logger.warning("%s contains unknown scope named %s" + " (different from \'global\' and" + " \'local\')", release.name, scope) if have_wildcard: if len(have_wildcard) > 1: # The '*' wildcard was found in more than one place - self.logger.warn("The \'*\' wildcard was found in more than" - " one place:") + self.logger.warning("The \'*\' wildcard was found in more than" + " one place:") for name, scope in have_wildcard: - self.logger.warn(" %s: in \'%s\'", name, scope) + self.logger.warning(" %s: in \'%s\'", name, scope) else: - self.logger.warn("The \'*\' wildcard was not found") + self.logger.warning("The \'*\' wildcard was not found") if seems_base: if len(seems_base) > 1: # There is more than one release without predecessor and # containing '*' wildcard in local scope - self.logger.warn("More than one release seem to be the base" - " version (contain the local wildcard and" - " do not have a predecessor version):") + self.logger.warning("More than one release seem to be the base" + " version (contain the local wildcard and" + " do not have a predecessor version):") for name in seems_base: - self.logger.warn(" %s", name) + self.logger.warning(" %s", name) else: - self.logger.warn("No base version release found") + self.logger.warning("No base version release found") dependencies = self.dependencies() self.logger.info("Found dependencies:") @@ -830,11 +835,11 @@ if m: if len(m) < 2: - logger.warn("Provide at least a major and a minor" - " version digit (eg. '1.2.3' or '1_2')") + logger.warning("Provide at least a major and a minor" + " version digit (eg. '1.2.3' or '1_2')") if len(m) > 3: - logger.warn("Version has too many parts; provide 3 or less" - " ( e.g. '0.1.2')") + logger.warning("Version has too many parts; provide 3 or less" + " ( e.g. '0.1.2')") else: msg = "Could not get version parts. Provide digits separated"\ " by non-alphanumeric characters. (e.g. 0_1_2 or 0.1.2)" @@ -867,7 +872,7 @@ tail = None if not release: - logger.warn("No release provided") + logger.warning("No release provided") return None # Remove eventual white spaces @@ -886,10 +891,10 @@ prefix = release else: # If not, reject the prefix - logger.warn("Release provided is not well formed" - " (a well formed release contain the library" - " identifier and the version information)." - " Suggested: something like LIBNAME_1_2_3") + logger.warning("Release provided is not well formed" + " (a well formed release contain the library" + " identifier and the version information)." + " Suggested: something like LIBNAME_1_2_3") return None if tail: @@ -965,9 +970,9 @@ duplicates.add(previous) previous = i if duplicates: - dup_list = "".join((" " * 4 + dup + "\n" for dup in + dup_list = "".join((dup + ", " for dup in sorted(duplicates))) - logger.warn("Duplicated symbols provided:\n%s", dup_list) + logger.warning("Duplicated symbols provided: %s", dup_list) return clean @@ -990,21 +995,21 @@ # Check if given input file is the same as output if os.path.isfile(in_name): if os.path.samefile(out_name, in_name): - logger.warn("Given paths in \'%s\' and \'%s\' are the same.", - str(out_arg), str(in_arg)) + logger.warning("Given paths in \'%s\' and \'%s\' are the same.", + str(out_arg), str(in_arg)) # Avoid changing the files if this is a dry run if dry: return - logger.warn("Moving \'%s\' to \'%s.old\'.", str(in_name), - str(in_name)) + logger.warning("Moving \'%s\' to \'%s.old\'.", str(in_name), + str(in_name)) try: # If it is the case, copy to another file to # preserve the content shutil.copy2(str(in_name), str(in_name) + ".old") except Exception as e: - logger.error("Could no copy \'%s\' to \'%s.old\'." + logger.error("Could not copy \'%s\' to \'%s.old\'." " Aborting.", str(in_name), str(in_name)) raise e @@ -1102,7 +1107,7 @@ # If output would be overwritten, print a warning if args.out: if os.path.isfile(args.out): - logger.warn("Overwriting existing file \'%s\'", args.out) + logger.warning("Overwriting existing file \'%s\'", args.out) # If both output and input files were given, check if are the same if args.out and args.input: @@ -1148,10 +1153,10 @@ # Check the symbols and print a warning if already present for symbol in new_set: if symbol in all_symbols: - logger.warn("The symbol \'%s\' is already" - " present in a previous version. Keep the" - " previous implementation to not break ABI.", - symbol) + logger.warning("The symbol \'%s\' is already" + " present in a previous version. Keep the" + " previous implementation to not break ABI.", + symbol) added_set.update(new_set) # If the list of symbols are being removed @@ -1161,8 +1166,8 @@ if symbol in all_symbols: removed_set.add(symbol) else: - logger.warn("Requested to remove \'%s\', but not found.", - symbol) + logger.warning("Requested to remove \'%s\', but not found.", + symbol) # If the list of all symbols are being compared (the default option) else: for symbol in new_set: @@ -1237,7 +1242,7 @@ logger.error(msg) raise Exception(msg) - logger.warn("ABI break detected: symbols were removed.") + logger.warning("ABI break detected: symbols were removed.") print("Merging all symbols in a single new release") new_map = Map() r = Release() @@ -1252,8 +1257,8 @@ # Remove the '*' wildcard, if present if '*' in all_symbols: - logger.warn("Wildcard \'*\' found in global. Removed to avoid" - " exporting unexpected symbols.") + logger.warning("Wildcard \'*\' found in global. Removed to avoid" + " exporting unexpected symbols.") all_symbols.remove('*') # Remove the symbols to be removed and convert to a list @@ -1330,7 +1335,7 @@ # If output would be overwritten, print a warning if args.out: if os.path.isfile(args.out): - logger.warn("Overwriting existing file \'%s\'.", args.out) + logger.warning("Overwriting existing file \'%s\'.", args.out) # If both output and input files were given, check if are the same if args.out and args.input: @@ -1422,7 +1427,7 @@ if args.out: f.close() else: - logger.warn("No valid symbols provided. Nothing done.") + logger.warning("No valid symbols provided. Nothing done.") def check(args): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/src/abimap.egg-info/PKG-INFO new/abimap-0.3.2/src/abimap.egg-info/PKG-INFO --- old/abimap-0.3.1/src/abimap.egg-info/PKG-INFO 2018-08-20 10:30:53.000000000 +0200 +++ new/abimap-0.3.2/src/abimap.egg-info/PKG-INFO 2019-08-05 13:41:58.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: abimap -Version: 0.3.1 +Version: 0.3.2 Summary: A helper for library maintainers to use symbol versioning Home-page: https://github.com/ansasaki/abimap Author: Anderson Toshiyuki Sasaki @@ -308,13 +308,21 @@ .. [ABI] https://en.wikipedia.org/wiki/Application_binary_interface .. [API] https://en.wikipedia.org/wiki/Application_programming_interface .. [HOW_TO] https://www.akkadia.org/drepper/dsohowto.pdf, How to write shared libraries by Ulrich Drepper - .. _Read the docs: http://abimap.readthedocs.io/en/latest/index.html + .. _Read the docs: https://abimap.readthedocs.io/en/latest/index.html ======= History ======= + 0.3.2 (2019-08-05) + ------------------ + + * Fixed broken builds due to changes in warning output + * Changed tests to check error messages + * Added python 3.7 to testing matrix + * Added requirement to verify SNI when checking URLs in docs + 0.3.1 (2018-08-20) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/src/abimap.egg-info/SOURCES.txt new/abimap-0.3.2/src/abimap.egg-info/SOURCES.txt --- old/abimap-0.3.1/src/abimap.egg-info/SOURCES.txt 2018-08-20 10:30:53.000000000 +0200 +++ new/abimap-0.3.2/src/abimap.egg-info/SOURCES.txt 2019-08-05 13:41:58.000000000 +0200 @@ -180,6 +180,7 @@ tests/data_template/test_update/mixed_names.stdout tests/data_template/test_update/nameless.map tests/data_template/test_update/non_existing_previous.map +tests/data_template/test_update/one_symbol.in tests/data_template/test_update/only_visibility.map tests/data_template/test_update/only_visibility.stdout tests/data_template/test_update/opening.map @@ -214,6 +215,7 @@ tests/data_template/test_update/update_existing.map tests/data_template/test_update/update_existing.stdout tests/data_template/test_update/update_existing_final.stdout +tests/data_template/test_update/update_no_changes.stdout tests/data_template/test_update/update_released.in tests/data_template/test_update/update_released.map tests/data_template/test_update/update_released.stdout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/conftest.py new/abimap-0.3.2/tests/conftest.py --- old/abimap-0.3.1/tests/conftest.py 2018-08-03 17:00:27.000000000 +0200 +++ new/abimap-0.3.2/tests/conftest.py 2019-08-05 13:35:17.000000000 +0200 @@ -1,5 +1,6 @@ import filecmp import os +import re from distutils import dir_util import pytest @@ -56,7 +57,8 @@ if file_type.lower() == ".yml" or file_type.lower() == ".yaml": with open(str(test_input), 'r') as stream: try: - all_tests.extend(yaml.load(stream)) + all_tests.extend(yaml.load(stream, + Loader=yaml.FullLoader)) except yaml.YAMLError as e: with capsys.disabled(): print(e) @@ -87,6 +89,50 @@ os.chdir(self.saved_path) +def is_warning_in_log(expected, log): + """ + Search for a warning containing the expected message in the log. Returns + True if found; False otherwise. + + :param expected: The regular expression + "param log: The input string + """ + + # Escape possibly existing special characters + escaped = re.escape(expected) + + regex = "WARNING.*" + escaped + + to_match = re.compile(regex) + found = to_match.search(log) + if found: + return True + + return False + + +def is_error_in_log(expected, log): + """ + Search for an error containing the expected message in the log. Returns + True if found; False otherwise. + + :param expected: The regular expression + "param log: The input string + """ + + # Escape possibly existing special characters + escaped = re.escape(expected) + + regex = "ERROR.*" + escaped + + to_match = re.compile(regex) + found = to_match.search(log) + if found: + return True + + return False + + def run_tc(tc, datadir, capsys, caplog): """ Run a command test case (for update and new commands) @@ -166,10 +212,15 @@ # Fail assert 0 - # Check if the expected messages are in the log + # Check if the expected warning messages are in the log if tc_out["warnings"]: for expected in tc_out["warnings"]: - assert expected in caplog.text + assert is_warning_in_log(expected, caplog.text) + + # Check if the expected error messages are in the log + if tc_out["errors"]: + for expected in tc_out["errors"]: + assert is_error_in_log(expected, caplog.text) # If a log file was supposed to exist, check the content if args.logfile: @@ -178,7 +229,10 @@ logged = log.read() if tc_out["warnings"]: for expected in tc_out["warnings"]: - assert expected in logged + assert is_warning_in_log(expected, caplog.text) + if tc_out["errors"]: + for expected in tc_out["errors"]: + assert is_error_in_log(expected, caplog.text) if tc_out["exceptions"]: for expected in tc_out["exceptions"]: assert expected in logged diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_new/guess_names.yaml new/abimap-0.3.2/tests/data_template/test_new/guess_names.yaml --- old/abimap-0.3.1/tests/data_template/test_new/guess_names.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_new/guess_names.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -10,6 +10,7 @@ file: stdout: "separated.stdout" warnings: + errors: exceptions: - input: @@ -21,6 +22,7 @@ file: stdout: "given_release.stdout" warnings: + errors: exceptions: - input: @@ -33,6 +35,7 @@ file: stdout: "release_and_version.stdout" warnings: + errors: exceptions: - input: @@ -47,6 +50,7 @@ file: stdout: "release_and_name.stdout" warnings: + errors: exceptions: - input: @@ -61,5 +65,7 @@ - "Release provided is not well formed (a well formed release contain the library identifier and the version information). \ Suggested: something like LIBNAME_1_2_3" + errors: + - "Please provide the release name." exceptions: - "Please provide the release name." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_new/options.yaml new/abimap-0.3.2/tests/data_template/test_new/options.yaml --- old/abimap-0.3.1/tests/data_template/test_new/options.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_new/options.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -10,6 +10,7 @@ file: stdout: "sanity.stdout" warnings: + errors: exceptions: - input: @@ -23,6 +24,7 @@ file: stdout: "sanity_final.stdout" warnings: + errors: exceptions: - input: @@ -37,6 +39,7 @@ file: "with_out.outfile" stdout: "" warnings: + errors: exceptions: - input: @@ -56,6 +59,7 @@ - "Overwriting existing file 'overwrite.in'" - "Given paths in '--out' and '--in' are the same." - "Moving 'overwrite.in' to 'overwrite.in.old'." + errors: exceptions: - input: @@ -75,6 +79,7 @@ warnings: - "Overwriting existing file 'dry.in'" - "Given paths in '--out' and '--in' are the same." + errors: exceptions: - input: @@ -90,6 +95,7 @@ stdout: warnings: - "No valid symbols provided. Nothing done." + errors: exceptions: - input: @@ -105,6 +111,8 @@ - "Release provided is not well formed (a well formed release contain \ the library identifier and the version information). \ Suggested: something like LIBNAME_1_2_3" + errors: + - "Please provide the release name." exceptions: - "Please provide the release name." - @@ -116,6 +124,8 @@ file: stdout: warnings: + errors: + - "It is necessary to provide either release name or name and version" exceptions: - "It is necessary to provide either release name or name and version" - @@ -129,5 +139,6 @@ file: stdout: "duplicated_input.stdout" warnings: - - "Duplicated symbols provided:\n a\n b\n\n" + - "Duplicated symbols provided: a, b" + errors: exceptions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_overwrite_protected/overwrite_protected.yaml new/abimap-0.3.2/tests/data_template/test_overwrite_protected/overwrite_protected.yaml --- old/abimap-0.3.1/tests/data_template/test_overwrite_protected/overwrite_protected.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_overwrite_protected/overwrite_protected.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -16,7 +16,8 @@ - "Overwriting existing file 'overwrite_protected.in'" - "Given paths in '--out' and '--in' are the same." - "Moving 'overwrite_protected.in' to 'overwrite_protected.in.old'." - - "Could no copy 'overwrite_protected.in' to \ + errors: + - "Could not copy 'overwrite_protected.in' to \ 'overwrite_protected.in.old'. Aborting." exceptions: - "Permission denied: 'overwrite_protected.in.old'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/add.yaml new/abimap-0.3.2/tests/data_template/test_update/add.yaml --- old/abimap-0.3.1/tests/data_template/test_update/add.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_update/add.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -10,6 +10,7 @@ file: stdout: "sanity_add.stdout" warnings: + errors: exceptions: - input: @@ -23,6 +24,7 @@ file: stdout: "add_final.stdout" warnings: + errors: exceptions: - input: @@ -40,6 +42,7 @@ - "Overwriting existing file 'add.map'" - "Given paths in '--out' and 'file' are the same." - "Moving 'add.map' to 'add.map.old'." + errors: exceptions: - input: @@ -54,6 +57,7 @@ warnings: - "The symbol 'symbol' is already present in a previous version. \ Keep the previous implementation to not break ABI." + errors: exceptions: - input: @@ -66,6 +70,7 @@ file: stdout: "empty.stdout" warnings: + errors: exceptions: - input: @@ -81,6 +86,7 @@ - "Duplicates found in release 'DUPLICATED_1_0_0':" - " global:" - " duplicated" + errors: exceptions: - input: @@ -98,6 +104,7 @@ - "The '*' wildcard was found in more than one place:" - " WITH_WILDCARD_1_0_0: in 'global'" - " WITH_WILDCARD_1_0_0: in 'local'" + errors: exceptions: - input: @@ -117,6 +124,7 @@ warnings: - "Overwriting existing file 'dry.in'" - "Given paths in '--out' and '--in' are the same." + errors: exceptions: - input: @@ -131,6 +139,7 @@ file: stdout: "update_existing.stdout" warnings: + errors: exceptions: - input: @@ -145,6 +154,8 @@ file: stdout: "update_released.stdout" warnings: + errors: + - "Released releases cannot be modified. Abort." exceptions: - "Released releases cannot be modified. Abort." - @@ -161,6 +172,7 @@ file: stdout: "update_existing_final.stdout" warnings: + errors: exceptions: - input: @@ -173,6 +185,7 @@ file: stdout: "split.stdout" warnings: + errors: exceptions: - input: @@ -185,4 +198,5 @@ file: stdout: "missing_global.stdout" warnings: + errors: exceptions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/broken_maps.yaml new/abimap-0.3.2/tests/data_template/test_update/broken_maps.yaml --- old/abimap-0.3.1/tests/data_template/test_update/broken_maps.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_update/broken_maps.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -11,6 +11,8 @@ file: stdout: warnings: + errors: + - "Invalid Release identifier" exceptions: - "Invalid Release identifier" - @@ -28,6 +30,7 @@ warnings: - "Duplicated Release identifier" - "ABI break detected: symbols were removed." + errors: exceptions: - input: @@ -41,6 +44,8 @@ file: stdout: warnings: + errors: + - "Missing '{'" exceptions: - "Missing '{'" - @@ -55,6 +60,8 @@ file: stdout: warnings: + errors: + - "Invalid identifier" exceptions: - "Invalid identifier" - @@ -69,6 +76,8 @@ file: stdout: warnings: + errors: + - "Missing ';' or ':' after" exceptions: - "Missing ';' or ':' after" - @@ -87,6 +96,7 @@ - "ABI break detected: symbols were removed." - "Missing visibility scope before" - "Symbols considered in 'global:'" + errors: exceptions: - input: @@ -100,6 +110,8 @@ file: stdout: warnings: + errors: + - "Invalid identifier" exceptions: - "Invalid identifier" - @@ -114,6 +126,8 @@ file: stdout: warnings: + errors: + - "Missing ';'" exceptions: - "Missing ';'" - @@ -128,6 +142,8 @@ file: stdout: warnings: + errors: + - "Release 'LIBTC5_8_0_0' not found" exceptions: - "Release 'LIBTC5_8_0_0' not found" - @@ -143,6 +159,8 @@ stdout: warnings: - "Duplicated Release identifier 'LIBTC5_9_0_0'" + errors: + - "defined more than 1 release 'LIBTC5_9_0_0'" exceptions: - "defined more than 1 release 'LIBTC5_9_0_0'" - @@ -157,6 +175,8 @@ file: stdout: warnings: + errors: + - "Circular dependency detected!" exceptions: - "Circular dependency detected!" - @@ -189,6 +209,7 @@ - " BASE_1_0_0" - " OTHER_BASE_1_0_0" - "ABI break detected: symbols were removed." + errors: exceptions: - input: @@ -205,6 +226,7 @@ warnings: - "The '*' wildcard was not found" - "No base version release found" + errors: exceptions: - input: @@ -217,6 +239,7 @@ file: stdout: "mixed_names.stdout" warnings: + errors: exceptions: - input: @@ -231,4 +254,5 @@ warnings: - "The '*' wildcard was not found" - "No base version release found" + errors: exceptions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/logfile.yaml new/abimap-0.3.2/tests/data_template/test_update/logfile.yaml --- old/abimap-0.3.1/tests/data_template/test_update/logfile.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_update/logfile.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -29,5 +29,7 @@ local wildcard and do not have a predecessor version):" - " BASE_1_0_0" - " OTHER_BASE_1_0_0" + errors: + - "ABI break detected: symbols would be removed" exceptions: - "ABI break detected: symbols would be removed" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/one_symbol.in new/abimap-0.3.2/tests/data_template/test_update/one_symbol.in --- old/abimap-0.3.1/tests/data_template/test_update/one_symbol.in 1970-01-01 01:00:00.000000000 +0100 +++ new/abimap-0.3.2/tests/data_template/test_update/one_symbol.in 2018-10-25 16:05:24.000000000 +0200 @@ -0,0 +1 @@ +one_symbol diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/overwrite.yaml new/abimap-0.3.2/tests/data_template/test_update/overwrite.yaml --- old/abimap-0.3.1/tests/data_template/test_update/overwrite.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_update/overwrite.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -16,4 +16,5 @@ - "Given paths in '--out' and 'file' are the same." - "Moving 'overwrite.map' to 'overwrite.map.old'." - "ABI break detected: symbols were removed." + errors: exceptions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/remove.yaml new/abimap-0.3.2/tests/data_template/test_update/remove.yaml --- old/abimap-0.3.1/tests/data_template/test_update/remove.yaml 2018-05-28 13:14:10.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_update/remove.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -12,6 +12,7 @@ stdout: "remove_sanity.stdout" warnings: - "ABI break detected: symbols were removed." + errors: exceptions: - input: @@ -27,6 +28,7 @@ stdout: "remove_final.stdout" warnings: - "ABI break detected: symbols were removed." + errors: exceptions: - input: @@ -46,6 +48,7 @@ - "Given paths in '--out' and 'file' are the same." - "Moving 'remove.map' to 'remove.map.old'." - "ABI break detected: symbols were removed." + errors: exceptions: - input: @@ -60,6 +63,7 @@ stdout: "unexistent_symbol.stdout" warnings: - "Requested to remove 'symbol', but not found." + errors: exceptions: - input: @@ -81,6 +85,7 @@ - "ABI break detected: symbols were removed." - "Wildcard '*' found in global. Removed to avoid exporting unexpected \ symbols." + errors: exceptions: - input: @@ -93,5 +98,7 @@ file: stdout: "dont_break_api.stdout" warnings: + errors: + - "ABI break detected: symbols would be removed" exceptions: - "ABI break detected: symbols would be removed" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/symbols.yaml new/abimap-0.3.2/tests/data_template/test_update/symbols.yaml --- old/abimap-0.3.1/tests/data_template/test_update/symbols.yaml 2018-06-01 16:16:06.000000000 +0200 +++ new/abimap-0.3.2/tests/data_template/test_update/symbols.yaml 2019-08-05 13:35:17.000000000 +0200 @@ -9,6 +9,7 @@ file: stdout: "symbols_sanity.stdout" warnings: + errors: exceptions: - input: @@ -21,6 +22,7 @@ file: stdout: "symbols_final.stdout" warnings: + errors: exceptions: - input: @@ -37,6 +39,7 @@ - "Overwriting existing file 'symbols.map'" - "Given paths in '--out' and 'file' are the same." - "Moving 'symbols.map' to 'symbols.map.old'." + errors: exceptions: - input: @@ -50,6 +53,7 @@ file: stdout: "update_existing.stdout" warnings: + errors: exceptions: - input: @@ -63,6 +67,8 @@ file: stdout: "update_released.stdout" warnings: + errors: + - "Released releases cannot be modified. Abort." exceptions: - "Released releases cannot be modified. Abort." - @@ -77,6 +83,7 @@ file: stdout: "with_release_info.stdout" warnings: + errors: exceptions: - input: @@ -91,4 +98,19 @@ file: stdout: "with_release_abi_break.stdout" warnings: + errors: + exceptions: +- + input: + args: + - "update" + - "-o" + - "update_no_changes.map" + - "base.map" + stdin: "one_symbol.in" + output: + file: + stdout: "update_no_changes.stdout" + warnings: + errors: exceptions: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/data_template/test_update/update_no_changes.stdout new/abimap-0.3.2/tests/data_template/test_update/update_no_changes.stdout --- old/abimap-0.3.1/tests/data_template/test_update/update_no_changes.stdout 1970-01-01 01:00:00.000000000 +0100 +++ new/abimap-0.3.2/tests/data_template/test_update/update_no_changes.stdout 2018-10-25 16:09:26.000000000 +0200 @@ -0,0 +1 @@ +No symbols added or removed. Nothing done. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/test_check_files.py new/abimap-0.3.2/tests/test_check_files.py --- old/abimap-0.3.1/tests/test_check_files.py 2018-08-03 17:00:27.000000000 +0200 +++ new/abimap-0.3.2/tests/test_check_files.py 2019-08-05 13:35:17.000000000 +0200 @@ -6,6 +6,7 @@ import os import pytest +from conftest import is_warning_in_log from abimap import symver @@ -51,7 +52,7 @@ for record in caplog.records: assert record.levelname != "CRITICAL" assert record.levelname != "ERROR" - assert "WARNING " + expected in caplog.text + assert is_warning_in_log(expected, caplog.text) # Clear the captured log to not affect the following checks caplog.clear() @@ -69,7 +70,7 @@ for record in caplog.records: assert record.levelname != "CRITICAL" assert record.levelname != "ERROR" - assert "WARNING " + expected in caplog.text + assert is_warning_in_log(expected, caplog.text) # Check if the file was created created = os.path.join(str(datadir), "in.map.old") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/test_get_info_from_release_string.py new/abimap-0.3.2/tests/test_get_info_from_release_string.py --- old/abimap-0.3.1/tests/test_get_info_from_release_string.py 2018-08-03 17:00:27.000000000 +0200 +++ new/abimap-0.3.2/tests/test_get_info_from_release_string.py 2019-08-05 13:35:17.000000000 +0200 @@ -3,6 +3,7 @@ """Tests for test_get_info_from_release_string()""" import pytest +from conftest import is_warning_in_log from abimap import symver @@ -19,13 +20,13 @@ assert expected in str(e.value) if tc["warnings"]: for expected in tc["warnings"]: - assert "WARNING " + expected in caplog.text + assert is_warning_in_log(expected, caplog.text) else: assert (symver.get_info_from_release_string(tc["input"]) == tc["output"]) if tc["warnings"]: for expected in tc["warnings"]: - assert "WARNING " + expected in caplog.text + assert is_warning_in_log(expected, caplog.text) # Clear the captured log and output so far caplog.clear() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tests/test_get_version_from_string.py new/abimap-0.3.2/tests/test_get_version_from_string.py --- old/abimap-0.3.1/tests/test_get_version_from_string.py 2018-08-03 17:00:27.000000000 +0200 +++ new/abimap-0.3.2/tests/test_get_version_from_string.py 2019-08-05 13:35:17.000000000 +0200 @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import pytest +from conftest import is_warning_in_log from abimap import symver @@ -17,13 +18,13 @@ assert expected in str(e.value) if tc["warnings"]: for expected in tc["warnings"]: - assert "WARNING " + expected in caplog.text + assert is_warning_in_log(expected, caplog.text) else: assert (symver.get_version_from_string(tc["input"]) == tc["output"]) if tc["warnings"]: for expected in tc["warnings"]: - assert "WARNING " + expected in caplog.text + assert is_warning_in_log(expected, caplog.text) else: # If no test cases were found, fail assert 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abimap-0.3.1/tox.ini new/abimap-0.3.2/tox.ini --- old/abimap-0.3.1/tox.ini 2018-08-20 10:20:34.000000000 +0200 +++ new/abimap-0.3.2/tox.ini 2019-08-05 13:35:17.000000000 +0200 @@ -2,7 +2,7 @@ envlist = clean, check, - {pypy,3.6,2.7,3.4,3.5}-{cover,nocov}, + {2.7,3.6,3.7,3.4,3.5,pypy}-{nocov,cover}, report, docs @@ -26,7 +26,7 @@ commands = make bootstrap-tests nocov: {posargs:py.test -vv --ignore=src} - cover: {posargs:py.test --cov --cov-report=term-missing -vv} + cover: {posargs:py.test --cov --cov-append --cov-report=term-missing -vv} [testenv:bootstrap] deps = @@ -97,7 +97,6 @@ skip_install = true usedevelop = false commands = - coverage combine --append coverage report coverage html @@ -135,6 +134,13 @@ [testenv:3.6-nocov] basepython = {env:TOXPYTHON:python3.6} +[testenv:3.7-cover] +basepython = {env:TOXPYTHON:python3.7} +usedevelop = true + +[testenv:3.7-nocov] +basepython = {env:TOXPYTHON:python3.7} + [testenv:pypy-cover] basepython = {env:TOXPYTHON:pypy} usedevelop = true
