[Pydispatcher-cvs] pydispatch setup.py,1.3,1.4

[Mike C. F. <mcf...@us...>]

Update of /cvsroot/pydispatcher/pydispatch
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29940

Modified Files:
	setup.py 
Log Message:
Move to a more standard package layout with sub-package of the code to install.
Make tests compatible with nosetest discovery.
Make tests *not* install by default.


Index: setup.py
===================================================================
RCS file: /cvsroot/pydispatcher/pydispatch/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py	30 Mar 2010 15:32:09 -0000	1.3
--- setup.py	30 Mar 2010 15:45:55 -0000	1.4
***************
*** 3,23 ****
  
  Run:
! 	python setup.py install
  to install the package from the source archive.
  """
  from setuptools import setup
  from sys import hexversion
  if hexversion >= 0x2030000:
! 	# work around distutils complaints under Python 2.2.x
! 	extraArguments = {
! 		'classifiers': [
! 			"""License :: OSI Approved :: BSD License""",
! 			"""Programming Language :: Python""",
! 			"""Topic :: Software Development :: Libraries :: Python Modules""",
! 			"""Intended Audience :: Developers""",
! 		],
! 		#'download_url': "http://sourceforge.net/projects/pydispatcher/files/pydispatcher/",
! 		'keywords': 'dispatcher,dispatch,pydispatch,event,signal,sender,receiver,propagate,multi-consumer,multi-producer,saferef,robustapply,apply',
! 		'long_description' : """Dispatcher mechanism for creating event models
  
  PyDispatcher is an enhanced version of Patrick K. O'Brien's
--- 3,24 ----
  
  Run:
!     python setup.py install
  to install the package from the source archive.
  """
  from setuptools import setup
+ import os
  from sys import hexversion
  if hexversion >= 0x2030000:
!     # work around distutils complaints under Python 2.2.x
!     extraArguments = {
!         'classifiers': [
!             """License :: OSI Approved :: BSD License""",
!             """Programming Language :: Python""",
!             """Topic :: Software Development :: Libraries :: Python Modules""",
!             """Intended Audience :: Developers""",
!         ],
!         #'download_url': "http://sourceforge.net/projects/pydispatcher/files/pydispatcher/",
!         'keywords': 'dispatcher,dispatch,pydispatch,event,signal,sender,receiver,propagate,multi-consumer,multi-producer,saferef,robustapply,apply',
!         'long_description' : """Dispatcher mechanism for creating event models
  
  PyDispatcher is an enhanced version of Patrick K. O'Brien's
***************
*** 31,71 ****
  methods using weak-references.
  """,
! 		'platforms': ['Any'],
! 	}
  else:
! 	extraArguments = {
! 	}
  
  if __name__ == "__main__":
! 	### Now the actual set up call
! 	setup (
! 		name = "PyDispatcher",
! 		version = "2.0.1",
! 		description= "Multi-producer-multi-consumer signal dispatching mechanism",
! 		author = "Patrick K. O'Brien",
! 		author_email = "pyd...@li...",
! 		url = "http://pydispatcher.sourceforge.net",
! 		license = "BSD-style, see license.txt for details",
  
! 		package_dir = {
! 			'pydispatch':'.',
! 		},
  
! 		packages = [
! 			'pydispatch', 
! 		],
! 		
! 		options = {
! 			'sdist':{'use_defaults':0, 'force_manifest':1},
! 			"install_lib":{"compile":0, "optimize":0},
! 			'bdist_rpm':{
! 				'group':'Libraries/Python',
! 				'provides':'python-dispatcher',
! 				'requires':"python",
! 			},
! 		},
  
- 		# registration metadata
- 		**extraArguments
- 	)
- 	
--- 32,79 ----
  methods using weak-references.
  """,
!         'platforms': ['Any'],
!     }
  else:
!     extraArguments = {
!     }
! 
! 
! version = [
!     (line.split('=')[1]).strip().strip('"').strip("'")
!     for line in open(os.path.join('pydispatch','__init__.py'))
!     if line.startswith( '__version__' )
! ][0]
  
  if __name__ == "__main__":
!     ### Now the actual set up call
!     setup (
!         name = "PyDispatcher",
!         version = version,
!         description= "Multi-producer-multi-consumer signal dispatching mechanism",
!         author = "Patrick K. O'Brien",
!         author_email = "pyd...@li...",
!         url = "http://pydispatcher.sourceforge.net",
!         license = "BSD-style, see license.txt for details",
  
!         package_dir = {
!             'pydispatch':'pydispatch',
!         },
  
!         packages = [
!             'pydispatch',
!         ],
! 
!         options = {
!             'sdist':{'use_defaults':0, 'force_manifest':1},
!             "install_lib":{"compile":0, "optimize":0},
!             'bdist_rpm':{
!                 'group':'Libraries/Python',
!                 'provides':'python-dispatcher',
!                 'requires':"python",
!             },
!         },
! 
!         # registration metadata
!         **extraArguments
!     )