add package version info. Add hyphens to signal name regex

cx1111 · cx1111 · commit 69f06d23732a · 2017-12-14T10:55:34.000-05:00
diff --git a/setup.py b/setup.py
@@ -14,13 +14,16 @@
 with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
+# Get the version number from the version.py file
+from wfdb.version import __version__
+
 setup(
     name='wfdb',
 
     # Versions should comply with PEP440. For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.3.6',
+    version=__version__,
 
     description='The WFDB Python Toolbox',
     long_description=long_description,
diff --git a/wfdb/__init__.py b/wfdb/__init__.py
@@ -5,3 +5,4 @@
 from .readwrite.downloads import getdblist
 from .plot.plots import plotrec, plotann
 from . import processing
+from .version import __version__
diff --git a/wfdb/readwrite/_headers.py b/wfdb/readwrite/_headers.py
@@ -418,7 +418,7 @@ def getsignames(self):
 rxSIGNAL = re.compile(
     ''.join(
         [
-            "(?P<filename>[\w]*\.?[\w]*~?)[ \t]+(?P<fmt>\d+)x?"
+            "(?P<filename>[-\w]+\.?[\w]*~?)[ \t]+(?P<fmt>\d+)x?"
             "(?P<sampsperframe>\d*):?(?P<skew>\d*)\+?(?P<byteoffset>\d*)[ \t]*",
             "(?P<adcgain>-?\d*\.?\d*e?[\+-]?\d*)\(?(?P<baseline>-?\d*)\)?/?(?P<units>[\w\^\-\?%]*)[ \t]*",
             "(?P<adcres>\d*)[ \t]*(?P<adczero>-?\d*)[ \t]*(?P<initvalue>-?\d*)[ \t]*",
diff --git a/wfdb/readwrite/records.py b/wfdb/readwrite/records.py
@@ -122,9 +122,9 @@ def checkfield(self, field, channels=None):
 
                 if field == 'filename':
                     # Check for filename characters
-                    acceptedstring = re.match('[\w]+\.?[\w]+',f)
+                    acceptedstring = re.match('[-\w]+\.?[\w]+',f)
                     if not acceptedstring or acceptedstring.string != f:
-                        raise ValueError('File names should only contain alphanumerics and an extension. eg. record_100.dat')
+                        raise ValueError('File names should only contain alphanumerics, hyphens, and an extension. eg. record_100.dat')
                     # Check that dat files are grouped together 
                     if orderedsetlist(self.filename)[0] != orderednoconseclist(self.filename):
                         raise ValueError('filename error: all entries for signals that share a given file must be consecutive')
diff --git a/wfdb/version.py b/wfdb/version.py
@@ -0,0 +1 @@
+__version__ = '1.3.7'

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ def getsignames(self):`
`418`	`418`	`rxSIGNAL = re.compile(`
`419`	`419`	`''.join(`
`420`	`420`	`[`
`421`		`- "(?P<filename>[\w]\.?[\w]~?)[ \t]+(?P<fmt>\d+)x?"`
	`421`	`+ "(?P<filename>[-\w]+\.?[\w]*~?)[ \t]+(?P<fmt>\d+)x?"`
`422`	`422`	`"(?P<sampsperframe>\d):?(?P<skew>\d)\+?(?P<byteoffset>\d)[ \t]",`
`423`	`423`	`"(?P<adcgain>-?\d\.?\de?[\+-]?\d)\(?(?P<baseline>-?\d)\)?/?(?P<units>[\w\^\-\?%])[ \t]",`
`424`	`424`	`"(?P<adcres>\d)[ \t](?P<adczero>-?\d)[ \t](?P<initvalue>-?\d)[ \t]",`