Merge pull request #3752 from hugovk/update-classifiers

Update Trove licence classifiers

Author: aclark4life

Tests/test_pyroma.py

@@ -10,7 +10,6 @@
 
 @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 @@ def test_pyroma(self):
         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."]))

setup.py

@@ -765,12 +765,7 @@ def debug_build():
           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",
+              "License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)",  # noqa: E501
               "Programming Language :: Python :: 2",
               "Programming Language :: Python :: 2.7",
               "Programming Language :: Python :: 3",
@@ -779,6 +774,11 @@ def debug_build():
               "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},
@@ -789,7 +789,6 @@ def debug_build():
           packages=["PIL"],
           package_dir={'': 'src'},
           keywords=["Imaging", ],
-          license='Standard PIL License',
           zip_safe=not (debug_build() or PLATFORM_MINGW), )
 except RequiredDependencyException as err:
     msg = """