Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-ldappool for openSUSE:Factory checked in at 2021-10-27 22:21:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ldappool (Old) and /work/SRC/openSUSE:Factory/.python-ldappool.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ldappool" Wed Oct 27 22:21:02 2021 rev:5 rq:927593 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-ldappool/python-ldappool.changes 2021-03-08 15:18:21.673987196 +0100 +++ /work/SRC/openSUSE:Factory/.python-ldappool.new.1890/python-ldappool.changes 2021-10-27 22:21:14.291199660 +0200 @@ -1,0 +2,17 @@ +Tue Oct 26 20:23:49 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 3.0.0: + * Remove lower-constraints, uncap PrettyTable + * Switch to newer openstackdocstheme and reno versions + * Cleanup py27 support + * Update hacking for Python3 + * [ussuri][goal] Drop python 2.7 support and testing + * Follow the PTI for docs + * Add Python 3 Train unit tests + * Add bindep.txt + * Sync Sphinx requirement + * OpenDev Migration Patch + * Update the min version of tox + * Drop py35 jobs + +------------------------------------------------------------------- Old: ---- ldappool-2.4.1.tar.gz New: ---- ldappool-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ldappool.spec ++++++ --- /var/tmp/diff_new_pack.X29EWg/_old 2021-10-27 22:21:14.751199896 +0200 +++ /var/tmp/diff_new_pack.X29EWg/_new 2021-10-27 22:21:14.755199898 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-ldappool # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ldappool -Version: 2.4.1 +Version: 3.0.0 Release: 0 Summary: A connection pool for python-ldap -License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later +License: GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/ldappool Source: https://files.pythonhosted.org/packages/source/l/ldappool/ldappool-%{version}.tar.gz ++++++ ldappool-2.4.1.tar.gz -> ldappool-3.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/.zuul.yaml new/ldappool-3.0.0/.zuul.yaml --- old/ldappool-2.4.1/.zuul.yaml 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/.zuul.yaml 2021-02-26 16:33:57.000000000 +0100 @@ -1,9 +1,6 @@ +--- - project: templates: - check-requirements - - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs - - openstack-python37-jobs + - openstack-python3-wallaby-jobs - release-notes-jobs-python3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/AUTHORS new/ldappool-3.0.0/AUTHORS --- old/ldappool-2.4.1/AUTHORS 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/AUTHORS 2021-02-26 16:34:41.000000000 +0100 @@ -15,6 +15,7 @@ Nathan Kinder <nkin...@redhat.com> Nick Wilburn <senior.cr...@gmail.com> Samriddhi Jain <j.samriddh...@gmail.com> +Stephen Finucane <stephen...@redhat.com> Steve Martinelli <s.martine...@gmail.com> Tarek Ziade <ta...@ziade.org> Tarek Ziade <ziade.ta...@gmail.com> @@ -22,8 +23,11 @@ Tony Breeds <t...@bakeyournoodle.com> Van Hung Pham <hun...@vn.fujitsu.com> Vieri <15050873...@163.com> +Vishakha Agarwal <agarwalvishakh...@gmail.com> Vu Cong Tuan <tua...@vn.fujitsu.com> +Wander Way <wanderway...@gmail.com> huang.zhiping <huang.zhip...@99cloud.net> +jacky06 <zhang....@99cloud.net> pallavi <pallav...@nectechnologies.in> qingszhao <zhao.daq...@99cloud.net> ricolin <rico....@easystack.cn> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/ChangeLog new/ldappool-3.0.0/ChangeLog --- old/ldappool-2.4.1/ChangeLog 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/ChangeLog 2021-02-26 16:34:41.000000000 +0100 @@ -1,6 +1,22 @@ CHANGES ======= +3.0.0 +----- + +* Remove lower-constraints, uncap PrettyTable +* Switch to newer openstackdocstheme and reno versions +* Cleanup py27 support +* Update hacking for Python3 +* [ussuri][goal] Drop python 2.7 support and testing +* Follow the PTI for docs +* Add Python 3 Train unit tests +* Add bindep.txt +* Sync Sphinx requirement +* OpenDev Migration Patch +* Update the min version of tox +* Drop py35 jobs + 2.4.1 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/PKG-INFO new/ldappool-3.0.0/PKG-INFO --- old/ldappool-2.4.1/PKG-INFO 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/PKG-INFO 2021-02-26 16:34:41.802590100 +0100 @@ -1,8 +1,8 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: ldappool -Version: 2.4.1 +Version: 3.0.0 Summary: A simple connector pool for python-ldap. -Home-page: https://git.openstack.org/cgit/openstack/ldappool +Home-page: https://opendev.org/openstack/ldappool Author: OpenStack Author-email: openstack-disc...@lists.openstack.org License: UNKNOWN @@ -96,7 +96,9 @@ Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0) Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 -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/ldappool-2.4.1/bindep.txt new/ldappool-3.0.0/bindep.txt --- old/ldappool-2.4.1/bindep.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/ldappool-3.0.0/bindep.txt 2021-02-26 16:33:57.000000000 +0100 @@ -0,0 +1,10 @@ +# See openstack-infra/project-config:jenkins/data/bindep-fallback.txt +# This is used by bindep: sudo [apt-get | yum] install $(bindep -b) + +libldap2-dev [platform:dpkg] +libsasl2-dev [platform:dpkg] + +cyrus-sasl-devel [platform:rpm] +openldap-devel [platform:redhat] + +openldap2-devel [platform:suse] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/doc/requirements.txt new/ldappool-3.0.0/doc/requirements.txt --- old/ldappool-2.4.1/doc/requirements.txt 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/doc/requirements.txt 2021-02-26 16:33:57.000000000 +0100 @@ -1,3 +1,7 @@ -openstackdocstheme>=1.18.1 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +openstackdocstheme>=2.2.1 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/doc/source/conf.py new/ldappool-3.0.0/doc/source/conf.py --- old/ldappool-2.4.1/doc/source/conf.py 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/doc/source/conf.py 2021-02-26 16:33:57.000000000 +0100 @@ -12,12 +12,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import unicode_literals - import os -import subprocess import sys -import warnings import pbr.version @@ -60,15 +56,6 @@ project = 'ldappool' copyright = 'OpenStack Contributors' -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -version_info = pbr.version.VersionInfo('ldappool') -# The short X.Y version. -version = version_info.version_string() -# The full version, including alpha/beta/rc tags. -release = version_info.release_string() - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None @@ -102,7 +89,7 @@ #show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['ldappool.'] @@ -148,10 +135,6 @@ # so a file named "default.css" will overwrite the builtin "default.css". #html_static_path = ['static'] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. #html_use_smartypants = True @@ -226,6 +209,6 @@ } # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/ldappool' -bug_project = 'ldappool' -bug_tag = '' +openstackdocs_repo_name = 'openstack/ldappool' +openstackdocs_bug_project = 'ldappool' +openstackdocs_bug_tag = '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/doc/source/history.rst new/ldappool-3.0.0/doc/source/history.rst --- old/ldappool-2.4.1/doc/source/history.rst 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/doc/source/history.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -.. include:: ../../ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/doc/source/index.rst new/ldappool-3.0.0/doc/source/index.rst --- old/ldappool-2.4.1/doc/source/index.rst 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/doc/source/index.rst 2021-02-26 16:33:57.000000000 +0100 @@ -1,23 +1,25 @@ ldappool ======== -Contents: +Contents +-------- .. toctree:: :maxdepth: 1 +.. only:: html + api/modules Release Notes -============= +-------------- -.. toctree:: - :maxdepth: 1 +`Release Notes`_ - history +.. _Release Notes: https://docs.openstack.org/releasenotes/ldappool/ Contributing -============ +------------ Code is hosted `on GitHub`_. Submit bugs to the Keystone project on `Launchpad`_. Submit code to the ``openstack/ldappool`` project @@ -30,7 +32,7 @@ Run tests with ``tox``. Indices and tables -================== +------------------ * :ref:`genindex` * :ref:`modindex` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/ldappool/__init__.py new/ldappool-3.0.0/ldappool/__init__.py --- old/ldappool-2.4.1/ldappool/__init__.py 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/ldappool/__init__.py 2021-02-26 16:33:57.000000000 +0100 @@ -250,7 +250,7 @@ # each one in turn in case of connection failures (server down, # timeout, etc.). URIs can be delimited by either commas or # whitespace. - for server in re.split('[\s,]+', self.uri): + for server in re.split(r'[\s,]+', self.uri): tries = 0 exc = None conn = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/ldappool.egg-info/PKG-INFO new/ldappool-3.0.0/ldappool.egg-info/PKG-INFO --- old/ldappool-2.4.1/ldappool.egg-info/PKG-INFO 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/ldappool.egg-info/PKG-INFO 2021-02-26 16:34:41.000000000 +0100 @@ -1,8 +1,8 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: ldappool -Version: 2.4.1 +Version: 3.0.0 Summary: A simple connector pool for python-ldap. -Home-page: https://git.openstack.org/cgit/openstack/ldappool +Home-page: https://opendev.org/openstack/ldappool Author: OpenStack Author-email: openstack-disc...@lists.openstack.org License: UNKNOWN @@ -96,7 +96,9 @@ Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0) Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only Classifier: Programming Language :: Python :: 3 -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/ldappool-2.4.1/ldappool.egg-info/SOURCES.txt new/ldappool-3.0.0/ldappool.egg-info/SOURCES.txt --- old/ldappool-2.4.1/ldappool.egg-info/SOURCES.txt 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/ldappool.egg-info/SOURCES.txt 2021-02-26 16:34:41.000000000 +0100 @@ -6,7 +6,7 @@ ChangeLog MANIFEST.in README.rst -lower-constraints.txt +bindep.txt requirements.txt setup.cfg setup.py @@ -15,7 +15,6 @@ doc/Makefile doc/requirements.txt doc/source/conf.py -doc/source/history.rst doc/source/index.rst ldappool/__init__.py ldappool.egg-info/PKG-INFO @@ -28,6 +27,7 @@ ldappool/tests/__init__.py ldappool/tests/test_ldapconnection.py ldappool/tests/test_ldappool.py +releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml releasenotes/source/conf.py releasenotes/source/index.rst releasenotes/source/unreleased.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/ldappool.egg-info/pbr.json new/ldappool-3.0.0/ldappool.egg-info/pbr.json --- old/ldappool-2.4.1/ldappool.egg-info/pbr.json 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/ldappool.egg-info/pbr.json 2021-02-26 16:34:41.000000000 +0100 @@ -1 +1 @@ -{"git_version": "01d0eb3", "is_release": true} \ No newline at end of file +{"git_version": "322e0d7", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/ldappool.egg-info/requires.txt new/ldappool-3.0.0/ldappool.egg-info/requires.txt --- old/ldappool-2.4.1/ldappool.egg-info/requires.txt 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/ldappool.egg-info/requires.txt 2021-02-26 16:34:41.000000000 +0100 @@ -1,2 +1,2 @@ +PrettyTable>=0.7.2 python-ldap>=3.0.0 -PrettyTable<0.8,>=0.7.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/lower-constraints.txt new/ldappool-3.0.0/lower-constraints.txt --- old/ldappool-2.4.1/lower-constraints.txt 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/lower-constraints.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -alabaster==0.7.10 -Babel==2.3.4 -coverage==4.0 -docutils==0.11 -dulwich==0.15.0 -extras==1.0.0 -fixtures==3.0.0 -flake8-docstrings==0.2.1.post1 -flake8==2.5.5 -hacking==0.12.0 -imagesize==0.7.1 -Jinja2==2.10 -linecache2==1.0.0 -MarkupSafe==1.0 -mccabe==0.2.1 -openstackdocstheme==1.18.1 -pbr==2.0.0 -pep257==0.7.0 -pep8==1.5.7 -prettytable==0.7.2 -pyflakes==0.8.1 -Pygments==2.2.0 -python-ldap==3.0.0 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -requests==2.14.2 -six==1.10.0 -snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-websupport==1.0.1 -stestr==2.0.0 -testresources==2.0.0 -testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml new/ldappool-3.0.0/releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml --- old/ldappool-2.4.1/releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/ldappool-3.0.0/releasenotes/notes/drop-py-2-7-9d318d5c72f59f77.yaml 2021-02-26 16:33:57.000000000 +0100 @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of ldappool + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported is Python 3.6. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/releasenotes/source/conf.py new/ldappool-3.0.0/releasenotes/source/conf.py --- old/ldappool-2.4.1/releasenotes/source/conf.py 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/releasenotes/source/conf.py 2021-02-26 16:33:57.000000000 +0100 @@ -97,7 +97,7 @@ # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -146,11 +146,6 @@ # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# html_last_updated_fmt = '%b %d, %Y' -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True @@ -278,6 +273,7 @@ locale_dirs = ['locale/'] # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/ldappool' -bug_project = 'ldappool' -bug_tag = 'doc' +openstackdocs_repo_name = 'openstack/ldappool' +openstackdocs_auto_name = False +openstackdocs_bug_project = 'ldappool' +openstackdocs_bug_tag = 'doc' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/requirements.txt new/ldappool-3.0.0/requirements.txt --- old/ldappool-2.4.1/requirements.txt 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/requirements.txt 2021-02-26 16:33:57.000000000 +0100 @@ -1,5 +1,2 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. python-ldap>=3.0.0 # PSF -PrettyTable<0.8,>=0.7.2 +PrettyTable>=0.7.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/setup.cfg new/ldappool-3.0.0/setup.cfg --- old/ldappool-2.4.1/setup.cfg 2019-02-25 22:41:02.000000000 +0100 +++ new/ldappool-3.0.0/setup.cfg 2021-02-26 16:34:41.802590100 +0100 @@ -5,39 +5,29 @@ README.rst author = OpenStack author-email = openstack-disc...@lists.openstack.org -home-page = https://git.openstack.org/cgit/openstack/ldappool +home-page = https://opendev.org/openstack/ldappool +python-requires = >=3.6 classifier = Intended Audience :: Developers License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0) Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = ldappool -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [pbr] autodoc_tree_index_modules = True autodoc_tree_excludes = setup.py ldappool/tests/ -[wheel] -universal = 1 - [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/setup.py new/ldappool-3.0.0/setup.py --- old/ldappool-2.4.1/setup.py 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/setup.py 2021-02-26 16:33:57.000000000 +0100 @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/test-requirements.txt new/ldappool-3.0.0/test-requirements.txt --- old/ldappool-2.4.1/test-requirements.txt 2019-02-25 22:38:50.000000000 +0100 +++ new/ldappool-3.0.0/test-requirements.txt 2021-02-26 16:33:57.000000000 +0100 @@ -1,15 +1,8 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -# of appearance. - -hacking>=1.1.0,<1.2.0 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 flake8-docstrings==0.2.1.post1 # MIT coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD -openstackdocstheme>=1.18.1 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD testtools>=2.2.0 # MIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldappool-2.4.1/tox.ini new/ldappool-3.0.0/tox.ini --- old/ldappool-2.4.1/tox.ini 2019-02-25 22:38:54.000000000 +0100 +++ new/ldappool-3.0.0/tox.ini 2021-02-26 16:33:57.000000000 +0100 @@ -1,41 +1,38 @@ [tox] -minversion = 2.0 +minversion = 3.1.1 skipsdist = True -envlist = py27,py35,py36,py37,pep8,cover,docs,releasenotes +envlist = pep8,cover,docs,releasenotes +ignore_basepython_conflict = true [testenv] +basepython = python3 usedevelop = True -install_command = pip install {opts} {packages} -setenv = VIRTUAL_ENV={envdir} - OS_STDOUT_NOCAPTURE=False - OS_STDERR_NOCAPTURE=False - +setenv = + OS_STDOUT_NOCAPTURE=False + OS_STDERR_NOCAPTURE=False + PYTHONDONTWRITEBYTECODE=1 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt -commands = find . -type f -name "*.pyc" -delete - stestr run --slowest {posargs} -whitelist_externals = find + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt +commands = + stestr run --slowest {posargs} [testenv:pep8] -basepython = python3 commands = flake8 [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 setenv = - PYTHON=coverage run --source ldappool --parallel-mode + PYTHON=coverage run --source ldappool --parallel-mode commands = - stestr run {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [flake8] # D100: Missing docstring in public module @@ -52,20 +49,13 @@ exclude = .venv,.tox,dist,doc,*egg,build [testenv:docs] -basepython = python3 +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands= - python setup.py build_sphinx + sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes] -basepython = python3 -deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} - -r{toxinidir}/doc/requirements.txt -commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html - -[testenv:lower-constraints] -basepython = python3 -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt +deps = {[testenv:docs]deps} +commands = + sphinx-build -W -b html releasenotes/source releasenotes/build/html