From 7d2319129f9607a4f62aca3d2c9d00b39120af86 Mon Sep 17 00:00:00 2001 From: hugovk Date: Tue, 26 Mar 2019 21:47:29 +0200 Subject: [PATCH 1/3] Sort classifiers --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 5d8159a12..6e7f64c79 100755 --- a/setup.py +++ b/setup.py @@ -765,11 +765,6 @@ try: url='http://python-pillow.org', classifiers=[ "Development Status :: 6 - Mature", - "Topic :: Multimedia :: Graphics", - "Topic :: Multimedia :: Graphics :: Capture :: Digital Camera", - "Topic :: Multimedia :: Graphics :: Capture :: Screen Capture", - "Topic :: Multimedia :: Graphics :: Graphics Conversion", - "Topic :: Multimedia :: Graphics :: Viewers", "License :: Other/Proprietary License", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", @@ -779,6 +774,11 @@ try: "Programming Language :: Python :: 3.7", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", + "Topic :: Multimedia :: Graphics", + "Topic :: Multimedia :: Graphics :: Capture :: Digital Camera", + "Topic :: Multimedia :: Graphics :: Capture :: Screen Capture", + "Topic :: Multimedia :: Graphics :: Graphics Conversion", + "Topic :: Multimedia :: Graphics :: Viewers", ], python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*", cmdclass={"build_ext": pil_build_ext}, From bab5d068bff2b1b660a2d3e0273d663ed734b579 Mon Sep 17 00:00:00 2001 From: hugovk Date: Tue, 26 Mar 2019 22:02:55 +0200 Subject: [PATCH 2/3] Update licence to HPND --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 6e7f64c79..8eb0b3c6b 100755 --- a/setup.py +++ b/setup.py @@ -765,7 +765,7 @@ try: url='http://python-pillow.org', classifiers=[ "Development Status :: 6 - Mature", - "License :: Other/Proprietary License", + "License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)", # noqa: E501 "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", @@ -789,7 +789,6 @@ try: packages=["PIL"], package_dir={'': 'src'}, keywords=["Imaging", ], - license='Standard PIL License', zip_safe=not (debug_build() or PLATFORM_MINGW), ) except RequiredDependencyException as err: msg = """ From b21ea99fd9b568b9b2f241a944150b542a003f92 Mon Sep 17 00:00:00 2001 From: hugovk Date: Tue, 26 Mar 2019 22:59:59 +0200 Subject: [PATCH 3/3] Relax incorrect pyroma test --- Tests/test_pyroma.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Tests/test_pyroma.py b/Tests/test_pyroma.py index 3c4e3d9a2..7c48c365f 100644 --- a/Tests/test_pyroma.py +++ b/Tests/test_pyroma.py @@ -10,7 +10,6 @@ except ImportError: @unittest.skipIf(pyroma is None, "Pyroma is not installed") class TestPyroma(PillowTestCase): - def test_pyroma(self): # Arrange data = pyroma.projectdata.get_data(".") @@ -19,12 +18,13 @@ class TestPyroma(PillowTestCase): rating = pyroma.ratings.rate(data) # Assert - if 'rc' in __version__: - # Pyroma needs to chill about RC versions - # and not kill all our tests. - self.assertEqual(rating, (9, [ - "The package's version number does not comply with PEP-386."])) + if "rc" in __version__: + # Pyroma needs to chill about RC versions and not kill all our tests. + self.assertEqual( + rating, + (9, ["The package's version number does not comply with PEP-386."]), + ) else: - # Should have a perfect score - self.assertEqual(rating, (10, [])) + # Should have a near-perfect score + self.assertEqual(rating, (9, ["Your package does not have license data."]))