Hello community, here is the log from the commit of package python-mox3 for openSUSE:Factory checked in at 2017-11-27 22:16:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mox3 (Old) and /work/SRC/openSUSE:Factory/.python-mox3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mox3" Mon Nov 27 22:16:43 2017 rev:4 rq:545340 version:0.23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mox3/python-mox3.changes 2015-06-24 20:49:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-mox3.new/python-mox3.changes 2017-11-27 22:16:50.206063323 +0100 @@ -1,0 +2,10 @@ +Fri Nov 24 23:07:52 UTC 2017 - [email protected] + +- update to version 0.23.0: + * Update URLs in documents according to document migration + * Update .gitignore + * turn on warning-is-error flag for doc build + * switch from oslosphinx to openstackdocstheme + * rearrange existing documentation based on the new standard layout + +------------------------------------------------------------------- Old: ---- mox3-0.8.0.tar.gz New: ---- _service mox3-0.23.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mox3.spec ++++++ --- /var/tmp/diff_new_pack.sd2jVG/_old 2017-11-27 22:16:50.958036028 +0100 +++ /var/tmp/diff_new_pack.sd2jVG/_new 2017-11-27 22:16:50.958036028 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-mox3 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,44 +16,80 @@ # +%global pypi_name mox3 Name: python-mox3 -Version: 0.8.0 +Version: 0.23.0 Release: 0 -Summary: Mock object framework for Python +Summary: An unofficial port of the Google mox framework to Python 3 License: Apache-2.0 Group: Development/Languages/Python -Url: http://www.openstack.org/ -Source: https://pypi.python.org/packages/source/m/mox3/mox3-%{version}.tar.gz -BuildRequires: python-devel -BuildRequires: python-pbr -BuildRequires: python-setuptools -Requires: python-fixtures >= 0.3.14 -Requires: python-pbr >= 0.11 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else +Url: http://bugs.launchpad.net/python-mox3 +Source0: https://files.pythonhosted.org/packages/source/m/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +BuildRequires: openstack-macros +BuildRequires: python2-fixtures >= 3.0.0 +BuildRequires: python2-pbr >= 2.0.0 +BuildRequires: python2-python-subunit >= 0.0.18 +BuildRequires: python2-setuptools >= 16.0 +BuildRequires: python2-testrepository >= 0.0.18 +BuildRequires: python2-testtools >= 1.4.0 +BuildRequires: python3-fixtures >= 3.0.0 +BuildRequires: python3-pbr >= 2.0.0 +BuildRequires: python3-python-subunit >= 0.0.18 +BuildRequires: python3-setuptools >= 16.0 +BuildRequires: python3-testrepository >= 0.0.18 +BuildRequires: python3-testtools >= 1.4.0 +Requires: python-fixtures >= 3.0.0 +Requires: python-pbr >= 2.0.0 BuildArch: noarch -%endif +%python_subpackages %description -Mox3 is an unofficial port of the Google mox framework -(http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible -with mox as possible, but small enhancements have been made. The library was -tested on Python version 3.2, 2.7 and 2.6. +Mox3 is an unofficial port of the Google mox framework to Python 3. It +was meant to be as compatible with mox as possible, but small +enhancements have been made. The library was tested on Python version +3.2, 2.7 and 2.6. + +%package -n python-mox3-doc +Summary: Documentation for %{name} +Group: Documentation +BuildRequires: python-Sphinx +BuildRequires: python-openstackdocstheme >= 1.11.0 + +%description -n python-mox3-doc +Mox3 is an unofficial port of the Google mox framework to Python 3. It +was meant to be as compatible with mox as possible, but small +enhancements have been made. The library was tested on Python version +3.2, 2.7 and 2.6. + +This package contains documentation in HTML format. %prep -%setup -q -n mox3-%{version} +%autosetup -n %{pypi_name}-%{version} +%py_req_cleanup +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -python setup.py build +%python_build + +# generate html docs +%{__python2} setup.py build_sphinx + +%check +%{python_expand rm -rf .testrepository +$python setup.py testr +} %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install -%files -%defattr(-,root,root,-) -%doc COPYING.txt ChangeLog AUTHORS README.rst -%{python_sitelib}/* +%files %{python_files} +%license COPYING.txt +%doc README.rst +%{python2_sitelib}/%{pypi_name} +%{python2_sitelib}/%{pypi_name}-*.egg-info + +%files -n python-mox3-doc +%license COPYING.txt +%doc doc/build/html %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="renderspec"> <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/mox3/mox3.spec.j2</param> <param name="output-name">python-mox3.spec</param> <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt</param> </service> <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> </service> <service name="format_spec_file" mode="disabled"/> </services> ++++++ mox3-0.8.0.tar.gz -> mox3-0.23.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/AUTHORS new/mox3-0.23.0/AUTHORS --- old/mox3-0.8.0/AUTHORS 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/AUTHORS 2017-07-18 15:10:06.000000000 +0200 @@ -1,6 +1,19 @@ +Cao Xuan Hoang <[email protected]> +ChangBo Guo(gcb) <[email protected]> +Davanum Srinivas <[email protected]> Dawid Fatyga <[email protected]> Doug Hellmann <[email protected]> +Dougal Matthews <[email protected]> +Flavio Percoco <[email protected]> Monty Taylor <[email protected]> Przemysław Gajda <[email protected]> +Sean Dague <[email protected]> +Swapnil Kulkarni (coolsvap) <[email protected]> +THOMAS J. COCOZZELLO <[email protected]> +Tony Breeds <[email protected]> +Tony Xu <[email protected]> +Victor Stinner <[email protected]> dglasser <dglasser@b1010a0a-674b-0410-b734-77272b80c875> +kavithahr <[email protected]> +ritesh.arya <[email protected]> smiddlek <smiddlek@b1010a0a-674b-0410-b734-77272b80c875> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/ChangeLog new/mox3-0.23.0/ChangeLog --- old/mox3-0.8.0/ChangeLog 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/ChangeLog 2017-07-18 15:10:06.000000000 +0200 @@ -1,6 +1,106 @@ CHANGES ======= +0.23.0 +------ + +* Update URLs in documents according to document migration +* Update .gitignore +* turn on warning-is-error flag for doc build +* switch from oslosphinx to openstackdocstheme +* rearrange existing documentation based on the new standard layout + +0.22.0 +------ + +* Updated from global requirements +* Updated from global requirements +* Python 3.5 is added +* Updated from global requirements + +0.21.0 +------ + +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements + +0.20.0 +------ + +* Revert "Use inspect.signature() if available" +* Remove vim header from source files + +0.19.0 +------ + +* Add Constraints support +* Use inspect.signature() if available +* Updated from global requirements +* Remove vim header from source files +* setup.cfg: configure doc build +* Replace 'assertTrue(a (not)in b)' with 'assert(Not)In(a, b)' +* Show team and repo badges on README + +0.18.0 +------ + +* Remove discover from test-requirements + +0.17.0 +------ + +* Updated from global requirements + +0.16.0 +------ + +* Updated from global requirements +* Correct spelling of occurrences + +0.15.0 +------ + +* Updated from global requirements +* Updated from global requirements + +0.14.0 +------ + +* Updated from global requirements +* Updated from global requirements + +0.13.0 +------ + +* Updated from global requirements +* Remove Python 2.6 classifier + +0.12.0 +------ + +* Add universal wheel tag to setup.cfg + +0.11.0 +------ + +* Fix broken test and remove Bad test +* Updated from global requirements +* Activate pep8 check that \_ is imported + +0.10.0 +------ + +* Updated from global requirements +* Updated from global requirements + +0.9.0 +----- + +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements + 0.8.0 ----- @@ -30,9 +130,9 @@ * Pep8's E111 error is now ignored * Removed exclamation mark from travis.yml * Added pep8 to .travis.yml -* Fixed deprecation warnings in mox_test.py +* Fixed deprecation warnings in mox\_test.py * Introduced class to which mocks can be bound in order to preserve binding information (Python3 and missing unbound methods issue) -* Added __hash__ for MockMethod - no default hash in py3k +* Added \_\_hash\_\_ for MockMethod - no default hash in py3k * bugfix for unhashable/uncomparable dicts * Restored callable function since it's present in python 3.2 * Converted all classes to the new style (inheriting from object) - this is the only option in py3k @@ -54,14 +154,14 @@ * Mox release 0.5.1, which includes some bug fixes and tests for stubout * Fix for Issue 3, submitted by [email protected] * Fix for Issue 5, submitted by agoratim -* Patch from Matt Brown ([email protected]) to inspect the arguments of mocked methods. Alright! :) -* Added support for __contains__, thanks to Adam Lowry -* Added import for inspect, and tests for stubout. Patch by Manuel Holtgrewe -* Remove duplicate NotTest. Bad patch +* Patch from Matt Brown ([email protected]) to inspect the arguments of mocked methods. Alright! :) +* Added support for \_\_contains\_\_, thanks to Adam Lowry +* Added import for inspect, and tests for stubout. Patch by Manuel Holtgrewe +* Remove duplicate NotTest. Bad patch * Add a Not comparator to compose with other comparators * Fix MoxTestBase to be usable with multiple-inheritance * Write a README * Start our first release at 0.5.0, not 1.0.0 -* Include the mox_test_helper.py in the distribution +* Include the mox\_test\_helper.py in the distribution * Fix mailing list address * Initial import of mox (originally an internal Google project) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/PKG-INFO new/mox3-0.23.0/PKG-INFO --- old/mox3-0.8.0/PKG-INFO 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/PKG-INFO 2017-07-18 15:10:06.000000000 +0200 @@ -1,13 +1,17 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: mox3 -Version: 0.8.0 +Version: 0.23.0 Summary: Mock object framework for Python -Home-page: http://www.openstack.org/ +Home-page: https://docs.openstack.org/mox3/latest/ Author: OpenStack Author-email: [email protected] License: UNKNOWN -Description: Mox3 - Mock object framework for Python 3 - ========================================= +Description: =========================================== + Mox3 - Mock object framework for Python 3 + =========================================== + + .. image:: http://governance.openstack.org/badges/mox3.svg + :target: http://governance.openstack.org/reference/tags/index.html Mox3 is an unofficial port of the Google mox framework (http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible @@ -63,9 +67,19 @@ -------------- * Free software: Apache license - * Documentation: http://docs.openstack.org/developer/mox3 - * Source: http://git.openstack.org/cgit/openstack/mox3 - * Bugs: http://bugs.launchpad.net/python-mox3 + * Documentation: https://docs.openstack.org/mox3/latest/ + * Source: https://git.openstack.org/cgit/openstack/mox3 + * Bugs: https://bugs.launchpad.net/python-mox3 Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Programming Language :: Python +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Operating System :: OS Independent +Classifier: Development Status :: 4 - Beta +Classifier: Intended Audience :: Developers +Classifier: Topic :: Software Development :: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/README.rst new/mox3-0.23.0/README.rst --- old/mox3-0.8.0/README.rst 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/README.rst 2017-07-18 15:07:27.000000000 +0200 @@ -1,5 +1,9 @@ -Mox3 - Mock object framework for Python 3 -========================================= +=========================================== + Mox3 - Mock object framework for Python 3 +=========================================== + +.. image:: http://governance.openstack.org/badges/mox3.svg + :target: http://governance.openstack.org/reference/tags/index.html Mox3 is an unofficial port of the Google mox framework (http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible @@ -55,6 +59,6 @@ -------------- * Free software: Apache license -* Documentation: http://docs.openstack.org/developer/mox3 -* Source: http://git.openstack.org/cgit/openstack/mox3 -* Bugs: http://bugs.launchpad.net/python-mox3 +* Documentation: https://docs.openstack.org/mox3/latest/ +* Source: https://git.openstack.org/cgit/openstack/mox3 +* Bugs: https://bugs.launchpad.net/python-mox3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/doc/source/conf.py new/mox3-0.23.0/doc/source/conf.py --- old/mox3-0.8.0/doc/source/conf.py 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/doc/source/conf.py 2017-07-18 15:07:27.000000000 +0200 @@ -8,7 +8,13 @@ # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'oslosphinx'] +extensions = ['sphinx.ext.autodoc', 'openstackdocstheme'] + +# openstackdocstheme options +repository_name = 'openstack/mox3' +bug_project = '' +bug_tag = '' +html_last_updated_fmt = '%Y-%m-%d %H:%M' # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. @@ -42,7 +48,7 @@ # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. # html_theme_path = ["."] -# html_theme = '_theme' +html_theme = 'openstackdocs' html_static_path = ['static'] # Output file base name for HTML help builder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/doc/source/contributing.rst new/mox3-0.23.0/doc/source/contributing.rst --- old/mox3-0.8.0/doc/source/contributing.rst 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/doc/source/contributing.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -============== - Contributing -============== - -.. include:: ../../CONTRIBUTING.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/doc/source/contributor/index.rst new/mox3-0.23.0/doc/source/contributor/index.rst --- old/mox3-0.8.0/doc/source/contributor/index.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/mox3-0.23.0/doc/source/contributor/index.rst 2017-07-18 15:07:27.000000000 +0200 @@ -0,0 +1,5 @@ +============== + Contributing +============== + +.. include:: ../../../CONTRIBUTING.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/doc/source/index.rst new/mox3-0.23.0/doc/source/index.rst --- old/mox3-0.8.0/doc/source/index.rst 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/doc/source/index.rst 2017-07-18 15:07:27.000000000 +0200 @@ -9,8 +9,8 @@ .. toctree:: :maxdepth: 2 - readme - contributing + user/index + contributor/index Indices and tables ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/doc/source/readme.rst new/mox3-0.23.0/doc/source/readme.rst --- old/mox3-0.8.0/doc/source/readme.rst 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/doc/source/readme.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -.. include:: ../../README.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/doc/source/user/index.rst new/mox3-0.23.0/doc/source/user/index.rst --- old/mox3-0.8.0/doc/source/user/index.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/mox3-0.23.0/doc/source/user/index.rst 2017-07-18 15:07:27.000000000 +0200 @@ -0,0 +1 @@ +.. include:: ../../../README.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3/fixture.py new/mox3-0.23.0/mox3/fixture.py --- old/mox3-0.8.0/mox3/fixture.py 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/mox3/fixture.py 2017-07-18 15:07:27.000000000 +0200 @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3/mox.py new/mox3-0.23.0/mox3/mox.py --- old/mox3-0.8.0/mox3/mox.py 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/mox3/mox.py 2017-07-18 15:07:27.000000000 +0200 @@ -910,7 +910,9 @@ except TypeError: raise ValueError('Could not get argument specification for %r' % (method,)) - if inspect.ismethod(method) or class_to_bind: + if (inspect.ismethod(method) or class_to_bind or ( + hasattr(self, '_args') and len(self._args) > 0 + and self._args[0] == 'self')): self._args = self._args[1:] # Skip 'self'. self._method = method self._instance = None # May contain the instance this is bound to. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3/tests/test_mox.py new/mox3-0.23.0/mox3/tests/test_mox.py --- old/mox3-0.8.0/mox3/tests/test_mox.py 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/mox3/tests/test_mox.py 2017-07-18 15:07:27.000000000 +0200 @@ -19,12 +19,10 @@ import io import re -import sys from mox3 import mox from mox3.tests import mox_helper -import six import testtools @@ -285,7 +283,7 @@ self.assertFalse(mox.StrContains("AAA") == "hello world") def testMultipleMatches(self): - """Should return True if there are multiple occurances of substring.""" + """Should return True if there are multiple occurrences of substring""" self.assertTrue(mox.StrContains("abc") == "ababcabcabcababc") @@ -766,27 +764,12 @@ def testIsReprable(self): """Test that MockAnythings can be repr'd without causing a failure.""" - self.assertTrue('MockAnything' in repr(self.mock_object)) + self.assertIn('MockAnything', repr(self.mock_object)) class MethodCheckerTest(testtools.TestCase): """Tests MockMethod's use of MethodChecker method.""" - def testUnboundMethodsRequiresInstance(self): - # SKIP TEST IN PYTHON 2.x (Ugly hack for python 2.6) - # REASON: semantics for unbound methods has changed only in Python 3 - # so this test in earlier versions is invald - if sys.version_info < (3, 0): - return - - instance = CheckCallTestClass() - method = mox.MockMethod('NoParameters', [], False, - CheckCallTestClass.NoParameters) - - self.assertRaises(AttributeError, method) - method(instance) - self.assertRaises(AttributeError, method, instance, 1) - def testNoParameters(self): method = mox.MockMethod('NoParameters', [], False, CheckCallTestClass.NoParameters, @@ -978,27 +961,27 @@ def testFindValidMethods(self): """Mock should be able to mock all public methods.""" - self.assertTrue('ValidCall' in self.mock_object._known_methods) - self.assertTrue('OtherValidCall' in self.mock_object._known_methods) - self.assertTrue('MyClassMethod' in self.mock_object._known_methods) - self.assertTrue('MyStaticMethod' in self.mock_object._known_methods) - self.assertTrue('_ProtectedCall' in self.mock_object._known_methods) - self.assertTrue('__PrivateCall' not in self.mock_object._known_methods) - self.assertTrue( - '_TestClass__PrivateCall' in self.mock_object._known_methods) + self.assertIn('ValidCall', self.mock_object._known_methods) + self.assertIn('OtherValidCall', self.mock_object._known_methods) + self.assertIn('MyClassMethod', self.mock_object._known_methods) + self.assertIn('MyStaticMethod', self.mock_object._known_methods) + self.assertIn('_ProtectedCall', self.mock_object._known_methods) + self.assertNotIn('__PrivateCall', self.mock_object._known_methods) + self.assertIn( + '_TestClass__PrivateCall', self.mock_object._known_methods) def testFindsSuperclassMethods(self): """Mock should be able to mock superclasses methods.""" self.mock_object = mox.MockObject(ChildClass) - self.assertTrue('ValidCall' in self.mock_object._known_methods) - self.assertTrue('OtherValidCall' in self.mock_object._known_methods) - self.assertTrue('MyClassMethod' in self.mock_object._known_methods) - self.assertTrue('ChildValidCall' in self.mock_object._known_methods) + self.assertIn('ValidCall', self.mock_object._known_methods) + self.assertIn('OtherValidCall', self.mock_object._known_methods) + self.assertIn('MyClassMethod', self.mock_object._known_methods) + self.assertIn('ChildValidCall', self.mock_object._known_methods) def testAccessClassVariables(self): """Class variables should be accessible through the mock.""" - self.assertTrue('SOME_CLASS_VAR' in self.mock_object._known_vars) - self.assertTrue('_PROTECTED_CLASS_VAR' in self.mock_object._known_vars) + self.assertIn('SOME_CLASS_VAR', self.mock_object._known_vars) + self.assertIn('_PROTECTED_CLASS_VAR', self.mock_object._known_vars) self.assertEqual('test_value', self.mock_object.SOME_CLASS_VAR) def testEquals(self): @@ -1200,7 +1183,7 @@ dummy._Replay() - self.assertTrue('X' in dummy) + self.assertIn('X', dummy) dummy._Verify() @@ -1908,7 +1891,6 @@ # FIXME(dhellmann): Skip this test until someone can debug why it # fails on python 3.4. - @testtools.skipIf(six.PY3, "This test needs to be fixed for python 3") def testStubOutClass_OldStyle(self): """Test a mocked class whose __init__ returns a Mock.""" self.mox.StubOutWithMock(mox_helper, 'TestClassFromAnotherModule') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3.egg-info/PKG-INFO new/mox3-0.23.0/mox3.egg-info/PKG-INFO --- old/mox3-0.8.0/mox3.egg-info/PKG-INFO 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/mox3.egg-info/PKG-INFO 2017-07-18 15:10:06.000000000 +0200 @@ -1,13 +1,17 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: mox3 -Version: 0.8.0 +Version: 0.23.0 Summary: Mock object framework for Python -Home-page: http://www.openstack.org/ +Home-page: https://docs.openstack.org/mox3/latest/ Author: OpenStack Author-email: [email protected] License: UNKNOWN -Description: Mox3 - Mock object framework for Python 3 - ========================================= +Description: =========================================== + Mox3 - Mock object framework for Python 3 + =========================================== + + .. image:: http://governance.openstack.org/badges/mox3.svg + :target: http://governance.openstack.org/reference/tags/index.html Mox3 is an unofficial port of the Google mox framework (http://code.google.com/p/pymox/) to Python 3. It was meant to be as compatible @@ -63,9 +67,19 @@ -------------- * Free software: Apache license - * Documentation: http://docs.openstack.org/developer/mox3 - * Source: http://git.openstack.org/cgit/openstack/mox3 - * Bugs: http://bugs.launchpad.net/python-mox3 + * Documentation: https://docs.openstack.org/mox3/latest/ + * Source: https://git.openstack.org/cgit/openstack/mox3 + * Bugs: https://bugs.launchpad.net/python-mox3 Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Programming Language :: Python +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Operating System :: OS Independent +Classifier: Development Status :: 4 - Beta +Classifier: Intended Audience :: Developers +Classifier: Topic :: Software Development :: Testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3.egg-info/SOURCES.txt new/mox3-0.23.0/mox3.egg-info/SOURCES.txt --- old/mox3-0.8.0/mox3.egg-info/SOURCES.txt 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/mox3.egg-info/SOURCES.txt 2017-07-18 15:10:06.000000000 +0200 @@ -12,9 +12,10 @@ test-requirements.txt tox.ini doc/source/conf.py -doc/source/contributing.rst doc/source/index.rst -doc/source/readme.rst +doc/source/contributor/index.rst +doc/source/static/.placeholder +doc/source/user/index.rst mox3/__init__.py mox3/fixture.py mox3/mox.py @@ -30,4 +31,5 @@ mox3/tests/mox_helper.py mox3/tests/stubout_helper.py mox3/tests/test_mox.py -mox3/tests/test_stubout.py \ No newline at end of file +mox3/tests/test_stubout.py +tools/tox_install.sh \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3.egg-info/pbr.json new/mox3-0.23.0/mox3.egg-info/pbr.json --- old/mox3-0.8.0/mox3.egg-info/pbr.json 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/mox3.egg-info/pbr.json 2017-07-18 15:10:06.000000000 +0200 @@ -1 +1 @@ -{"is_release": true, "git_version": "c919d92"} \ No newline at end of file +{"git_version": "812983a", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/mox3.egg-info/requires.txt new/mox3-0.23.0/mox3.egg-info/requires.txt --- old/mox3-0.8.0/mox3.egg-info/requires.txt 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/mox3.egg-info/requires.txt 2017-07-18 15:10:06.000000000 +0200 @@ -1,2 +1,2 @@ -pbr>=0.11,<2.0 -fixtures>=0.3.14 +pbr!=2.1.0,>=2.0.0 +fixtures>=3.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/requirements.txt new/mox3-0.23.0/requirements.txt --- old/mox3-0.8.0/requirements.txt 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/requirements.txt 2017-07-18 15:07:27.000000000 +0200 @@ -1,6 +1,6 @@ # 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. -pbr>=0.11,<2.0 +pbr!=2.1.0,>=2.0.0 # Apache-2.0 -fixtures>=0.3.14 +fixtures>=3.0.0 # Apache-2.0/BSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/setup.cfg new/mox3-0.23.0/setup.cfg --- old/mox3-0.8.0/setup.cfg 2015-06-15 16:01:17.000000000 +0200 +++ new/mox3-0.23.0/setup.cfg 2017-07-18 15:10:06.000000000 +0200 @@ -5,14 +5,14 @@ README.rst author = OpenStack author-email = [email protected] -home-page = http://www.openstack.org/ +home-page = https://docs.openstack.org/mox3/latest/ classifiers = Environment :: OpenStack Programming Language :: Python License :: OSI Approved :: Apache Software License - Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 + Programming Language :: Python :: 3.5 Operating System :: OS Independent Development Status :: 4 - Beta Intended Audience :: Developers @@ -22,12 +22,23 @@ packages = mox3 +[wheel] +universal = 1 + [global] setup-hooks = pbr.hooks.setup_hook +[build_sphinx] +source-dir = doc/source +build-dir = doc/build +all_files = 1 +warning-is-error = 1 + +[upload_sphinx] +upload-dir = doc/build/html + [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/setup.py new/mox3-0.23.0/setup.py --- old/mox3-0.8.0/setup.py 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/setup.py 2017-07-18 15:07:27.000000000 +0200 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,5 +25,5 @@ pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/test-requirements.txt new/mox3-0.23.0/test-requirements.txt --- old/mox3-0.8.0/test-requirements.txt 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/test-requirements.txt 2017-07-18 15:07:27.000000000 +0200 @@ -4,19 +4,18 @@ # this file lists dependencies required for the testing of heat # Install bounded pep8/pyflakes first, then let flake8 install -pep8==1.5.7 -pyflakes==0.8.1 -flake8>=2.2.4,<=2.4.1 +pep8==1.5.7 # MIT +pyflakes==0.8.1 # MIT +flake8<2.6.0,>=2.5.4 # MIT -coverage>=3.6 -discover -python-subunit>=0.0.18 -testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +coverage!=4.4,>=4.0 # Apache-2.0 +python-subunit>=0.0.18 # Apache-2.0/BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testtools>=1.4.0 # MIT -six>=1.9.0 +six>=1.9.0 # MIT # this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx>=1.6.2 # BSD +openstackdocstheme>=1.11.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/tools/tox_install.sh new/mox3-0.23.0/tools/tox_install.sh --- old/mox3-0.8.0/tools/tox_install.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/mox3-0.23.0/tools/tox_install.sh 2017-07-18 15:07:27.000000000 +0200 @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Client constraint file contains this client version pin that is in conflict +# with installing the client from source. We should remove the version pin in +# the constraints file before applying it for from-source installation. + +CONSTRAINTS_FILE="$1" +shift 1 + +set -e + +# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get +# published to logs.openstack.org for easy debugging. +localfile="$VIRTUAL_ENV/log/upper-constraints.txt" + +if [[ "$CONSTRAINTS_FILE" != http* ]]; then + CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE" +fi +# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep +curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile" + +pip install -c"$localfile" openstack-requirements + +# This is the main purpose of the script: Allow local installation of +# the current repo. It is listed in constraints file and thus any +# install will be constrained and we need to unconstrain it. +edit-constraints "$localfile" -- "$CLIENT_NAME" + +pip install -c"$localfile" -U "$@" +exit $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mox3-0.8.0/tox.ini new/mox3-0.23.0/tox.ini --- old/mox3-0.8.0/tox.ini 2015-06-15 16:00:59.000000000 +0200 +++ new/mox3-0.23.0/tox.ini 2017-07-18 15:07:27.000000000 +0200 @@ -1,8 +1,12 @@ [tox] -envlist = py34,py27,pep8 +minversion = 2.0 +envlist = py35,py27,pep8 [testenv] +install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} setenv = VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=mox3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = @@ -18,11 +22,9 @@ commands = {posargs} [testenv:cover] -setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --coverage [flake8] show-source = true -builtins = _ exclude=.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg
