From cae9fd81823bb1c914082eb213c1181a6d63864b Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 14 Dec 2010 14:01:43 -0500 Subject: [PATCH] Move pycomedi.common.VERSION to pycomedi.__version__ and cleanup setup.py. --- ez_setup.py | 275 ---------------------------------------- pycomedi/__init__.py | 4 +- pycomedi/common.py | 3 +- pycomedi/simult_aio.py | 3 +- pycomedi/single_aio.py | 3 +- pycomedi/single_dio.py | 3 +- pycomedi/test_comedi.py | 92 -------------- setup.py | 59 +++------ 8 files changed, 26 insertions(+), 416 deletions(-) delete mode 100644 ez_setup.py delete mode 100644 pycomedi/test_comedi.py diff --git a/ez_setup.py b/ez_setup.py deleted file mode 100644 index 14cd450..0000000 --- a/ez_setup.py +++ /dev/null @@ -1,275 +0,0 @@ -#!python -"""Bootstrap setuptools installation - -If you want to use setuptools in your package's setup.py, just include this -file in the same directory with it, and add this to the top of your setup.py:: - - from ez_setup import use_setuptools - use_setuptools() - -If you want to require a specific version of setuptools, set a download -mirror, or use an alternate download directory, you can do so by supplying -the appropriate options to ``use_setuptools()``. - -This file can also be run as a script to install or upgrade setuptools. -""" -import sys -DEFAULT_VERSION = "0.6c9" -DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] - -md5_data = { - 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', - 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', - 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', - 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', - 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', - 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', - 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', - 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', - 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', - 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', - 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', - 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', - 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', - 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', - 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', - 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', - 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', - 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', - 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', - 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', - 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', - 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', - 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', - 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', - 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', - 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', - 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', - 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', - 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', - 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', - 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03', - 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a', - 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6', -} - -import sys, os -try: from hashlib import md5 -except ImportError: from md5 import md5 - -def _validate_md5(egg_name, data): - if egg_name in md5_data: - digest = md5(data).hexdigest() - if digest != md5_data[egg_name]: - print >>sys.stderr, ( - "md5 validation of %s failed! (Possible download problem?)" - % egg_name - ) - sys.exit(2) - return data - -def use_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - download_delay=15 -): - """Automatically find/download setuptools and make it available on sys.path - - `version` should be a valid setuptools version number that is available - as an egg for download under the `download_base` URL (which should end with - a '/'). `to_dir` is the directory where setuptools will be downloaded, if - it is not already available. If `download_delay` is specified, it should - be the number of seconds that will be paused before initiating a download, - should one be required. If an older version of setuptools is installed, - this routine will print a message to ``sys.stderr`` and raise SystemExit in - an attempt to abort the calling script. - """ - was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules - def do_download(): - egg = download_setuptools(version, download_base, to_dir, download_delay) - sys.path.insert(0, egg) - import setuptools; setuptools.bootstrap_install_from = egg - try: - import pkg_resources - except ImportError: - return do_download() - try: - pkg_resources.require("setuptools>="+version); return - except pkg_resources.VersionConflict, e: - if was_imported: - print >>sys.stderr, ( - "The required version of setuptools (>=%s) is not available, and\n" - "can't be installed while this script is running. Please install\n" - " a more recent version first, using 'easy_install -U setuptools'." - "\n\n(Currently using %r)" - ) % (version, e.args[0]) - sys.exit(2) - else: - del pkg_resources, sys.modules['pkg_resources'] # reload ok - return do_download() - except pkg_resources.DistributionNotFound: - return do_download() - -def download_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - delay = 15 -): - """Download setuptools from a specified location and return its filename - - `version` should be a valid setuptools version number that is available - as an egg for download under the `download_base` URL (which should end - with a '/'). `to_dir` is the directory where the egg will be downloaded. - `delay` is the number of seconds to pause before an actual download attempt. - """ - import urllib2, shutil - egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) - url = download_base + egg_name - saveto = os.path.join(to_dir, egg_name) - src = dst = None - if not os.path.exists(saveto): # Avoid repeated downloads - try: - from distutils import log - if delay: - log.warn(""" ---------------------------------------------------------------------------- -This script requires setuptools version %s to run (even to display -help). I will attempt to download it for you (from -%s), but -you may need to enable firewall access for this script first. -I will start the download in %d seconds. - -(Note: if this machine does not have network access, please obtain the file - - %s - -and place it in this directory before rerunning this script.) ----------------------------------------------------------------------------""", - version, download_base, delay, url - ); from time import sleep; sleep(delay) - log.warn("Downloading %s", url) - src = urllib2.urlopen(url) - # Read/write all in one block, so we don't create a corrupt file - # if the download is interrupted. - data = _validate_md5(egg_name, src.read()) - dst = open(saveto,"wb"); dst.write(data) - finally: - if src: src.close() - if dst: dst.close() - return os.path.realpath(saveto) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -def main(argv, version=DEFAULT_VERSION): - """Install or upgrade setuptools and EasyInstall""" - try: - import setuptools - except ImportError: - egg = None - try: - egg = download_setuptools(version, delay=0) - sys.path.insert(0,egg) - from setuptools.command.easy_install import main - return main(list(argv)+[egg]) # we're done here - finally: - if egg and os.path.exists(egg): - os.unlink(egg) - else: - if setuptools.__version__ == '0.0.1': - print >>sys.stderr, ( - "You have an obsolete version of setuptools installed. Please\n" - "remove it from your system entirely before rerunning this script." - ) - sys.exit(2) - - req = "setuptools>="+version - import pkg_resources - try: - pkg_resources.require(req) - except pkg_resources.VersionConflict: - try: - from setuptools.command.easy_install import main - except ImportError: - from easy_install import main - main(list(argv)+[download_setuptools(delay=0)]) - sys.exit(0) # try to force an exit - else: - if argv: - from setuptools.command.easy_install import main - main(argv) - else: - print "Setuptools version",version,"or greater has been installed." - print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' - -def update_md5(filenames): - """Update our built-in md5 registry""" - - import re - - for name in filenames: - base = os.path.basename(name) - f = open(name,'rb') - md5_data[base] = md5(f.read()).hexdigest() - f.close() - - data = [" %r: %r,\n" % it for it in md5_data.items()] - data.sort() - repl = "".join(data) - - import inspect - srcfile = inspect.getsourcefile(sys.modules[__name__]) - f = open(srcfile, 'rb'); src = f.read(); f.close() - - match = re.search("\nmd5_data = {\n([^}]+)}", src) - if not match: - print >>sys.stderr, "Internal error!" - sys.exit(2) - - src = src[:match.start(1)] + repl + src[match.end(1):] - f = open(srcfile,'w') - f.write(src) - f.close() - - -if __name__=='__main__': - if len(sys.argv)>2 and sys.argv[1]=='--md5update': - update_md5(sys.argv[2:]) - else: - main(sys.argv[1:]) - - - - - - diff --git a/pycomedi/__init__.py b/pycomedi/__init__.py index 0586a19..31243b2 100644 --- a/pycomedi/__init__.py +++ b/pycomedi/__init__.py @@ -1,5 +1,5 @@ # PyComedi provides an object-oriented interface to the Comedi drivers. -# Copyright (C) 2008 W. Trevor King +# Copyright (C) 2008-2010 W. Trevor King # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,4 +14,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from common import VERSION +__version__ == '0.2' diff --git a/pycomedi/common.py b/pycomedi/common.py index ee4365d..2f9452e 100644 --- a/pycomedi/common.py +++ b/pycomedi/common.py @@ -1,5 +1,5 @@ # Some Comedi operations common to analog and digital IO -# Copyright (C) 2007,2008 W. Trevor King +# Copyright (C) 2007-2010 W. Trevor King # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ import comedi as c import time -VERSION = "0.2" class pycomediError (Exception) : "Error in pycomedi.common" diff --git a/pycomedi/simult_aio.py b/pycomedi/simult_aio.py index 0d2507c..c047870 100644 --- a/pycomedi/simult_aio.py +++ b/pycomedi/simult_aio.py @@ -1,5 +1,5 @@ # Simultaneous, finite, buffered analog inpout/output using comedi drivers -# Copyright (C) 2007,2008 W. Trevor King +# Copyright (C) 2007-2010 W. Trevor King # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ from time import sleep from scipy.stats import linregress from os import system -VERSION = common.VERSION #VERBOSE = True VERBOSE = False AO_TRIGGERS_OFF_AI_START = True diff --git a/pycomedi/single_aio.py b/pycomedi/single_aio.py index ebb558f..adeb4dd 100644 --- a/pycomedi/single_aio.py +++ b/pycomedi/single_aio.py @@ -1,5 +1,5 @@ # Use Comedi drivers for single-shot analog input/output -# Copyright (C) 2007,2008 W. Trevor King +# Copyright (C) 2007-2010 W. Trevor King # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ generate/aquire signals at 1 second and greater timescales. import comedi as c import common -VERSION = common.VERSION VERBOSE_DEBUG = False class sngAioError (common.pycomediError) : diff --git a/pycomedi/single_dio.py b/pycomedi/single_dio.py index 03b28bb..87a8a64 100644 --- a/pycomedi/single_dio.py +++ b/pycomedi/single_dio.py @@ -1,5 +1,5 @@ # Use Comedi drivers for single-shot digital input/output -# Copyright (C) 2007,2008 W. Trevor King +# Copyright (C) 2007-2010 W. Trevor King # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,6 @@ generate/aquire signals at 1 second and greater timescales. import comedi as c import common -VERSION = common.VERSION class dioError (common.pycomediError): "Digital IO error" diff --git a/pycomedi/test_comedi.py b/pycomedi/test_comedi.py deleted file mode 100644 index b2840eb..0000000 --- a/pycomedi/test_comedi.py +++ /dev/null @@ -1,92 +0,0 @@ -#A test-application to demonstrate using the Comedilib API -# and streaming acquisition in particular, from Python. -#This script is completely untested! -# author bryan.cole@teraview.co.uk - -#set the paths so python can find the comedi module -import sys, os, string -sys.path.append('./build/lib.linux-i686-2.2') - -import comedi as c - -#open a comedi device -dev=c.comedi_open('/dev/comedi0') -if not dev: raise Exception, "Error openning Comedi device" - -#get a file-descriptor for use later -fd = c.comedi_fileno(dev) - -nscans=100 #specify total number of scans -#1000 -#three lists containing the chans, gains and referencing -#the lists must all have the same length -chans=[0,2,3] -gains=[1,1,1] -aref =[c.AREF_GROUND, c.AREF_GROUND, c.AREF_GROUND] - -nchans = len(chans) #number of channels - -#wrappers include a "chanlist" object (just an Unsigned Int array) for holding the chanlist information -mylist = c.chanlist(nchans) #create a chanlist of length nchans - -#now pack the channel, gain and reference information into the chanlist object -#N.B. the CR_PACK and other comedi macros are now python functions -for index in range(nchans): - mylist[index]=c.cr_pack(chans[index], gains[index], aref[index]) - -#construct a comedi command manually -cmd = c.comedi_cmd_struct() -cmd.subdev = 0 -cmd.flags = 0 -cmd.start_src = c.TRIG_NOW -cmd.sart_arg = 0 -cmd.scan_begin_src = c.TRIG_TIMER -cmd.scan_begin_arg = int(1.0e9/100000) -cmd.convert_src = c.TRIG_TIMER -cmd.convert_arg = 1 -cmd.scan_end_src = c.TRIG_COUNT -cmd.scan_end_arg = nchans -cmd.stop_src = c.TRIG_COUNT -cmd.stop_arg = nscans -cmd.chanlist = mylist -cmd.chanlist_len = nchans - -#test our comedi command a few times. -ret = c.comedi_command_test(dev,cmd) -print "first cmd test returns ", ret -ret = c.comedi_command_test(dev,cmd) -print "second test returns ", ret -ret = c.comedi_command_test(dev,cmd) -if ret: raise Exception, "Error %d testing comedi command" % ret - -#execute the command! -ret = c.comedi_command(dev,cmd) - -#I think this will work but it's completely untested! -datalist=[] -buffersize=1000 # max bytes to acquire per read attempt -data=os.read(fd, buffersize) -while len(data)>0: - print "read %d bytes" % len(data) - datalist.append(data) - data=os.read(fd, buffersize) -if len(datalist) == 0 : - raise Exeption, "Didn't get any data..." - -ret = c.comedi_close(dev) - -print datalist -datastr = string.join(datalist,'') - -print datastr #heres your data, as a single string! - -#if you've got Numeric installed you can convert data into a flat Numpy array -# with: -# dataarray = Numeric.fromstring(data, Int16) -try : - import numpy - dataarray = numpy.fromstring(data, dtype=numpy.int16) - print "size: ", dataarray.size - print dataarray -except ImportError : - print "Install numpy to read the data into Python" diff --git a/setup.py b/setup.py index 832f2ef..b60ce77 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,10 @@ Requires * Comedi (http://www.comedi.org/) """ +from distutils.core import setup + +from pycomedi import __version__ + classifiers = """\ Development Status :: 2 - Pre-Alpha Intended Audience :: Developers @@ -17,43 +21,20 @@ Topic :: Scientific/Engineering Topic :: Software Development :: Libraries :: Python Modules """ -# http://peak.telecommunity.com/DevCenter/setuptools#using-setuptools-without-bundling-it -import ez_setup -ez_setup.use_setuptools() - -from setuptools import setup, find_packages - -# patch distutils if it can't cope with the "classifiers" or -# "download_url" keywords -from sys import version -if version < '2.2.3': - from distutils.dist import DistributionMetadata - DistributionMetadata.classifiers = None - DistributionMetadata.download_url = None - -#from pycomedi import VERSION -VERSION = "0.2" # importing pycomedi requires comedi on this machine, so copy. - -doclines = __doc__.split("\n") - -setup(name="pycomedi", - version=VERSION, - maintainer="W. Trevor King", - maintainer_email="wking@drexel.edu", - url = "http://www.physics.drexel.edu/~wking/code/python/", - download_url = "http://www.physics.drexel.edu/~wking/code/python/pycomedi-%s.tar.gz" % VERSION, - license = "GNU General Public License (GPL)", - platforms = ["all"], - description = doclines[0], - long_description = "\n".join(doclines[2:]), - classifiers = filter(None, classifiers.split("\n")), - py_modules = ['ez_setup'], - packages = find_packages(), +doclines = __doc__.split('\n') + + +setup(name='pycomedi', + version=__version__, + maintainer='W. Trevor King', + maintainer_email='wking@drexel.edu', + url='http://www.physics.drexel.edu/~wking/unfolding-disasters/pycomedi/', + download_url='http://www.physics.drexel.edu/~wking/code/python/pycomedi-%s.tar.gz' % __version__, + license='GNU General Public License (GPL)', + platforms=['all'], + description=doclines[0], + long_description='\n'.join(doclines[2:]), + classifiers=filter(None, classifiers.split('\n')), + packages=['pycomedi'], + provides=['pycomedi'], ) - -# use packages to include subdirectory packages -# use py_modules to include single-module packages -# use ext_modules to include extension modules -# see -# http://www.python.org/doc/2.5.2/dist/listing-modules.html -# http://www.python.org/doc/2.5.2/dist/describing-extensions.html -- 2.26.2