Skip to content

Commit

Permalink
Fixes for first PyPi release
Browse files Browse the repository at this point in the history
  • Loading branch information
konstantint committed Oct 12, 2012
1 parent e1f2030 commit f87c71d
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 25 deletions.
7 changes: 7 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include README.rst
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions matplotlib/venn/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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']
2 changes: 1 addition & 1 deletion matplotlib/venn/_math.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright 2012, Konstantin Tretyakov.
http://kt.era.ee/
Licensed under BSD.
Licensed under MIT license.
'''

from scipy.optimize import brentq
Expand Down
2 changes: 1 addition & 1 deletion matplotlib/venn/_venn3.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion matplotlib/venn/venn3_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -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
19 changes: 9 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,29 +26,28 @@ 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='[email protected]',
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,
zip_safe=True,
install_requires=['matplotlib', 'numpy', 'scipy'],
tests_require=['pytest'],
cmdclass = {'test': PyTest},
entry_points="""
# -*- Entry points: -*-
""",
entry_points=''
)

0 comments on commit f87c71d

Please sign in to comment.