Merge branch 'master' into wheel

pyparsing · Jul 14, 2018 · 37eb333 · 37eb333
2 parents a57132f + 1d6c521
commit 37eb333
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,5 @@
 [bdist_wheel]
 universal = 1
+
+[metadata]
+license_file = LICENSE
diff --git a/setup.py b/setup.py
@@ -33,11 +33,13 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         ]
     )