Hello community, here is the log from the commit of package python-bashate for openSUSE:Factory checked in at 2020-03-03 10:15:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-bashate (Old) and /work/SRC/openSUSE:Factory/.python-bashate.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-bashate" Tue Mar 3 10:15:33 2020 rev:3 rq:780409 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-bashate/python-bashate.changes 2019-05-20 13:18:39.855899108 +0200 +++ /work/SRC/openSUSE:Factory/.python-bashate.new.26092/python-bashate.changes 2020-03-03 10:16:12.398646182 +0100 @@ -1,0 +2,25 @@ +Fri Feb 28 22:50:39 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 1.0.0: + * Add an ability to specify max line length + * [ussuri][goal] Drop python 2.7 support and testing + * Convert devstack-bashate to native job + * Add release notes and contributing in readme + * Add Python 3 Train unit tests + * Add --version option + * Remove pylintrc file + * Use stestr as a test runner + * Update sphinx version + * Update to opendev + * Dropping the py35 testing + * OpenDev Migration Patch + * Replace openstack.org git:// URLs with https:// + * Replace openstack.org git:// URLs with https:// + * Change openstack-dev to openstack-discuss + * Update min tox version to 2.0 + * fix tox python3 overrides + * add python 3.6 unit test job + * switch documentation job to new PTI + * import zuul job settings from project-config + +------------------------------------------------------------------- Old: ---- bashate-0.6.0.tar.gz New: ---- bashate-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-bashate.spec ++++++ --- /var/tmp/diff_new_pack.0h4kj2/_old 2020-03-03 10:16:14.362650246 +0100 +++ /var/tmp/diff_new_pack.0h4kj2/_new 2020-03-03 10:16:14.362650246 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-bashate # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%global skip_python2 1 Name: python-bashate -Version: 0.6.0 +Version: 1.0.0 Release: 0 Summary: A PEP8 equivalent for bash scripts License: Apache-2.0 @@ -29,8 +30,7 @@ BuildRequires: %{python_module mock} BuildRequires: %{python_module pbr} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module testrepository} -BuildRequires: %{python_module testscenarios} +BuildRequires: %{python_module stestr} BuildRequires: %{python_module testtools} BuildRequires: fdupes BuildRequires: python-argparse @@ -69,10 +69,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%{python_expand rm -rf .testrepository -PYTHON=$python $python %{_bindir}/testr init -PYTHON=$python $python %{_bindir}/testr run -} +%python_exec -m stestr.cli run %files %{python_files} %license LICENSE ++++++ bashate-0.6.0.tar.gz -> bashate-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/.stestr.conf new/bashate-1.0.0/.stestr.conf --- old/bashate-0.6.0/.stestr.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/bashate-1.0.0/.stestr.conf 2020-02-11 22:24:58.000000000 +0100 @@ -0,0 +1,2 @@ +[DEFAULT] +test_path=./bashate/tests \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/.testr.conf new/bashate-1.0.0/.testr.conf --- old/bashate-0.6.0/.testr.conf 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/.testr.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/.zuul.d/jobs.yaml new/bashate-1.0.0/.zuul.d/jobs.yaml --- old/bashate-0.6.0/.zuul.d/jobs.yaml 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/.zuul.d/jobs.yaml 2020-02-11 22:24:58.000000000 +0100 @@ -1,18 +1,15 @@ - project: + templates: + - openstack-python3-ussuri-jobs + - publish-openstack-docs-pti + - release-notes-jobs-python3 check: jobs: - bashate-devstack: voting: false - - openstack-tox-py36: - voting: false - job: name: bashate-devstack - parent: legacy-base - run: playbooks/legacy/bashate-devstack/run.yaml - timeout: 3600 + run: playbooks/bashate-devstack-master/run.yaml required-projects: - - openstack/requirements - - openstack-dev/devstack - - openstack-infra/devstack-gate - + - openstack/devstack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/AUTHORS new/bashate-1.0.0/AUTHORS --- old/bashate-0.6.0/AUTHORS 2018-07-19 12:45:45.000000000 +0200 +++ new/bashate-1.0.0/AUTHORS 2020-02-11 22:25:47.000000000 +0100 @@ -3,16 +3,22 @@ Andreas Jaeger <[email protected]> Andrew Lazarev <[email protected]> Antoine Musso <[email protected]> +Ayaz Salikhov <[email protected]> Chmouel Boudjnah <[email protected]> Christian Berendt <[email protected]> +Corey Bryant <[email protected]> Dirk Mueller <[email protected]> +Doug Hellmann <[email protected]> +Ghanshyam Mann <[email protected]> Ian Wienand <[email protected]> Ihar Hrachyshka <[email protected]> James E. Blair <[email protected]> Jeremy Stanley <[email protected]> Joe Gordon <[email protected]> K Jonathan Harker <[email protected]> +Le Hou <[email protected]> Longgeek <[email protected]> +Masayuki Igawa <[email protected]> Mathew Odden <[email protected]> Mathew Odden <[email protected]> Matt Odden <[email protected]> @@ -32,7 +38,9 @@ Tin Lam <[email protected]> Tony Breeds <[email protected]> Tristan Cacqueray <[email protected]> +Vieri <[email protected]> William Huang <[email protected]> -Zuul <[email protected]> nizam <[email protected]> +qingszhao <[email protected]> sonu.kumar <[email protected]> +xuanyandong <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/ChangeLog new/bashate-1.0.0/ChangeLog --- old/bashate-0.6.0/ChangeLog 2018-07-19 12:45:45.000000000 +0200 +++ new/bashate-1.0.0/ChangeLog 2020-02-11 22:25:47.000000000 +0100 @@ -1,6 +1,30 @@ CHANGES ======= +1.0.0 +----- + +* Add an ability to specify max line length +* [ussuri][goal] Drop python 2.7 support and testing +* Convert devstack-bashate to native job +* Add release notes and contributing in readme +* Add Python 3 Train unit tests +* Add --version option +* Remove pylintrc file +* Use stestr as a test runner +* Update sphinx version +* Update to opendev +* Dropping the py35 testing +* OpenDev Migration Patch +* Replace openstack.org git:// URLs with https:// +* Replace openstack.org git:// URLs with https:// +* Change openstack-dev to openstack-discuss +* Update min tox version to 2.0 +* fix tox python3 overrides +* add python 3.6 unit test job +* switch documentation job to new PTI +* import zuul job settings from project-config + 0.6.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/PKG-INFO new/bashate-1.0.0/PKG-INFO --- old/bashate-0.6.0/PKG-INFO 2018-07-19 12:45:46.000000000 +0200 +++ new/bashate-1.0.0/PKG-INFO 2020-02-11 22:25:47.000000000 +0100 @@ -1,10 +1,10 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: bashate -Version: 0.6.0 +Version: 1.0.0 Summary: A pep8 equivalent for bash scripts Home-page: http://docs.openstack.org/developer/bashate/ Author: OpenStack -Author-email: [email protected] +Author-email: [email protected] License: UNKNOWN Description: =============================== bashate @@ -23,8 +23,10 @@ - Free software: Apache license - Documentation: https://docs.openstack.org/bashate - - Source: https://git.openstack.org/cgit/openstack-dev/bashate + - Source: https://opendev.org/openstack/bashate/ - Bugs: https://bugs.launchpad.net/bash8 + - Release notes: https://docs.openstack.org/releasenotes/bashate/index.html + - Contributing: https://docs.openstack.org/bashate/latest/contributor/index.html Currently Supported Checks -------------------------- @@ -73,9 +75,7 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Requires-Python: >=3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/README.rst new/bashate-1.0.0/README.rst --- old/bashate-0.6.0/README.rst 2018-07-19 12:44:23.000000000 +0200 +++ new/bashate-1.0.0/README.rst 2020-02-11 22:24:58.000000000 +0100 @@ -15,8 +15,10 @@ - Free software: Apache license - Documentation: https://docs.openstack.org/bashate -- Source: https://git.openstack.org/cgit/openstack-dev/bashate +- Source: https://opendev.org/openstack/bashate/ - Bugs: https://bugs.launchpad.net/bash8 +- Release notes: https://docs.openstack.org/releasenotes/bashate/index.html +- Contributing: https://docs.openstack.org/bashate/latest/contributor/index.html Currently Supported Checks -------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/RELEASENOTES.rst new/bashate-1.0.0/RELEASENOTES.rst --- old/bashate-0.6.0/RELEASENOTES.rst 2018-07-19 12:45:46.000000000 +0200 +++ new/bashate-1.0.0/RELEASENOTES.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -======= -bashate -======= - -.. _bashate_0.6.0: - -0.6.0 -===== - -.. _bashate_0.6.0_New Features: - -New Features ------------- - -.. releasenotes/notes/0-dash-6-748e729ee001df73.yaml @ 925500dc009be966998e70970274b0615e3199ea - -- Python 3.6 support added - -.. releasenotes/notes/0-dash-6-748e729ee001df73.yaml @ 925500dc009be966998e70970274b0615e3199ea - -- Hidden files such as ``.bashrc`` are no longer checked for ``#!`` (E005) - -.. releasenotes/notes/0-dash-6-748e729ee001df73.yaml @ 925500dc009be966998e70970274b0615e3199ea - -- A basic check for ``[[`` when using non-POSIX comparisions such as ``=~`` is added - -.. releasenotes/notes/0-dash-6-748e729ee001df73.yaml @ 925500dc009be966998e70970274b0615e3199ea - -- Enable bashate to be called as a module ``python -m bashate ...`` - -.. releasenotes/notes/0-dash-6-748e729ee001df73.yaml @ 925500dc009be966998e70970274b0615e3199ea - -- Enable `pre-commit.com <https://pre-commit.com>`__ support - -.. releasenotes/notes/adopt-pycodestyle-output-format-f4d6e35dadfcb6f9.yaml @ b530efc0691aea663669cd97cb3406b47ad27938 - -- Adoped pycodestyle/pep8 default output format. - - -.. _bashate_0.5.1: - -0.5.1 -===== - -.. _bashate_0.5.1_New Features: - -New Features ------------- - -.. releasenotes/notes/python-3-4e30b9f2b9e2dcb7.yaml @ 3e76bce89de78a4f41ae9a6a948823190401bc02 - -- Python 3 is supported - - -.. _bashate_0.5.0: - -0.5.0 -===== - -.. _bashate_0.5.0_Bug Fixes: - -Bug Fixes ---------- - -.. releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml @ 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949 - -- Ignore contents of ``heredoc`` values. ``heredocs`` usually contain content in a foreign syntax so ``bashate`` will no longer consider them. - -.. releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml @ 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949 - -- Continuation lines are now parsed into an array, rather than a single logical-line. This fixes continuation lines being incorrectly reported as too long. - -.. releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml @ 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949 - -- Indentation now allows emacs-formatted idents, where continuation - lines for long commands align to the first argument above (rather - than a strict modulo of 4). e.g. - - :: - - longcommand arg1 arg2 arg3 \ - arg4 arg5 - - will no longer trigger a bad indent warning. - -.. releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml @ 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949 - -- Use ``bash -n`` to detect unclosed heredocs, rather than construct our own parsing. - -.. releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml @ 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949 - -- Correctly check for newlines at the end of all files; even if you only specify one file to check. - - -.. _bashate_0.5.0_Other Notes: - -Other Notes ------------ - -.. releasenotes/notes/start-using-reno-eaaafddb3fbf2010.yaml @ 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949 - -- started using reno - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate/__init__.py new/bashate-1.0.0/bashate/__init__.py --- old/bashate-0.6.0/bashate/__init__.py 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/bashate/__init__.py 2020-02-11 22:24:58.000000000 +0100 @@ -14,4 +14,4 @@ __version__ = pbr.version.VersionInfo( - 'bashate').version_string() + 'bashate').version_string_with_vcs() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate/bashate.py new/bashate-1.0.0/bashate/bashate.py --- old/bashate-0.6.0/bashate/bashate.py 2018-07-19 12:44:23.000000000 +0200 +++ new/bashate-1.0.0/bashate/bashate.py 2020-02-11 22:24:58.000000000 +0100 @@ -22,6 +22,7 @@ import subprocess import sys +import bashate from bashate import messages MESSAGES = messages.MESSAGES @@ -58,8 +59,8 @@ report.print_error(MESSAGES['E001'].msg, line) -def check_no_long_lines(line, report): - if len(line.rstrip("\r\n")) > 79: +def check_no_long_lines(line, report, max_line_length): + if len(line.rstrip("\r\n")) > max_line_length: report.print_error(MESSAGES['E006'].msg, line) @@ -305,7 +306,7 @@ 'error': error.replace(":", "", 1), 'line': line.rstrip('\n')}) - def check_files(self, files, verbose): + def check_files(self, files, verbose, max_line_length=79): logical_line = "" token = False @@ -400,7 +401,7 @@ # separatley. Stick with what works... for line in logical_line: check_no_trailing_whitespace(line, report) - check_no_long_lines(line, report) + check_no_long_lines(line, report, max_line_length) check_for_do(line, report) check_if_then(line, report) check_function_decl(line, report) @@ -430,10 +431,19 @@ help='Rules to always warn (rather than error)') parser.add_argument('-e', '--error', help='Rules to always error (rather than warn)') + parser.add_argument('--max-line-length', default=79, type=int, + help='Max line length') parser.add_argument('-v', '--verbose', action='store_true', default=False) + parser.add_argument('--version', action='store_true', + help='show bashate version number and exit', + default=False) parser.add_argument('-s', '--show', action='store_true', default=False) opts = parser.parse_args(args) + if opts.version: + print("bashate: %s" % bashate.__version__) + sys.exit(0) + if opts.show: messages.print_messages() sys.exit(0) @@ -449,7 +459,7 @@ run.register_errors(opts.error) try: - run.check_files(files, opts.verbose) + run.check_files(files, opts.verbose, opts.max_line_length) except IOError as e: print("bashate: %s" % e) return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate/messages.py new/bashate-1.0.0/bashate/messages.py --- old/bashate-0.6.0/bashate/messages.py 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/bashate/messages.py 2020-02-11 22:24:58.000000000 +0100 @@ -93,11 +93,11 @@ 'long_msg': """ This check mimics the widely accepted convention from PEP8 and - many other places that lines longer than 79 columns can not - only cause problems when reading/writing code, but also often - indicates a bad smell, e.g. too many levels of indentation due - to overly complex functions which require refactoring into - smaller chunks. + many other places that lines longer than a standard terminal width + (default=79 columns) can not only cause problems when reading/writing + code, but also often indicates a bad smell, e.g. too many levels + of indentation due to overly complex functions which require + refactoring into smaller chunks. """, 'default': 'W' }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate/tests/samples/E006_bad_custom_length.sh new/bashate-1.0.0/bashate/tests/samples/E006_bad_custom_length.sh --- old/bashate-0.6.0/bashate/tests/samples/E006_bad_custom_length.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/bashate-1.0.0/bashate/tests/samples/E006_bad_custom_length.sh 2020-02-11 22:24:58.000000000 +0100 @@ -0,0 +1,8 @@ +#!/bin/bash + +# lines longer than 10 columns give warnings + +: 0123456789 +: 1 2 3 4 5 6 7 8 + +: 012345 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate/tests/test_bashate.py new/bashate-1.0.0/bashate/tests/test_bashate.py --- old/bashate-0.6.0/bashate/tests/test_bashate.py 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/bashate/tests/test_bashate.py 2020-02-11 22:24:58.000000000 +0100 @@ -64,8 +64,11 @@ result = bashate.main(['--verbose', '/path/to/fileA', '/path/to/fileB']) - m_run_obj.check_files.assert_called_with(['/path/to/fileA', - '/path/to/fileB'], True) + m_run_obj.check_files.assert_called_with( + ['/path/to/fileA', '/path/to/fileB'], + True, + 79 + ) expected_return = 1 self.assertEqual(expected_return, result) @@ -176,6 +179,14 @@ self.assert_error_found('E006', 6) self.assert_error_found('E006', 8) + def test_sample_E006_bad_custom_max_line_length(self): + test_files = ['bashate/tests/samples/E006_bad_custom_length.sh'] + self.run.check_files(test_files, False, 10) + + self.assertEqual(self.run.warning_count, 2) + self.assert_error_found('E006', 5) + self.assert_error_found('E006', 6) + def test_sample_E006_good(self): test_files = ['bashate/tests/samples/E006_good.sh'] self.run.check_files(test_files, False) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate.egg-info/PKG-INFO new/bashate-1.0.0/bashate.egg-info/PKG-INFO --- old/bashate-0.6.0/bashate.egg-info/PKG-INFO 2018-07-19 12:45:45.000000000 +0200 +++ new/bashate-1.0.0/bashate.egg-info/PKG-INFO 2020-02-11 22:25:47.000000000 +0100 @@ -1,10 +1,10 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: bashate -Version: 0.6.0 +Version: 1.0.0 Summary: A pep8 equivalent for bash scripts Home-page: http://docs.openstack.org/developer/bashate/ Author: OpenStack -Author-email: [email protected] +Author-email: [email protected] License: UNKNOWN Description: =============================== bashate @@ -23,8 +23,10 @@ - Free software: Apache license - Documentation: https://docs.openstack.org/bashate - - Source: https://git.openstack.org/cgit/openstack-dev/bashate + - Source: https://opendev.org/openstack/bashate/ - Bugs: https://bugs.launchpad.net/bash8 + - Release notes: https://docs.openstack.org/releasenotes/bashate/index.html + - Contributing: https://docs.openstack.org/bashate/latest/contributor/index.html Currently Supported Checks -------------------------- @@ -73,9 +75,7 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Requires-Python: >=3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate.egg-info/SOURCES.txt new/bashate-1.0.0/bashate.egg-info/SOURCES.txt --- old/bashate-0.6.0/bashate.egg-info/SOURCES.txt 2018-07-19 12:45:46.000000000 +0200 +++ new/bashate-1.0.0/bashate.egg-info/SOURCES.txt 2020-02-11 22:25:47.000000000 +0100 @@ -1,7 +1,7 @@ .coveragerc .mailmap .pre-commit-hooks.yaml -.testr.conf +.stestr.conf AUTHORS CONTRIBUTING.rst ChangeLog @@ -11,7 +11,6 @@ babel.cfg bindep.txt openstack-common.conf -pylintrc requirements.txt setup.cfg setup.py @@ -41,6 +40,7 @@ bashate/tests/samples/E004_bad.sh bashate/tests/samples/E005_bad bashate/tests/samples/E006_bad.sh +bashate/tests/samples/E006_bad_custom_length.sh bashate/tests/samples/E006_good.sh bashate/tests/samples/E010_bad.sh bashate/tests/samples/E010_good.sh @@ -64,9 +64,11 @@ doc/source/man/bashate.rst doc/source/user/index.rst doc/source/user/usage.rst -playbooks/legacy/bashate-devstack/run.yaml +playbooks/bashate-devstack-master/run.yaml releasenotes/notes/0-dash-6-748e729ee001df73.yaml releasenotes/notes/adopt-pycodestyle-output-format-f4d6e35dadfcb6f9.yaml +releasenotes/notes/custom-line-length-083e8077951a8ead.yaml +releasenotes/notes/drop-python2.7-064c5e5bcfb4539c.yaml releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml releasenotes/notes/python-3-4e30b9f2b9e2dcb7.yaml releasenotes/notes/start-using-reno-eaaafddb3fbf2010.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/bashate.egg-info/pbr.json new/bashate-1.0.0/bashate.egg-info/pbr.json --- old/bashate-0.6.0/bashate.egg-info/pbr.json 2018-07-19 12:45:45.000000000 +0200 +++ new/bashate-1.0.0/bashate.egg-info/pbr.json 2020-02-11 22:25:47.000000000 +0100 @@ -1 +1 @@ -{"git_version": "8e303ee", "is_release": true} \ No newline at end of file +{"git_version": "49c5f16", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/playbooks/bashate-devstack-master/run.yaml new/bashate-1.0.0/playbooks/bashate-devstack-master/run.yaml --- old/bashate-0.6.0/playbooks/bashate-devstack-master/run.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/bashate-1.0.0/playbooks/bashate-devstack-master/run.yaml 2020-02-11 22:24:58.000000000 +0100 @@ -0,0 +1,13 @@ +- hosts: all + name: Run bashate against devstack master + roles: + - bindep + + tasks: + - shell: 'tox -e bashate' + args: + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack"].src_dir }}' + environment: + BASHATE_INSTALL_PATH: 'file://{{ ansible_user_dir }}/{{ zuul.project.src_dir }}' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/playbooks/legacy/bashate-devstack/run.yaml new/bashate-1.0.0/playbooks/legacy/bashate-devstack/run.yaml --- old/bashate-0.6.0/playbooks/legacy/bashate-devstack/run.yaml 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/playbooks/legacy/bashate-devstack/run.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-bashate-devstack from old job gate-bashate-devstack - roles: - - bindep - - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -u - set -e - set -x - cd $WORKSPACE - - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-dev/bashate \ - openstack-dev/devstack \ - openstack-infra/devstack-gate - - export BASHATE_INSTALL_PATH=$WORKSPACE/openstack-dev/bashate - - pushd openstack-dev/devstack - tox -e bashate - popd - - pushd openstack-infra/devstack-gate - tox -e bashate - popd - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/pylintrc new/bashate-1.0.0/pylintrc --- old/bashate-0.6.0/pylintrc 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/pylintrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -# The format of this file isn't really documented; just use --generate-rcfile - -[Messages Control] -# C0111: Don't require docstrings on every method -# W0511: TODOs in code comments are fine. -# W0142: *args and **kwargs are fine. -# W0622: Redefining id is fine. -disable=C0111,W0511,W0142,W0622 - -[Basic] -# Variable names can be 1 to 31 characters long, with lowercase and underscores -variable-rgx=[a-z_][a-z0-9_]{0,30}$ - -# Argument names can be 2 to 31 characters long, with lowercase and underscores -argument-rgx=[a-z_][a-z0-9_]{1,30}$ - -# Method names should be at least 3 characters long -# and be lowercased with underscores -method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$ - -[Design] -max-public-methods=100 -min-public-methods=0 -max-args=6 - -[Variables] - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -# _ is used by our localization -additional-builtins=_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/releasenotes/notes/custom-line-length-083e8077951a8ead.yaml new/bashate-1.0.0/releasenotes/notes/custom-line-length-083e8077951a8ead.yaml --- old/bashate-0.6.0/releasenotes/notes/custom-line-length-083e8077951a8ead.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/bashate-1.0.0/releasenotes/notes/custom-line-length-083e8077951a8ead.yaml 2020-02-11 22:24:58.000000000 +0100 @@ -0,0 +1,5 @@ +--- +features: + - | + Adds an option ``--max-line-length`` to specify the maximum length + of lines for check E006. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/releasenotes/notes/drop-python2.7-064c5e5bcfb4539c.yaml new/bashate-1.0.0/releasenotes/notes/drop-python2.7-064c5e5bcfb4539c.yaml --- old/bashate-0.6.0/releasenotes/notes/drop-python2.7-064c5e5bcfb4539c.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/bashate-1.0.0/releasenotes/notes/drop-python2.7-064c5e5bcfb4539c.yaml 2020-02-11 22:24:58.000000000 +0100 @@ -0,0 +1,4 @@ +--- +deprecations: + - | + bashate is now Python 3 only and no longer supports Python 2. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/releasenotes/notes/reno.cache new/bashate-1.0.0/releasenotes/notes/reno.cache --- old/bashate-0.6.0/releasenotes/notes/reno.cache 2018-07-19 12:45:46.000000000 +0200 +++ new/bashate-1.0.0/releasenotes/notes/reno.cache 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ ---- -file-contents: - releasenotes/notes/0-dash-6-748e729ee001df73.yaml: - features: [Python 3.6 support added, Hidden files such as ``.bashrc`` are no longer - checked for ``#!`` (E005), 'A basic check for ``[[`` when using non-POSIX - comparisions such as ``=~`` is added', Enable bashate to be called as a module - ``python -m bashate ...``, 'Enable `pre-commit.com <https://pre-commit.com>`__ - support'] - releasenotes/notes/adopt-pycodestyle-output-format-f4d6e35dadfcb6f9.yaml: - features: ['Adoped pycodestyle/pep8 default output format. - - '] - releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml: - fixes: [Ignore contents of ``heredoc`` values. ``heredocs`` usually contain content - in a foreign syntax so ``bashate`` will no longer consider them., 'Continuation - lines are now parsed into an array, rather than a single logical-line. This - fixes continuation lines being incorrectly reported as too long.', "Indentation\ - \ now allows emacs-formatted idents, where continuation\nlines for long commands\ - \ align to the first argument above (rather\nthan a strict modulo of 4). \ - \ e.g.\n\n::\n\n longcommand arg1 arg2 arg3 \\\n arg4 arg5\n\ - \nwill no longer trigger a bad indent warning.\n", 'Use ``bash -n`` to detect - unclosed heredocs, rather than construct our own parsing.', Correctly check - for newlines at the end of all files; even if you only specify one file to - check.] - releasenotes/notes/python-3-4e30b9f2b9e2dcb7.yaml: - features: [Python 3 is supported] - releasenotes/notes/start-using-reno-eaaafddb3fbf2010.yaml: - other: [started using reno] -notes: -- files: - - [releasenotes/notes/0-dash-6-748e729ee001df73.yaml, 925500dc009be966998e70970274b0615e3199ea] - - [releasenotes/notes/adopt-pycodestyle-output-format-f4d6e35dadfcb6f9.yaml, b530efc0691aea663669cd97cb3406b47ad27938] - version: 0.6.0 -- files: - - [releasenotes/notes/python-3-4e30b9f2b9e2dcb7.yaml, 3e76bce89de78a4f41ae9a6a948823190401bc02] - version: 0.5.1 -- files: - - [releasenotes/notes/heredoc-ignore-905b29053652f90e.yaml, 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949] - - [releasenotes/notes/start-using-reno-eaaafddb3fbf2010.yaml, 0661da9c91f38c71d7d6b7521ff23c3dcc8f2949] - version: 0.5.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/setup.cfg new/bashate-1.0.0/setup.cfg --- old/bashate-0.6.0/setup.cfg 2018-07-19 12:45:46.000000000 +0200 +++ new/bashate-1.0.0/setup.cfg 2020-02-11 22:25:47.000000000 +0100 @@ -4,8 +4,9 @@ description-file = README.rst author = OpenStack -author-email = [email protected] +author-email = [email protected] home-page = http://docs.openstack.org/developer/bashate/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,12 +14,9 @@ License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.3 - Programming Language :: Python :: 3.4 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/test-requirements.txt new/bashate-1.0.0/test-requirements.txt --- old/bashate-0.6.0/test-requirements.txt 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/test-requirements.txt 2020-02-11 22:24:58.000000000 +0100 @@ -9,9 +9,8 @@ discover fixtures>=1.3.1 python-subunit>=0.0.18 -sphinx>=1.6.2 +sphinx!=1.6.6,!=1.6.7,!=2.1.0 # BSD openstackdocstheme>=1.11.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +testtools>=2.2.0 +stestr>=1.0.0 # Apache-2.0 reno!=2.3.1,>=1.8.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bashate-0.6.0/tox.ini new/bashate-1.0.0/tox.ini --- old/bashate-0.6.0/tox.ini 2018-07-19 12:43:50.000000000 +0200 +++ new/bashate-1.0.0/tox.ini 2020-02-11 22:24:58.000000000 +0100 @@ -1,16 +1,20 @@ [tox] -minversion = 1.6 -envlist = py35,py27,pep8 +minversion = 3.1.1 +envlist = py36,py37,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} +whitelist_externals = * deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = python setup.py testr --slowest --testr-args='{posargs}' +commands = + stestr run --slowest {posargs} [testenv:pep8] commands = flake8 @@ -22,7 +26,16 @@ commands = {posargs} [testenv:cover] -commands = python setup.py testr --coverage --testr-args='{posargs}' +setenv = + PYTHON=coverage run --source bashate --parallel-mode +commands = + coverage erase + find . -type f -name "*.pyc" -delete + stestr --test-path ./bashate/tests run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml + coverage report [testenv:releasenotes] commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
