From bd2216e568878c61ed724764e6c77f88ce9c160e Mon Sep 17 00:00:00 2001 From: dpeterson Date: Mon, 13 Aug 2007 00:07:13 +0000 Subject: [PATCH] * Egg-building infrastructure improvements (adding README.txt, LICENSE.txt, setup.cfg, etc.; re-ordering setup keywords to be alphabetical; updating dependencies to use the etsdeps function to allow dev builds to match; etc.) --- LICENSE.txt | 28 ++++++++++++++++++++++++ README.txt | 1 + setup.py | 62 +++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 LICENSE.txt create mode 100644 README.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..64ef4eee --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,28 @@ +This software is OSI Certified Open Source Software. +OSI Certified is a certification mark of the Open Source Initiative. + +Copyright (c) 2006, Enthought, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of Enthought, Inc. nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.txt b/README.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/README.txt @@ -0,0 +1 @@ + diff --git a/setup.py b/setup.py index 26667f10..d2ea3d7d 100644 --- a/setup.py +++ b/setup.py @@ -1,24 +1,54 @@ from setuptools import setup, find_packages +# Function to convert simple ETS project names and versions to a requirements +# spec that works for both development builds and stable builds. Allows +# a caller to specify a max version, which is intended to work along with +# Enthought's standard versioning scheme -- see the following write up: +# https://svn.enthought.com/enthought/wiki/EnthoughtVersionNumbers +def etsdep(p, min, max=None, literal=False): + require = '%s >=%s.dev' % (p, min) + if max is not None: + if literal is False: + require = '%s, <%s.a' % (require, max) + else: + require = '%s, <%s' % (require, max) + return require + + +# Declare our ETS project dependencies. +TRAITS = etsdep('enthought.traits', '3.0.0b1') +UTIL = etsdep('enthought.util', '3.0.0a1') + + setup( - name = "enthought.envisage", - version = "3.0a1", - description = "Envisage - An Extensible Application Framework", - url = "http://code.enthought.com/enstaller", - license = "BSD", - zip_safe = False, - packages = find_packages(), - ext_modules = [], + author = "Martin Chilvers", + author_email = "info@enthought.com", + dependency_links = [ + 'http://code.enthought.com/enstaller/eggs/source', + 'http://code.enthought.com/enstaller/eggs/source/unstable', + ], + description = "Envisage - An Extensible Application Framework", + extras_require = { + # All non-ets dependencies should be in this extra to ensure users can + # decide whether to require them or not. + 'nonets': [ + ], + }, + ext_modules = [], include_package_data = True, - + install_requires = [ + TRAITS, + UTIL, + ], + license = "BSD", + name = "enthought.envisage", namespace_packages = [ "enthought", "enthought.envisage" - ], - - install_requires = [ - "enthought.traits>=3.0.0b1", - "enthought.util" - ] -) + ], + packages = find_packages(), + url = "http://code.enthought.com/envisage", + version = "3.0.0a1", + zip_safe = False, + )