diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6ed986a --- /dev/null +++ b/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2012, Konstantin Tretyakov + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..c4bf456 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include README.rst \ No newline at end of file diff --git a/README.rst b/README.rst index fb3440d..af2330d 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ This package contains a rountine for plotting area-weighted three-circle venn di Copyright 2012, Konstantin Tretyakov. http://kt.era.ee/ -Licensed under BSD. +Licensed under MIT. Installation diff --git a/matplotlib/venn/__init__.py b/matplotlib/venn/__init__.py index c5b8224..d2755eb 100644 --- a/matplotlib/venn/__init__.py +++ b/matplotlib/venn/__init__.py @@ -4,7 +4,7 @@ Copyright 2012, Konstantin Tretyakov. http://kt.era.ee/ -Licensed under BSD. +Licensed under MIT license. This package contains a rountine for plotting area-weighted three-circle venn diagrams. There are two main functions here: venn3_circles and venn3 @@ -42,13 +42,5 @@ ha='center', textcoords='offset points', bbox=dict(boxstyle='round,pad=0.5', fc='gray', alpha=0.1), arrowprops=dict(arrowstyle='->', connectionstyle='arc3,rad=0.5',color='gray')) ''' -from matplotlib.venn import * -v = venn3(sets=(0, 1, 1, 1, 1, 1, 1, 1), set_labels = ('A', 'B', 'C')) -venn3_circles(sets=(0, 1, 1, 1, 1, 1, 1, 1), linestyle='dashed') -v.get_patch_by_id('100').set_alpha(1.0) -v.get_patch_by_id('100').set_color('white') -v.get_text_by_id('100').set_text('Unknown') - - from _venn3 import venn3, venn3_circles ___all___ = ['venn3', 'venn3_circles'] diff --git a/matplotlib/venn/_math.py b/matplotlib/venn/_math.py index cfa6fc6..f0fa887 100644 --- a/matplotlib/venn/_math.py +++ b/matplotlib/venn/_math.py @@ -5,7 +5,7 @@ Copyright 2012, Konstantin Tretyakov. http://kt.era.ee/ -Licensed under BSD. +Licensed under MIT license. ''' from scipy.optimize import brentq diff --git a/matplotlib/venn/_venn3.py b/matplotlib/venn/_venn3.py index 3012b6b..2aa63f4 100644 --- a/matplotlib/venn/_venn3.py +++ b/matplotlib/venn/_venn3.py @@ -5,7 +5,7 @@ Copyright 2012, Konstantin Tretyakov. http://kt.era.ee/ -Licensed under BSD. +Licensed under MIT license. ''' import numpy as np import warnings diff --git a/matplotlib/venn/venn3_test.py b/matplotlib/venn/venn3_test.py index e73491d..69921a2 100644 --- a/matplotlib/venn/venn3_test.py +++ b/matplotlib/venn/venn3_test.py @@ -5,7 +5,7 @@ Copyright 2012, Konstantin Tretyakov. http://kt.era.ee/ -Licensed under BSD. +Licensed under MIT license. ''' from numpy import array, pi, sqrt, arcsin from _venn3 import * diff --git a/setup.cfg b/setup.cfg index f737f64..afc6ff4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [egg_info] -tag_build = dev -tag_svn_revision = true +tag_build = +tag_svn_revision = false [pytest] addopts = --ignore=setup.py --doctest-modules \ No newline at end of file diff --git a/setup.py b/setup.py index 0686fcb..3a749b8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ Copyright 2012, Konstantin Tretyakov. http://kt.era.ee/ -Licensed under BSD. +Licensed under MIT license. ''' from setuptools import setup, find_packages @@ -26,21 +26,22 @@ def run_tests(self): setup(name='matplotlib-venn', version=version, - description="Methods for generating area-proportional 2- and 3-way venn diagrams.", - long_description="""Methods for generating area-proportional 2- and 3-way venn diagrams.""", + description="Functions for drawing area-proportional 3-way venn diagrams in matplotlib.", + long_description=open("README.rst").read(), classifiers=[ # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers 'Development Status :: 2 - Pre-Alpha', 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: BSD License', + 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2', 'Topic :: Scientific/Engineering :: Visualization' ], - keywords='matplotlib plotting venn diagrams', + platforms=['Platform Independent'], + keywords='matplotlib plotting charts venn-diagrams', author='Konstantin Tretyakov', author_email='kt@ut.ee', - url='http://kt.era.ee/', - license='BSD', + url='https://github.com/konstantint/matplotlib-venn', + license='MIT', namespace_packages = ['matplotlib'], packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, @@ -48,7 +49,5 @@ def run_tests(self): install_requires=['matplotlib', 'numpy', 'scipy'], tests_require=['pytest'], cmdclass = {'test': PyTest}, - entry_points=""" - # -*- Entry points: -*- - """, + entry_points='' )