1.1 --- a/PKG-INFO Sat Sep 06 00:30:13 2008 +0200
1.2 +++ b/PKG-INFO Sun May 17 23:29:54 2009 +0200
1.3 @@ -1,12 +1,12 @@
1.4 Metadata-Version: 1.1
1.5 Name: pprocess
1.6 -Version: 0.4
1.7 +Version: 0.4.1
1.8 Author: Paul Boddie
1.9 Author-email: paul at boddie org uk
1.10 Maintainer: Paul Boddie
1.11 Maintainer-email: paul at boddie org uk
1.12 Home-page: http://www.boddie.org.uk/python/pprocess.html
1.13 -Download-url: http://www.boddie.org.uk/python/downloads/pprocess-0.4.tar.gz
1.14 +Download-url: http://www.boddie.org.uk/python/downloads/pprocess-0.4.1.tar.gz
1.15 Summary: Elementary parallel programming for Python
1.16 License: LGPL (version 3 or later)
1.17 Description: The pprocess module provides elementary support for parallel
2.1 --- a/README.txt Sat Sep 06 00:30:13 2008 +0200
2.2 +++ b/README.txt Sun May 17 23:29:54 2009 +0200
2.3 @@ -145,6 +145,12 @@
2.4 This software depends on standard library features which are stated as being
2.5 available only on "UNIX"; it has only been tested on a GNU/Linux system.
2.6
2.7 +New in pprocess 0.4.1 (Changes since pprocess 0.4)
2.8 +--------------------------------------------------
2.9 +
2.10 + * Fixed the get_number_of_cores function to work with /proc/cpuinfo where
2.11 + the "physical id" field is missing.
2.12 +
2.13 New in pprocess 0.4 (Changes since pprocess 0.3.1)
2.14 --------------------------------------------------
2.15
2.16 @@ -235,7 +241,7 @@
2.17 Release Procedures
2.18 ------------------
2.19
2.20 -Update the pprocess __version__ attribute.
2.21 +Update the pprocess __version__ attribute and the setup.py file version field.
2.22 Change the version number and package filename/directory in the documentation.
2.23 Update the release notes (see above).
2.24 Check the release information in the PKG-INFO file.
3.1 --- a/docs/COPYING.txt Sat Sep 06 00:30:13 2008 +0200
3.2 +++ b/docs/COPYING.txt Sun May 17 23:29:54 2009 +0200
3.3 @@ -1,7 +1,7 @@
3.4 Licence Agreement for parallel/pprocess
3.5 ---------------------------------------
3.6
3.7 -Copyright (C) 2005, 2006, 2007, 2008 Paul Boddie <paul@boddie.org.uk>
3.8 +Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
3.9
3.10 This program is free software; you can redistribute it and/or modify it under
3.11 the terms of the GNU Lesser General Public License as published by the Free
4.1 --- a/packages/ubuntu-feisty/python-pprocess/debian/changelog Sat Sep 06 00:30:13 2008 +0200
4.2 +++ b/packages/ubuntu-feisty/python-pprocess/debian/changelog Sun May 17 23:29:54 2009 +0200
4.3 @@ -1,3 +1,10 @@
4.4 +pprocess (0.4.1-0ubuntu1) feisty; urgency=low
4.5 +
4.6 + * Fixed the get_number_of_cores function to work with
4.7 + /proc/cpuinfo where the "physical id" field is missing.
4.8 +
4.9 + -- Paul Boddie <paul@boddie.org.uk> Sun, 17 May 2009 23:28:27 +0200
4.10 +
4.11 pprocess (0.4-0ubuntu1) feisty; urgency=low
4.12
4.13 * Added support for persistent/background processes.
5.1 --- a/packages/ubuntu-feisty/python-pprocess/debian/copyright Sat Sep 06 00:30:13 2008 +0200
5.2 +++ b/packages/ubuntu-feisty/python-pprocess/debian/copyright Sun May 17 23:29:54 2009 +0200
5.3 @@ -15,7 +15,7 @@
5.4 Licence Agreement for parallel/pprocess
5.5 ---------------------------------------
5.6
5.7 -Copyright (C) 2005, 2006, 2007, 2008 Paul Boddie <paul@boddie.org.uk>
5.8 +Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
5.9
5.10 This program is free software; you can redistribute it and/or modify it under
5.11 the terms of the GNU Lesser General Public License as published by the Free
6.1 --- a/packages/ubuntu-hoary/python2.4-parallel-pprocess/debian/changelog Sat Sep 06 00:30:13 2008 +0200
6.2 +++ b/packages/ubuntu-hoary/python2.4-parallel-pprocess/debian/changelog Sun May 17 23:29:54 2009 +0200
6.3 @@ -1,3 +1,10 @@
6.4 +parallel-pprocess (0.4.1-0ubuntu1) hoary; urgency=low
6.5 +
6.6 + * Fixed the get_number_of_cores function to work with
6.7 + /proc/cpuinfo where the "physical id" field is missing.
6.8 +
6.9 + -- Paul Boddie <paul@boddie.org.uk> Sun, 17 May 2009 23:28:59 +0200
6.10 +
6.11 parallel-pprocess (0.4-0ubuntu1) hoary; urgency=low
6.12
6.13 * Added support for persistent/background processes.
7.1 --- a/packages/ubuntu-hoary/python2.4-parallel-pprocess/debian/copyright Sat Sep 06 00:30:13 2008 +0200
7.2 +++ b/packages/ubuntu-hoary/python2.4-parallel-pprocess/debian/copyright Sun May 17 23:29:54 2009 +0200
7.3 @@ -15,7 +15,7 @@
7.4 Licence Agreement for parallel/pprocess
7.5 ---------------------------------------
7.6
7.7 -Copyright (C) 2005, 2006, 2007, 2008 Paul Boddie <paul@boddie.org.uk>
7.8 +Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
7.9
7.10 This program is free software; you can redistribute it and/or modify it under
7.11 the terms of the GNU Lesser General Public License as published by the Free
8.1 --- a/pprocess.py Sat Sep 06 00:30:13 2008 +0200
8.2 +++ b/pprocess.py Sun May 17 23:29:54 2009 +0200
8.3 @@ -4,7 +4,7 @@
8.4 A simple parallel processing API for Python, inspired somewhat by the thread
8.5 module, slightly less by pypar, and slightly less still by pypvm.
8.6
8.7 -Copyright (C) 2005, 2006, 2007, 2008 Paul Boddie <paul@boddie.org.uk>
8.8 +Copyright (C) 2005, 2006, 2007, 2008, 2009 Paul Boddie <paul@boddie.org.uk>
8.9
8.10 This program is free software; you can redistribute it and/or modify it under
8.11 the terms of the GNU Lesser General Public License as published by the Free
8.12 @@ -20,7 +20,7 @@
8.13 with this program. If not, see <http://www.gnu.org/licenses/>.
8.14 """
8.15
8.16 -__version__ = "0.4"
8.17 +__version__ = "0.4.1"
8.18
8.19 import os
8.20 import sys
8.21 @@ -816,7 +816,7 @@
8.22
8.23 # Utility functions.
8.24
8.25 -_cpuinfo_fields = "physical id", "core id"
8.26 +_cpuinfo_fields = "processor", "physical id", "core id"
8.27
8.28 def _get_number_of_cores():
8.29
8.30 @@ -829,18 +829,31 @@
8.31 f = open("/proc/cpuinfo")
8.32 try:
8.33 processors = set()
8.34 - processor = [None, None]
8.35 +
8.36 + # Use the _cpuinfo_field values as "digits" in a larger unique
8.37 + # core identifier.
8.38 +
8.39 + processor = [None, None, None]
8.40
8.41 for line in f.xreadlines():
8.42 for i, field in enumerate(_cpuinfo_fields):
8.43 +
8.44 + # Where the field is found, insert the value into the
8.45 + # appropriate location in the processor identifier.
8.46 +
8.47 if line.startswith(field):
8.48 t = line.split(":")
8.49 processor[i] = int(t[1].strip())
8.50 break
8.51 - else:
8.52 - if line.startswith("processor") and processor[0] is not None:
8.53 - processors.add(tuple(processor))
8.54 - processor = [None, None]
8.55 +
8.56 + # Where a new processor description is started, record the
8.57 + # identifier.
8.58 +
8.59 + if line.startswith("processor") and processor[0] is not None:
8.60 + processors.add(tuple(processor))
8.61 + processor = [None, None, None]
8.62 +
8.63 + # At the end of reading the file, add any unrecorded processors.
8.64
8.65 if processor[0] is not None:
8.66 processors.add(tuple(processor))
9.1 --- a/setup.py Sat Sep 06 00:30:13 2008 +0200
9.2 +++ b/setup.py Sun May 17 23:29:54 2009 +0200
9.3 @@ -2,14 +2,12 @@
9.4
9.5 from distutils.core import setup
9.6
9.7 -import pprocess
9.8 -
9.9 setup(
9.10 name = "pprocess",
9.11 description = "Elementary parallel programming for Python",
9.12 author = "Paul Boddie",
9.13 author_email = "paul@boddie.org.uk",
9.14 url = "http://www.boddie.org.uk/python/pprocess.html",
9.15 - version = pprocess.__version__,
9.16 + version = "0.4.1",
9.17 py_modules = ["pprocess"]
9.18 )