|
@@ -1,33 +1,75 @@
|
|
|
# HG changeset patch
|
|
|
# User Raphael Pierzina <rpierzina@mozilla.com>
|
|
|
-# Date 1539166199 0
|
|
|
-# Node ID 6b1fd4c384b953bf617f0d58f4ce0ddf0e0b2326
|
|
|
-# Parent 0066f31f777c59c4215059da756fea2a74aa5916
|
|
|
-Bug 1471622 - Update dependency specifier for mozfile in tps; r=davehunt
|
|
|
+# Date 1539267610 0
|
|
|
+# Node ID 172e411269552064ec3531a25623c9d402701a6f
|
|
|
+# Parent 394b6d13adfbbc0c9b9e5f901f98ec6fa1c4e052
|
|
|
+[mozfile] Bump version to 2.0.0, update classifiers and add setup.cfg (Bug 1471622) r=davehunt
|
|
|
|
|
|
-Depends on D8097
|
|
|
+[mozfile] Bump version to 2.0.0, update classifiers and add setup.cfg (Bug 1471622)
|
|
|
|
|
|
-Differential Revision: https://phabricator.services.mozilla.com/D8098
|
|
|
+Differential Revision: https://phabricator.services.mozilla.com/D6905
|
|
|
|
|
|
-diff --git a/testing/tps/setup.py b/testing/tps/setup.py
|
|
|
---- a/testing/tps/setup.py
|
|
|
-+++ b/testing/tps/setup.py
|
|
|
-@@ -4,17 +4,17 @@
|
|
|
+diff --git a/testing/mozbase/mozfile/setup.cfg b/testing/mozbase/mozfile/setup.cfg
|
|
|
+new file mode 100644
|
|
|
+--- /dev/null
|
|
|
++++ b/testing/mozbase/mozfile/setup.cfg
|
|
|
+@@ -0,0 +1,2 @@
|
|
|
++[bdist_wheel]
|
|
|
++universal = 1
|
|
|
+diff --git a/testing/mozbase/mozfile/setup.py b/testing/mozbase/mozfile/setup.py
|
|
|
+--- a/testing/mozbase/mozfile/setup.py
|
|
|
++++ b/testing/mozbase/mozfile/setup.py
|
|
|
+@@ -1,28 +1,34 @@
|
|
|
+ # This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
+ # License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
|
+ # You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
|
|
+ from __future__ import absolute_import
|
|
|
|
|
|
- from setuptools import setup, find_packages
|
|
|
- import sys
|
|
|
+ from setuptools import setup
|
|
|
|
|
|
- version = '0.5'
|
|
|
+-PACKAGE_NAME = 'mozfile'
|
|
|
+-PACKAGE_VERSION = '1.2'
|
|
|
++PACKAGE_NAME = "mozfile"
|
|
|
++PACKAGE_VERSION = "2.0.0"
|
|
|
|
|
|
- deps = ['httplib2 == 0.9.2',
|
|
|
-- 'mozfile == 1.2',
|
|
|
-+ 'mozfile >= 1.2',
|
|
|
- 'mozhttpd == 0.7',
|
|
|
- 'mozinfo >= 0.10',
|
|
|
- 'mozinstall == 1.12',
|
|
|
- 'mozprocess == 0.23',
|
|
|
- 'mozprofile == 0.28',
|
|
|
- 'mozrunner == 6.12',
|
|
|
- 'mozversion == 1.4',
|
|
|
- ]
|
|
|
+-setup(name=PACKAGE_NAME,
|
|
|
+- version=PACKAGE_VERSION,
|
|
|
+- description="Library of file utilities for use in Mozilla testing",
|
|
|
+- long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
|
|
|
+- classifiers=['Programming Language :: Python :: 2.7',
|
|
|
+- 'Programming Language :: Python :: 3'],
|
|
|
+- keywords='mozilla',
|
|
|
+- author='Mozilla Automation and Tools team',
|
|
|
+- author_email='tools@lists.mozilla.org',
|
|
|
+- url='https://wiki.mozilla.org/Auto-tools/Projects/Mozbase',
|
|
|
+- license='MPL',
|
|
|
+- packages=['mozfile'],
|
|
|
+- include_package_data=True,
|
|
|
+- zip_safe=False,
|
|
|
+- install_requires=['six >= 1.10.0'],
|
|
|
+- tests_require=['wptserve']
|
|
|
+- )
|
|
|
++setup(
|
|
|
++ name=PACKAGE_NAME,
|
|
|
++ version=PACKAGE_VERSION,
|
|
|
++ description="Library of file utilities for use in Mozilla testing",
|
|
|
++ long_description="see https://firefox-source-docs.mozilla.org/mozbase/index.html",
|
|
|
++ classifiers=[
|
|
|
++ "Programming Language :: Python :: 2",
|
|
|
++ "Programming Language :: Python :: 2.7",
|
|
|
++ "Programming Language :: Python :: 3",
|
|
|
++ "Programming Language :: Python :: 3.5",
|
|
|
++ "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
|
|
|
++ ],
|
|
|
++ keywords="mozilla",
|
|
|
++ author="Mozilla Automation and Tools team",
|
|
|
++ author_email="tools@lists.mozilla.org",
|
|
|
++ url="https://wiki.mozilla.org/Auto-tools/Projects/Mozbase",
|
|
|
++ license="MPL",
|
|
|
++ packages=["mozfile"],
|
|
|
++ include_package_data=True,
|
|
|
++ zip_safe=False,
|
|
|
++ install_requires=["six >= 1.10.0"],
|
|
|
++ tests_require=["wptserve"],
|
|
|
++)
|