Permalink
Browse files

Okay instead of having setuptools automatically discover files becaus…

…e they are under git revision control, let's instead give it a list of files in pyutil.egg-info/SOURCES.txt...
  • Loading branch information...
1 parent e1d28e3 commit dcb906a20c4d2be58519e681db699b088c8e84e9 @zookos zookos committed Dec 22, 2010
Showing with 117 additions and 8 deletions.
  1. +3 −0 debian/docs
  2. +110 −0 pyutil.egg-info/SOURCES.txt
  3. +4 −8 setup.py
View
3 debian/docs
@@ -0,0 +1,3 @@
+README.rst
+COPYING.TGPPL.html
+CREDITS
View
110 pyutil.egg-info/SOURCES.txt
@@ -0,0 +1,110 @@
+
+.binaries
+.boringfiles
+.gitignore
+COPYING.GPL
+COPYING.SPL.txt
+COPYING.TGPPL.html
+CREDITS
+NEWS.rst
+README.rst
+copyright
+ez_setup.py
+setup.cfg
+setup.py
+debian/changelog
+debian/compat
+debian/control
+debian/copyright
+debian/dirs
+debian/docs
+debian/pycompat
+debian/rules
+debian/source/format
+pyutil/PickleSaver.py
+pyutil/__init__.py
+pyutil/_version.py
+pyutil/assertutil.py
+pyutil/benchutil.py
+pyutil/cache.py
+pyutil/dictutil.py
+pyutil/fileutil.py
+pyutil/find_exe.py
+pyutil/hashexpand.py
+pyutil/humanreadable.py
+pyutil/increasing_timer.py
+pyutil/iputil.py
+pyutil/jsonutil.py
+pyutil/lineutil.py
+pyutil/logutil.py
+pyutil/mathutil.py
+pyutil/memutil.py
+pyutil/nummedobj.py
+pyutil/observer.py
+pyutil/odict.py
+pyutil/platformutil.py
+pyutil/randutil.py
+pyutil/repeatable_random.py
+pyutil/strutil.py
+pyutil/testutil.py
+pyutil/time_format.py
+pyutil/twistedutil.py
+pyutil/verlib.py
+pyutil/version_class.py
+pyutil/weakutil.py
+pyutil/zlibutil.py
+pyutil.egg-info/PKG-INFO
+pyutil.egg-info/SOURCES.txt
+pyutil.egg-info/dependency_links.txt
+pyutil.egg-info/entry_points.txt
+pyutil.egg-info/not-zip-safe
+pyutil.egg-info/requires.txt
+pyutil.egg-info/stdeb.cfg
+pyutil.egg-info/top_level.txt
+pyutil/benchmarks/bench_json.py
+pyutil/benchmarks/bench_xor.py
+pyutil/scripts/__init__.py
+pyutil/scripts/lines.py
+pyutil/scripts/memdump2dot.py
+pyutil/scripts/randcookie.py
+pyutil/scripts/randfile.py
+pyutil/scripts/tailx.py
+pyutil/scripts/try_decoding.py
+pyutil/scripts/unsort.py
+pyutil/scripts/verinfo.py
+pyutil/test/__init__.py
+pyutil/test/current/__init__.py
+pyutil/test/current/test_assertutil.py
+pyutil/test/current/test_fileutil.py
+pyutil/test/current/test_iputil.py
+pyutil/test/current/test_jsonutil.py
+pyutil/test/current/test_mathutil.py
+pyutil/test/current/test_time_format.py
+pyutil/test/current/test_verlib.py
+pyutil/test/current/test_version_class.py
+pyutil/test/current/json_tests/__init__.py
+pyutil/test/current/json_tests/test_decode.py
+pyutil/test/current/json_tests/test_default.py
+pyutil/test/current/json_tests/test_dump.py
+pyutil/test/current/json_tests/test_encode_basestring_ascii.py
+pyutil/test/current/json_tests/test_fail.py
+pyutil/test/current/json_tests/test_float.py
+pyutil/test/current/json_tests/test_indent.py
+pyutil/test/current/json_tests/test_pass1.py
+pyutil/test/current/json_tests/test_pass2.py
+pyutil/test/current/json_tests/test_pass3.py
+pyutil/test/current/json_tests/test_recursion.py
+pyutil/test/current/json_tests/test_separators.py
+pyutil/test/current/json_tests/test_speedups.py
+pyutil/test/current/json_tests/test_unicode.py
+pyutil/test/deprecated/__init__.py
+pyutil/test/deprecated/test_dictutil.py
+pyutil/test/deprecated/test_picklesaver.py
+pyutil/test/deprecated/test_xor.py
+pyutil/test/out_of_shape/__init__.py
+pyutil/test/out_of_shape/test_cache.py
+pyutil/test/out_of_shape/test_odict.py
+pyutil/test/out_of_shape/test_strutil.py
+pyutil/test/out_of_shape/test_zlibutil.py
+pyutil/xor/__init__.py
+pyutil/xor/xor.py
View
12 setup.py
@@ -67,7 +67,7 @@
if 'darcsver' in sys.argv[1:]:
setup_requires.append('darcsver >= 1.0.0')
-# setuptools_git is required to produce complete distributions (such
+# setuptools_darcs is required to produce complete distributions (such
# as with "sdist" or "bdist_egg"), unless there is a
# pyutil.egg-info/SOURCE.txt file present which contains a complete
# list of files that should be included.
@@ -76,7 +76,8 @@
# Lucid, so for now you have to manually install it before building
# sdists or eggs:
# http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
-setup_requires.append('setuptools_git >= 1.3.4')
+if False:
+ setup_requires.append('setuptools_darcs >= 1.1.0')
data_fnames=[ 'COPYING.SPL.txt', 'COPYING.GPL', 'COPYING.TGPPL.html', 'README.rst', 'CREDITS' ]
@@ -86,15 +87,10 @@
doc_loc = "share/doc/" + PKG
data_files = [(doc_loc, data_fnames)]
-try:
- long_description=open('README.rst').read()
-except IOError:
- long_description="no long description due to README.rst missing"
-
setup(name=PKG,
version=verstr,
description='a collection of utilities for Python programmers',
- long_description=long_description,
+ long_description=open('README.rst').read(),
author='Zooko O\'Whielacronx',
author_email='zooko@zooko.com',
url='http://tahoe-lafs.org/trac/' + PKG,

0 comments on commit dcb906a

Please sign in to comment.