Commits

Lynn Rees  committed dcc300e

- update infrastructure

  • Participants
  • Parent commits 751e175
  • Branches next

Comments (0)

Files changed (5)

 Copyright (c) 2012 L. C. Rees.  All rights reserved.
 
-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:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+1.  Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+2.  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.
+3.  Neither the name of the Portable Site Information Project nor the names
+of its contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-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.
+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.
 include LICENSE.txt
 include MANIFEST.in
 include README.rst
+include packages
+inclued requirements.txt
 recursive-include twoq *.py
+twoq
+twoq.active
+twoq.lazy

File requirements.txt

+stuf>=0.8.12
 # -*- coding: utf-8 -*-
 '''setup for twoq'''
 
-import os
-
+from os import getcwd
+from os.path import join
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-install_requires = ['stuf>=0.8.11']
+from twoq import __version__
+
+install_requires = list(l for l in open(
+    join(getcwd(), 'requirements.txt'), 'r',
+).readlines())
 
 setup(
     name='twoq',
-    version='0.4.9',
+    version='{}.{}.{}'.format(*__version__),
     description='iterator chaining, underscored by a two-headed queue',
-    long_description=open(os.path.join(os.getcwd(), 'README.rst'), 'r').read(),
+    long_description=open(join(getcwd(), 'README.rst'), 'r').read(),
+    keywords='queue generator utility iterator functional programming',
+    license='BSD',
     author='L. C. Rees',
+    author_email='lcrees@gmail.com',
     url='https://bitbucket.org/lcrees/twoq/',
-    author_email='lcrees@gmail.com',
-    license='BSD',
-    packages=['twoq', 'twoq.mixins', 'twoq.active', 'twoq.lazy'],
+    packages=[l for l in open(join(getcwd(), 'packages'), 'r').readlines()],
     test_suite='twoq.tests',
     zip_safe=False,
-    keywords='queue generator utility iterator functional programming',
     install_requires=install_requires,
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
+        'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: Implementation :: CPython',
+        'Topic :: Software Development',
         'Topic :: Software Development :: Libraries',
         'Topic :: Utilities',
     ],