universal location of spec

Author: jpivarski

docs/conf.py

@@ -47,9 +47,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "0.9-prerelease"
+version = "1.0.0"
 # The full version, including alpha/beta/rc tags.
-release = "0.9-prerelease"
+release = "1.0.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

histogrammar/version.py

@@ -16,7 +16,7 @@
 
 import re
 
-__version__ = "0.9-prerelease"
+__version__ = "1.0.0"
 
 version = __version__
 

test/testspec.py

@@ -18,8 +18,10 @@
 import math
 import sys
 import unittest
+import urllib2
 
 from histogrammar import *
+import histogrammar.version
 
 tolerance = 1e-12
 util.relativeTolerance = tolerance
@@ -40,14 +42,23 @@ def compare(self, x, y, name):
             self.assertEqual(Factory.fromJson(x), Factory.fromJson(y))
 
     def runTest(self):
-        testdata = json.load(open("../histogrammar-multilang/test-data.json"))
+        sys.stdout.write("Downloading expected results, generated by specification {0}...\n".format(histogrammar.version.specification))
+        try:
+            testdata = json.load(urllib2.urlopen("http://histogrammar.org/test/{0}/test-data.json".format(histogrammar.version.specification)))
+        except Exception as err:
+            sys.stdout.write("could not download http://histogrammar.org/test/{0}/test-data.json\nbecause of {1}: {2}\n".format(histogrammar.version.specification, err.__class__.__name__, str(err)))
+            return
+        try:
+            testresults = json.load(urllib2.urlopen("http://histogrammar.org/test/{0}/test-results.json".format(histogrammar.version.specification)))
+        except Exception as err:
+            sys.stdout.write("could not download http://histogrammar.org/test/{0}/test-results.jsonbecause of {1}: {2}\n\n".format(histogrammar.version.specification, err.__class__.__name__, str(err)))
+            return
+
         for x in testdata:
             for k, v in x.items():
                 if k != "strings" and v in ("nan", "inf", "-inf"):
                     x[k] = float(v)
 
-        testresults = json.load(open("../histogrammar-multilang/test-results.json"))
-
         def stripNames(x):
             if hasattr(x, "quantity"):
                 x.quantity.name = None