diff --git a/.gitignore b/.gitignore index e820d82..dd0ac37 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ .*.swp .*.swo greenhouse.egg-info/* -MANIFEST.in build/* docs/build/* dist/* diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..f1cb737 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include setup.py diff --git a/pavement.py b/pavement.py deleted file mode 100644 index eb8dbe9..0000000 --- a/pavement.py +++ /dev/null @@ -1,67 +0,0 @@ -from paver.easy import * -from paver.path import path -from paver.setuputils import setup - - -VERSION = (2, 1, 4, "") - -setup( - name="greenhouse", - description="An I/O parallelism library making use of coroutines", - packages=[ - "greenhouse", - "greenhouse.io", - "greenhouse.emulation", - "greenhouse.ext"], - version=".".join(filter(None, map(str, VERSION))), - author="Travis Parker", - author_email="travis.parker@gmail.com", - url="http://github.com/teepark/greenhouse", - license="BSD", - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", - "Natural Language :: English", - "Programming Language :: Python", - ], - install_requires=['greenlet'], -) - -MANIFEST = ( - "setup.py", - "paver-minilib.zip", -) - -@task -def manifest(): - path('MANIFEST.in').write_lines('include %s' % x for x in MANIFEST) - -@task -@needs('generate_setup', 'minilib', 'manifest', 'setuptools.command.sdist') -def sdist(): - pass - -@task -def clean(): - for p in map(path, ( - 'greenhouse.egg-info', 'dist', 'build', 'MANIFEST.in', 'docs/build')): - if p.exists(): - if p.isdir(): - p.rmtree() - else: - p.remove() - for p in path(__file__).abspath().parent.walkfiles(): - if p.endswith(".pyc") or p.endswith(".pyo"): - p.remove() - -@task -def docs(): - # have to touch the automodules to build them every time since changes to - # the module's docstrings won't affect the timestamp of the .rst file - sh("find docs/source/greenhouse -name *.rst | xargs touch") - sh("cd docs; make html") - -@task -def test(): - sh("nosetests --processes=8") diff --git a/paver-minilib.zip b/paver-minilib.zip deleted file mode 100644 index b4a5081..0000000 Binary files a/paver-minilib.zip and /dev/null differ diff --git a/setup.py b/setup.py index d041358..412985d 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,31 @@ +#!/usr/bin/env python +# vim: fileencoding=utf8:et:sw=4:ts=8:sts=4 + import os -if os.path.exists("paver-minilib.zip"): - import sys - sys.path.insert(0, "paver-minilib.zip") +from setuptools import setup + + +VERSION = (2, 1, 4, "") -import paver.tasks -paver.tasks.main() +setup( + name="greenhouse", + description="An I/O parallelism library making use of coroutines", + packages=[ + "greenhouse", + "greenhouse.io", + "greenhouse.emulation", + "greenhouse.ext"], + version=".".join(filter(None, map(str, VERSION))), + author="Travis Parker", + author_email="travis.parker@gmail.com", + url="http://github.com/teepark/greenhouse", + license="BSD", + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Natural Language :: English", + "Programming Language :: Python", + ], + install_requires=['greenlet'], +)