Hello community,
here is the log from the commit of package python-futurist for openSUSE:Factory
checked in at 2020-06-05 20:10:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-futurist (Old)
and /work/SRC/openSUSE:Factory/.python-futurist.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-futurist"
Fri Jun 5 20:10:02 2020 rev:11 rq:803561 version:2.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-futurist/python-futurist.changes
2020-03-27 21:57:30.970800387 +0100
+++
/work/SRC/openSUSE:Factory/.python-futurist.new.3606/python-futurist.changes
2020-06-05 20:12:42.350220952 +0200
@@ -1,0 +2,15 @@
+Tue May 12 09:59:29 UTC 2020 - [email protected]
+
+- update to version 2.1.1
+ - Make PrettyTable optional
+ - Switch to Ussuri jobs
+ - Update master for stable/train
+ - Update the constraints url
+ - Fix Calling waiters.wait_for_any() blocks if future has called
Condition.wait()
+ - Sync Sphinx requirement
+ - [ussuri][goal] Drop python 2.7 support and testing
+ - Add release notes link to README
+ - Bump the openstackdocstheme extension to 1.20
+ - Update hacking for Python3
+
+-------------------------------------------------------------------
Old:
----
futurist-1.9.0.tar.gz
New:
----
futurist-2.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-futurist.spec ++++++
--- /var/tmp/diff_new_pack.Fho5CT/_old 2020-06-05 20:12:43.846225778 +0200
+++ /var/tmp/diff_new_pack.Fho5CT/_new 2020-06-05 20:12:43.850225791 +0200
@@ -17,18 +17,18 @@
Name: python-futurist
-Version: 1.9.0
+Version: 2.1.1
Release: 0
Summary: Useful additions to futures, from the future.
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/futurist
-Source0:
https://files.pythonhosted.org/packages/source/f/futurist/futurist-1.9.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/f/futurist/futurist-2.1.1.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python3-PrettyTable >= 0.7.1
+BuildRequires: python3-PrettyTable
BuildRequires: python3-Sphinx
BuildRequires: python3-eventlet
-BuildRequires: python3-monotonic >= 0.6
+BuildRequires: python3-monotonic
BuildRequires: python3-openstackdocstheme
BuildRequires: python3-oslotest
BuildRequires: python3-pbr >= 2.0.0
@@ -44,7 +44,7 @@
%package -n python3-futurist
Summary: Useful additions to futures, from the future.
Group: Development/Languages/Python
-Requires: python3-PrettyTable >= 0.7.1
+Requires: python3-PrettyTable
Requires: python3-six >= 1.10.0
%description -n python3-futurist
@@ -53,14 +53,14 @@
This package contains the Python 3.x module.
%prep
-%autosetup -p1 -n futurist-1.9.0
+%autosetup -p1 -n futurist-2.1.1
%py_req_cleanup
%build
%{py3_build}
# generate html docs
-PBR_VERSION=1.9.0 %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=2.1.1 %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -r doc/build/html/.{doctrees,buildinfo}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Fho5CT/_old 2020-06-05 20:12:43.874225869 +0200
+++ /var/tmp/diff_new_pack.Fho5CT/_new 2020-06-05 20:12:43.874225869 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/futurist/futurist.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/futurist/futurist.spec.j2</param>
<param name="output-name">python-futurist.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/futurist/stable/train/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/futurist/raw/branch/stable/ussuri/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,futurist</param>
</service>
++++++ futurist-1.9.0.tar.gz -> futurist-2.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/.zuul.yaml
new/futurist-2.1.1/.zuul.yaml
--- old/futurist-1.9.0/.zuul.yaml 2019-09-04 16:19:54.000000000 +0200
+++ new/futurist-2.1.1/.zuul.yaml 2020-04-07 12:07:26.000000000 +0200
@@ -1,11 +1,9 @@
- project:
templates:
- check-requirements
- - lib-forward-testing
- lib-forward-testing-python3
- openstack-lower-constraints-jobs
- - openstack-python-jobs
- - openstack-python3-train-jobs
+ - openstack-python3-ussuri-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/AUTHORS new/futurist-2.1.1/AUTHORS
--- old/futurist-1.9.0/AUTHORS 2019-09-04 16:20:39.000000000 +0200
+++ new/futurist-2.1.1/AUTHORS 2020-04-07 12:08:41.000000000 +0200
@@ -12,6 +12,7 @@
Flavio Percoco <[email protected]>
Gevorg Davoian <[email protected]>
Ghanshyam Mann <[email protected]>
+Hervé Beraud <[email protected]>
Joshua Harlow <[email protected]>
Joshua Harlow <[email protected]>
Joshua Harlow <[email protected]>
@@ -34,4 +35,5 @@
janonymous <[email protected]>
kavithahr <[email protected]>
melissaml <[email protected]>
+pengyuesheng <[email protected]>
ritesh.arya <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/ChangeLog new/futurist-2.1.1/ChangeLog
--- old/futurist-1.9.0/ChangeLog 2019-09-04 16:20:39.000000000 +0200
+++ new/futurist-2.1.1/ChangeLog 2020-04-07 12:08:41.000000000 +0200
@@ -1,6 +1,32 @@
CHANGES
=======
+2.1.1
+-----
+
+* Update hacking for Python3
+
+2.1.0
+-----
+
+* Make PrettyTable optional
+
+2.0.0
+-----
+
+* [ussuri][goal] Drop python 2.7 support and testing
+
+1.10.0
+------
+
+* Fix Calling waiters.wait\_for\_any() blocks if future has called
Condition.wait()
+* Switch to Ussuri jobs
+* Bump the openstackdocstheme extension to 1.20
+* Sync Sphinx requirement
+* Add release notes link to README
+* Update the constraints url
+* Update master for stable/train
+
1.9.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/PKG-INFO new/futurist-2.1.1/PKG-INFO
--- old/futurist-1.9.0/PKG-INFO 2019-09-04 16:20:39.000000000 +0200
+++ new/futurist-2.1.1/PKG-INFO 2020-04-07 12:08:41.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: futurist
-Version: 1.9.0
+Version: 2.1.1
Summary: Useful additions to futures, from the future.
Home-page: https://docs.openstack.org/futurist/latest/
Author: OpenStack
@@ -38,6 +38,7 @@
* Source: https://opendev.org/openstack/futurist
* Bugs: https://bugs.launchpad.net/futurist
* Blueprints: https://blueprints.launchpad.net/futurist
+ * Release notes: https://docs.openstack.org/releasenotes/futurist
Platform: UNKNOWN
@@ -47,8 +48,9 @@
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.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/README.rst
new/futurist-2.1.1/README.rst
--- old/futurist-1.9.0/README.rst 2019-09-04 16:19:54.000000000 +0200
+++ new/futurist-2.1.1/README.rst 2020-04-07 12:07:26.000000000 +0200
@@ -30,3 +30,4 @@
* Source: https://opendev.org/openstack/futurist
* Bugs: https://bugs.launchpad.net/futurist
* Blueprints: https://blueprints.launchpad.net/futurist
+* Release notes: https://docs.openstack.org/releasenotes/futurist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/doc/requirements.txt
new/futurist-2.1.1/doc/requirements.txt
--- old/futurist-1.9.0/doc/requirements.txt 2019-09-04 16:19:54.000000000
+0200
+++ new/futurist-2.1.1/doc/requirements.txt 2020-04-07 12:07:26.000000000
+0200
@@ -1,3 +1,3 @@
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
+openstackdocstheme>=1.20.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/doc/source/conf.py
new/futurist-2.1.1/doc/source/conf.py
--- old/futurist-1.9.0/doc/source/conf.py 2019-09-04 16:19:54.000000000
+0200
+++ new/futurist-2.1.1/doc/source/conf.py 2020-04-07 12:07:26.000000000
+0200
@@ -64,8 +64,6 @@
# html_static_path = ['static']
html_theme = 'openstackdocs'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
# Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/futurist/periodics.py
new/futurist-2.1.1/futurist/periodics.py
--- old/futurist-1.9.0/futurist/periodics.py 2019-09-04 16:19:54.000000000
+0200
+++ new/futurist-2.1.1/futurist/periodics.py 2020-04-07 12:07:26.000000000
+0200
@@ -25,7 +25,10 @@
import threading
from concurrent import futures
-import prettytable
+try:
+ import prettytable
+except ImportError:
+ prettytable = None
import six
import futurist
@@ -748,10 +751,17 @@
cols = list(_DEFAULT_COLS)
for c in ['Runs in', 'Active', 'Periodicity']:
cols.remove(c)
- self._log.debug("Stopped running %s callbacks:\n%s",
- len(self._works), self.pformat(columns=cols))
+ self._log.debug(
+ "Stopped running %s callbacks:\n%s",
+ len(self._works),
+ self.pformat(columns=cols) if prettytable
+ else "statistics not available, PrettyTable missing"
+ )
def pformat(self, columns=_DEFAULT_COLS):
+ if prettytable is None:
+ raise ImportError(
+ "PrettyTable is required to use the pformat method")
# Convert to a list to ensure we maintain the same order when used
# further in this function (since order will matter)...
if not isinstance(columns, (list, tuple)):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/futurist/waiters.py
new/futurist-2.1.1/futurist/waiters.py
--- old/futurist-1.9.0/futurist/waiters.py 2019-09-04 16:19:54.000000000
+0200
+++ new/futurist-2.1.1/futurist/waiters.py 2020-04-07 12:07:26.000000000
+0200
@@ -187,7 +187,8 @@
len(not_done))
waiter.event.wait(timeout)
for f in not_done:
- f._waiters.remove(waiter)
+ with f._condition:
+ f._waiters.remove(waiter)
with _acquire_and_release_futures(fs):
done, not_done = _partition_futures(fs)
@@ -207,7 +208,8 @@
waiter.event.wait(timeout)
for f in fs:
- f._waiters.remove(waiter)
+ with f._condition:
+ f._waiters.remove(waiter)
with _acquire_and_release_futures(fs):
done, not_done = _partition_futures(fs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/futurist.egg-info/PKG-INFO
new/futurist-2.1.1/futurist.egg-info/PKG-INFO
--- old/futurist-1.9.0/futurist.egg-info/PKG-INFO 2019-09-04
16:20:39.000000000 +0200
+++ new/futurist-2.1.1/futurist.egg-info/PKG-INFO 2020-04-07
12:08:41.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: futurist
-Version: 1.9.0
+Version: 2.1.1
Summary: Useful additions to futures, from the future.
Home-page: https://docs.openstack.org/futurist/latest/
Author: OpenStack
@@ -38,6 +38,7 @@
* Source: https://opendev.org/openstack/futurist
* Bugs: https://bugs.launchpad.net/futurist
* Blueprints: https://blueprints.launchpad.net/futurist
+ * Release notes: https://docs.openstack.org/releasenotes/futurist
Platform: UNKNOWN
@@ -47,8 +48,9 @@
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.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/futurist.egg-info/SOURCES.txt
new/futurist-2.1.1/futurist.egg-info/SOURCES.txt
--- old/futurist-1.9.0/futurist.egg-info/SOURCES.txt 2019-09-04
16:20:39.000000000 +0200
+++ new/futurist-2.1.1/futurist.egg-info/SOURCES.txt 2020-04-07
12:08:41.000000000 +0200
@@ -47,7 +47,9 @@
futurist/tests/test_periodics.py
futurist/tests/test_waiters.py
releasenotes/notes/add-reno-996dd44974d53238.yaml
+releasenotes/notes/drop-python27-support-5757997ea990b7ca.yaml
releasenotes/notes/improve-get-optimal-count-of-max_workers-for-pool-89368859d3b819e0.yaml
+releasenotes/notes/prettytable-optional-2c9198a9250427b6.yaml
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/ocata.rst
@@ -55,6 +57,7 @@
releasenotes/source/queens.rst
releasenotes/source/rocky.rst
releasenotes/source/stein.rst
+releasenotes/source/train.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/futurist.egg-info/pbr.json
new/futurist-2.1.1/futurist.egg-info/pbr.json
--- old/futurist-1.9.0/futurist.egg-info/pbr.json 2019-09-04
16:20:39.000000000 +0200
+++ new/futurist-2.1.1/futurist.egg-info/pbr.json 2020-04-07
12:08:41.000000000 +0200
@@ -1 +1 @@
-{"git_version": "25ffb8f", "is_release": true}
\ No newline at end of file
+{"git_version": "4836b63", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/futurist.egg-info/requires.txt
new/futurist-2.1.1/futurist.egg-info/requires.txt
--- old/futurist-1.9.0/futurist.egg-info/requires.txt 2019-09-04
16:20:39.000000000 +0200
+++ new/futurist-2.1.1/futurist.egg-info/requires.txt 2020-04-07
12:08:41.000000000 +0200
@@ -1,12 +1,2 @@
pbr!=2.1.0,>=2.0.0
six>=1.10.0
-PrettyTable<0.8,>=0.7.1
-
-[:(python_version<'3.0')]
-contextlib2>=0.4.0
-
-[:(python_version<'3.3')]
-monotonic>=0.6
-
-[:(python_version=='2.7' or python_version=='2.6')]
-futures>=3.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/lower-constraints.txt
new/futurist-2.1.1/lower-constraints.txt
--- old/futurist-1.9.0/lower-constraints.txt 2019-09-04 16:19:54.000000000
+0200
+++ new/futurist-2.1.1/lower-constraints.txt 2020-04-07 12:07:26.000000000
+0200
@@ -11,7 +11,6 @@
extras==1.0.0
fixtures==3.0.0
flake8==2.2.4
-futures==3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
greenlet==0.4.10
hacking==0.10.0
imagesize==0.7.1
@@ -22,7 +21,6 @@
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
-monotonic==0.6
mox3==0.20.0
openstackdocstheme==1.18.1
os-client-config==1.28.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/futurist-1.9.0/releasenotes/notes/drop-python27-support-5757997ea990b7ca.yaml
new/futurist-2.1.1/releasenotes/notes/drop-python27-support-5757997ea990b7ca.yaml
---
old/futurist-1.9.0/releasenotes/notes/drop-python27-support-5757997ea990b7ca.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/futurist-2.1.1/releasenotes/notes/drop-python27-support-5757997ea990b7ca.yaml
2020-04-07 12:07:26.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Support for Python 2.7 has been dropped. The minimum version of Python now
+ supported is Python 3.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/futurist-1.9.0/releasenotes/notes/prettytable-optional-2c9198a9250427b6.yaml
new/futurist-2.1.1/releasenotes/notes/prettytable-optional-2c9198a9250427b6.yaml
---
old/futurist-1.9.0/releasenotes/notes/prettytable-optional-2c9198a9250427b6.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/futurist-2.1.1/releasenotes/notes/prettytable-optional-2c9198a9250427b6.yaml
2020-04-07 12:07:26.000000000 +0200
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - |
+ The ``PrettyTable`` dependency has been made optional, as it
+ is only used in the `Periodics.pformat` method. If the use
+ of that method is important, users should depend on
+ ``PrettyTable`` directly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/releasenotes/source/conf.py
new/futurist-2.1.1/releasenotes/source/conf.py
--- old/futurist-1.9.0/releasenotes/source/conf.py 2019-09-04
16:19:54.000000000 +0200
+++ new/futurist-2.1.1/releasenotes/source/conf.py 2020-04-07
12:07:26.000000000 +0200
@@ -57,7 +57,6 @@
master_doc = 'index'
# General information about the project.
-project = u'futurist Release Notes'
copyright = u'2016, futurist Developers'
# Release notes do not need a version number in the title, they
@@ -146,10 +145,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 = '%Y-%m-%d %H:%M'
-
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
# html_use_smartypants = True
@@ -193,17 +188,6 @@
# -- Options for LaTeX output ---------------------------------------------
-latex_elements = {
- # The paper size ('letterpaper' or 'a4paper').
- # 'papersize': 'letterpaper',
-
- # The font size ('10pt', '11pt' or '12pt').
- # 'pointsize': '10pt',
-
- # Additional stuff for the LaTeX preamble.
- # 'preamble': '',
-}
-
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/releasenotes/source/index.rst
new/futurist-2.1.1/releasenotes/source/index.rst
--- old/futurist-1.9.0/releasenotes/source/index.rst 2019-09-04
16:19:54.000000000 +0200
+++ new/futurist-2.1.1/releasenotes/source/index.rst 2020-04-07
12:07:26.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ train
stein
rocky
queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/releasenotes/source/train.rst
new/futurist-2.1.1/releasenotes/source/train.rst
--- old/futurist-1.9.0/releasenotes/source/train.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/futurist-2.1.1/releasenotes/source/train.rst 2020-04-07
12:07:26.000000000 +0200
@@ -0,0 +1,6 @@
+==========================
+Train Series Release Notes
+==========================
+
+.. release-notes::
+ :branch: stable/train
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/requirements.txt
new/futurist-2.1.1/requirements.txt
--- old/futurist-1.9.0/requirements.txt 2019-09-04 16:19:54.000000000 +0200
+++ new/futurist-2.1.1/requirements.txt 2020-04-07 12:07:26.000000000 +0200
@@ -4,7 +4,3 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
six>=1.10.0 # MIT
-monotonic>=0.6;python_version<'3.3' # Apache-2.0
-futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
-contextlib2>=0.4.0;python_version<'3.0' # PSF License
-PrettyTable<0.8,>=0.7.1 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/setup.cfg new/futurist-2.1.1/setup.cfg
--- old/futurist-1.9.0/setup.cfg 2019-09-04 16:20:39.000000000 +0200
+++ new/futurist-2.1.1/setup.cfg 2020-04-07 12:08:41.000000000 +0200
@@ -6,6 +6,7 @@
author = OpenStack
author-email = [email protected]
home-page = https://docs.openstack.org/futurist/latest/
+python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -13,11 +14,11 @@
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.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3 :: Only
+ Programming Language :: Python :: Implementation :: CPython
[files]
packages =
@@ -27,9 +28,6 @@
directory = futurist/locale
domain = futurist
-[wheel]
-universal = 1
-
[update_catalog]
domain = futurist
output_dir = futurist/locale
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/setup.py new/futurist-2.1.1/setup.py
--- old/futurist-1.9.0/setup.py 2019-09-04 16:19:54.000000000 +0200
+++ new/futurist-2.1.1/setup.py 2020-04-07 12:07:26.000000000 +0200
@@ -16,14 +16,6 @@
# 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/futurist-1.9.0/test-requirements.txt
new/futurist-2.1.1/test-requirements.txt
--- old/futurist-1.9.0/test-requirements.txt 2019-09-04 16:19:54.000000000
+0200
+++ new/futurist-2.1.1/test-requirements.txt 2020-04-07 12:07:26.000000000
+0200
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking<0.11,>=0.10.0
+hacking>=3.0,<3.1.0 # Apache-2.0
# Used for making sure the eventlet executors work.
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
@@ -14,3 +14,4 @@
stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
+PrettyTable<0.8,>=0.7.1 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/futurist-1.9.0/tox.ini new/futurist-2.1.1/tox.ini
--- old/futurist-1.9.0/tox.ini 2019-09-04 16:19:54.000000000 +0200
+++ new/futurist-2.1.1/tox.ini 2020-04-07 12:07:26.000000000 +0200
@@ -1,30 +1,29 @@
[tox]
-minversion = 2.0
-envlist = py27,py37,pypy,pep8
+minversion = 3.1.1
+envlist = py37,pep8
+ignore_basepython_conflict = true
[testenv]
+basepython = python3
install_command = pip install {opts} {packages}
whitelist_externals = find
rm
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+
-c{env:UPPER_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
doc8 doc/source
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:cover]
-basepython = python3
setenv =
PYTHON=coverage run --source $project --parallel-mode
commands =
@@ -36,33 +35,30 @@
coverage xml -o cover/coverage.xml
coverage report
-[testenv:py27]
-basepython = python2.7
-
[testenv:docs]
-basepython = python3
+whitelist_externals = rm
deps = -r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build
- sphinx-build -E -W -b html doc/source doc/build/html
+ sphinx-build -E -W --keep-going -b html doc/source doc/build/html
[testenv:debug]
-basepython = python3
commands = oslo_debug_helper {posargs}
[flake8]
# E123, E125 skipped as they are invalid PEP-8.
-
show-source = True
-ignore = E123,E125
+ignore = E123,E125,E731,W504
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
[testenv:releasenotes]
-basepython = python3
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
+whitelist_externals = rm
+deps = {[testenv:docs]deps}
+commands =
+ rm -rf releasenotes/build
+ 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
