Bump version to 0.9.1

MozillaSecurity · May 12, 2020 · c20eb46 · c20eb46
1 parent 1477bb1
commit c20eb46
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,6 +47,7 @@ deploy:
   password:
     secure: V3f+OpShnYZdxHSB8i6OwUMbFeqQ8NnfmYzm8s/YH4awSbn5TqjL1wQn7cqWR7trIUgUzp+RGafHy5agk7pTUM6Pj2tLb3w336c6KJmeub0vfifRFZJySjXTFN09DX64J2FD4KeiTIyOUemgQSU0jxCpwJXQrgdInHC3EEolE0loAydVdKWwYy6W5u+BPkY64zTHsEconDmc6TMqpKTI5UN4Iy/FPKTtJ4ifHUTv0uowI5JxbjgxYpzXmqD9XgtHo8k5jwPsu0QS7LuPNnDUN8sCFQ5WPJtnkE9SLfrNkCYnSzFrxJIfKbJBDZRjNp9v2Uz2jwCvvTyGKLQeVmVacLB4IwmT0ENXiDk7wtqVEO9lPXlvRVVt0w3xV5tOV8jfNcW8dookuZSzGtZ2sxWYwcro7uzNc36le6suhmJTq6w0uoj9ubcHnrbY2A181roAWPEtyCBf25lpM+C8jGmCgXEci9LhCZH79jrSgVds4jiXd+rXMo/qU86ye/6j/o7l5fnJmw/Or7dA3JsHIvYgBy9Ryh52uhCeggIcgFohgmhcRyLD5zkdLfzqNl+kY0nI12qeSAmceP8JCiUc0LX9/3e6B4X/knJ4s/ArbF5X/V4GzorE6tNxcpfwTMh4QnzraQgSAt/JhJz1QeYMMKJ0SVzAkGePNqDCWXHFGFoS+FE=
   on:
+    branch: master
     tags: true
     os: linux
-    python: 2.7
+    python: 3.8
diff --git a/setup.py b/setup.py
@@ -1,24 +1,25 @@
 #!/usr/bin/env python
 # coding=utf-8
-"""
-Grizzly setup
-"""
 # 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 https://mozilla.org/MPL/2.0/.
-import itertools
+"""Grizzly setup"""
+from os.path import dirname, join as pathjoin
+from itertools import chain
 from setuptools import setup
 
 
 EXTRAS = {
     'reduce': ['lithium-reducer', 'jsbeautifier'],
     's3': ['boto3'],
 }
-EXTRAS['all'] = list(set(itertools.chain.from_iterable(EXTRAS.values())))
+EXTRAS['all'] = list(set(chain.from_iterable(EXTRAS.values())))
 EXTRAS['test'] = ['pytest>=3.9', 'pytest-cov', 'pytest-mock']
 
 
 if __name__ == '__main__':
+    with open(pathjoin(dirname(__file__), "README.md"), "r") as infp:
+        README = infp.read()
     setup(
         classifiers=[
             'Intended Audience :: Developers',
@@ -28,9 +29,10 @@
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
-            'Programming Language :: Python :: 3.6'
+            'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8'
         ],
         description='A framework for developing and running browser fuzzers',
         entry_points={
@@ -43,10 +45,19 @@
             ],
         },
         extras_require=EXTRAS,
-        install_requires=['fasteners', 'ffpuppet', 'FuzzManager', 'psutil', 'six'],
+        install_requires=[
+            'fasteners',
+            'ffpuppet',
+            'FuzzManager',
+            'psutil',
+            'six'
+        ],
+        keywords="firefox fuzz fuzzing test testing",
         license='MPL 2.0',
-        maintainer='Tyson Smith',
-        maintainer_email='twsmith@mozilla.com',
+        long_description=README,
+        long_description_content_type="text/markdown",
+        maintainer="Mozilla Fuzzing Team",
+        maintainer_email="fuzzing@mozilla.com",
         name='grizzly-framework',
         packages=[
             'grizzly',
@@ -57,4 +68,4 @@
             'sapphire',
         ],
         url='https://github.com/MozillaSecurity/grizzly',
-        version='0.9.0')
+        version='0.9.1')