turn off py3 support for now (#19)

turn off py3 support for now

Author: mr-c

.travis.yml

@@ -3,14 +3,13 @@ python: 2.7
 os:
   - linux
 env:
-  - TOX_ENV=py34-lint
-  - TOX_ENV=py33-lint
   - TOX_ENV=py27-lint
-  - TOX_ENV=py26-lint
-  - TOX_ENV=py34-unit
-  - TOX_ENV=py33-unit
   - TOX_ENV=py27-unit
-  - TOX_ENV=py26-unit
+    #  - TOX_ENV=py34-lint
+    #  - TOX_ENV=py33-lint
+    #  - TOX_ENV=py27-lint
+    #  - TOX_ENV=py34-unit
+    #  - TOX_ENV=py33-unit
 
 install:
   - pip install tox

setup.py

@@ -32,10 +32,13 @@
     'mistune',
     'typing']
 
-if sys.version_info.major < 3:
-    install_requires.append("avro")
-else:
-    install_requires.append("avro-python3")
+install_requires.append("avro")  # TODO: remove me once cwltool is
+# available in Debian Stable, Ubuntu 12.04 LTS
+
+# extras_require={                # TODO: uncomment me, same conditions as above
+#        ':python_version<"3"': ['avro'],
+#        ':python_version>="3"': ['avro-python3']}
+extras_requires = {}               # TODO: to be removed when the above is added
 
 setup(name='schema-salad',
       version='1.9',
@@ -49,6 +52,7 @@
       packages=["schema_salad"],
       package_data={'schema_salad': ['metaschema/*']},
       install_requires=install_requires,
+      extras_requires=extras_requires,
       test_suite='tests',
       tests_require=[],
       entry_points={
@@ -63,7 +67,8 @@
           "Operating System :: MacOS :: MacOS X",
           "Development Status :: 4 - Beta",
           "Programming Language :: Python :: 2.7",
-          "Programming Language :: Python :: 3.3",
-          "Programming Language :: Python :: 3.4",
-          "Programming Language :: Python :: 3.5"]
+          #"Programming Language :: Python :: 3.3",  # TODO: uncomment these
+          #"Programming Language :: Python :: 3.4",  # lines
+          #"Programming Language :: Python :: 3.5"
+      ]
       )

tests/test_examples.py

@@ -5,9 +5,10 @@
 import rdflib
 import ruamel.yaml as yaml
 try:
-        from ruamel.yaml import CSafeLoader as SafeLoader
+    from ruamel.yaml import CSafeLoader as SafeLoader
 except ImportError:
-        from ruamel.yaml import SafeLoader
+    from ruamel.yaml import SafeLoader
+
 
 class TestSchemas(unittest.TestCase):
     def test_schemas(self):
@@ -17,16 +18,14 @@ def test_schemas(self):
             "$schemas": ["tests/EDAM.owl"],
             "$namespaces": {"edam": "http://edamontology.org/"},
             "edam:has_format": "edam:format_1915"
-            }, "")
+        }, "")
 
         self.assertEqual(ra, {
             "$schemas": ["tests/EDAM.owl"],
             "$namespaces": {"edam": "http://edamontology.org/"},
             'http://edamontology.org/has_format': 'http://edamontology.org/format_1915'
         })
 
-
-
     # def test_domain(self):
     #     l = schema_salad.ref_resolver.Loader({})
 
@@ -84,7 +83,7 @@ def test_idmap(self):
                 "@type": "@id",
                 "identity": True,
             },
-                         "id": "@id"})
+            "id": "@id"})
 
         ra, _ = ldr.resolve_all({
             "id": "stuff",
@@ -101,21 +100,24 @@ def test_idmap(self):
         self.assertEqual(ra,
                          {
                              "id": "http://example2.com/#stuff",
-                             'inputs': [{'a': 2, 'id': 'http://example2.com/#stuff/zing'},
-                                        {'a': 1, 'id': 'http://example2.com/#stuff/zip'}],
+                             'inputs': [{'a': 1, 'id': 'http://example2.com/#stuff/zip'},
+                                        {'a': 2, 'id': 'http://example2.com/#stuff/zing'},
+                                        ],
                              'outputs': ['http://example2.com/#stuff/out'],
                              'other': {
                                  'n': 9
                              }
                          }
-                     )
+                         )
 
     def test_examples(self):
         self.maxDiff = None
         for a in ["field_name", "ident_res", "link_res", "vocab_res"]:
-            ldr, _, _ = schema_salad.schema.load_schema("schema_salad/metaschema/%s_schema.yml" % a)
+            ldr, _, _ = schema_salad.schema.load_schema(
+                "schema_salad/metaschema/%s_schema.yml" % a)
             with open("schema_salad/metaschema/%s_src.yml" % a) as src_fp:
-                src = ldr.resolve_all(yaml.load(src_fp, Loader=SafeLoader), "")[0]
+                src = ldr.resolve_all(
+                    yaml.load(src_fp, Loader=SafeLoader), "")[0]
             with open("schema_salad/metaschema/%s_proc.yml" % a) as src_proc:
                 proc = yaml.load(src_proc, Loader=SafeLoader)
             self.assertEqual(proc, src)

tox.ini

@@ -1,5 +1,6 @@
 [tox]
-envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
+#envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
+envlist = py27-lint,py27-unit
 skipsdist = True
 
 [testenv]