LICENSE.txt README.md TODO.txt firepython/__init__.py firepython/_const.py firepython/gprof2dot.py firepython/handlers.py firepython/middleware.py firepython/utils.py run_tests.py setup.cfg tests/__init__.py tests/itest_middleware.py tests/test_basic.py tests/test_utils.py @@ -1,12 +1,9 @@ +*.egg-info +*.pyc .DS_Store -tmp -build +.coverage Thumbs.db -*.pyc -firepython +_site +build dist -firepython/dist -firepython/firepython.egg-info -*.egg-info -MANIFEST -_site \ No newline at end of file +tmp \ No newline at end of file .gitignore @@ -1 +1,3 @@ -include *.txt *.md +include *.txt rakefile *.py *.md +recursive-include tests *.py +recursive-include jsonpickle *.py COPYING MANIFEST.in @@ -5,9 +5,9 @@ DST = File.join(ROOT, 'build') DIST_DIR = File.join(ROOT, 'dist') TMP = File.join(ROOT, 'tmp') FPY = File.join(ROOT, 'firepython') -FPY_EGG_INFO = File.join(ROOT, 'firepython.egg-info') +FPY_EGG_INFO = File.join(ROOT, 'FirePython.egg-info') JSONPICKLE = File.join(ROOT, 'jsonpickle') -CRUFT = [DST, DIST_DIR, TMP, FPY, FPY_EGG_INFO] +CRUFT = [DST, DIST_DIR, TMP, FPY_EGG_INFO] PYTHON = ROOT unless defined? OSX then @@ -152,26 +152,10 @@ task :pypi do remove_dir(TMP) if File.exist?(TMP) # recursive! end -desc "Builds the firepython package for development use" -task :develop do - remove_dir(FPY) if File.exist?(FPY) - mkdir(FPY, {:verbose => false}) - - files = Dir.entries(ROOT) - - files.each do |f| - next if (not /.+\.py/.match(f)) || /setup\.py/.match(f) - cp(f, File.join(FPY, f)) - end - -# cp_r(JSONPICKLE, FPY) - system('python setup.py develop') -end - desc "Resets version in all relevant sources" task :version do version = ARGV[1] or die("Please specify a version as first parameter") - init_py_path = File.join(PYTHON, '__init__.py') + init_py_path = File.join(FPY, '__init__.py') if not patch(init_py_path, /__version__ = '([0-9\.])+'/, "__version__ = '#{version}'") puts " #{red("patching had no effect")}" end rakefile @@ -1,45 +1,35 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- import sys -from setuptools import setup +from setuptools import setup, find_packages -try: - from firepython import __version__ -except ImportError: - LINE = '*' * 78 - print >> sys.stderr, LINE - print >> sys.stderr, """\ - - NOT SO FAST: - - If developing firepython from the source checkout, - one must first run `rake develop`, or simply create - a `firepython` dir and copy all but this `setup.py` - python module into it. - - """ - print >> sys.stderr, LINE - sys.exit(1) +import firepython SETUP_ARGS = dict( - name='firepython', - version=__version__, + name='FirePython', + version=firepython.__version__, description='Python logging console integrated into Firebug', + long_description=firepython.__doc__, author='Antonin Hildebrand', author_email='antonin@hildebrand.cz', url='http://firepython.binaryage.com', - packages=['firepython'], - classifiers=['Development Status :: 4 - Beta', - 'Environment :: Web Environment', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Topic :: Software Development :: Bug Tracking', - 'Topic :: Software Development :: Quality Assurance', - 'Topic :: Software Development :: Testing', - 'Topic :: System :: Logging'], + packages=find_packages(exclude=['tests']), + classifiers=[ + 'Development Status :: 4 - Beta', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Software Development :: Bug Tracking', + 'Topic :: Software Development :: Quality Assurance', + 'Topic :: Software Development :: Testing', + 'Topic :: System :: Logging', + ], + test_suite='nose.collector', + include_package_data=True, + zip_safe=False, ) def main(): setup.py __init__.py gprof2dot.py handlers.py license.txt middleware.py readme.md utils.py 12881ac45a1ed7556a0f6a935161c5457d84329c Dan Buch daniel.buch@gmail.com http://github.com/darwin/firepython/commit/7c9f732a49b5ae68a09dea2273cab35a24bc2b26 7c9f732a49b5ae68a09dea2273cab35a24bc2b26 2009-07-26T15:35:55-07:00 2009-07-26T15:35:55-07:00 reworked package layout to be more 'pythonic', began adding unit and integration tests, added a test runner script, did some renaming and such for when rolling an sdist 20602c621e914c62c9bc71a49bdf3ff3e5e074ce Dan Buch daniel.buch@gmail.com