Reveal skip. Remove superfluous dependencies.

Author: gjhiggins

.travis.yml

@@ -16,9 +16,10 @@ python:
 install:
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install -r requirements-py2.txt --use-mirrors; fi
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install -r requirements-py3.txt --use-mirrors; fi
+    - if [[ ${TRAVIS_PYTHON_VERSION} == 'pypy' ]]; then pip install --upgrade 'git+https://github.com/gjhiggins/isodate#egg=isodate'; fi
+    - if [[ ${TRAVIS_PYTHON_VERSION} == '2.5' ]]; then pip uninstall simplejson; fi
     - python setup.py install
 before_script:
-  - sh -c "if [ $TRAVIS_PYTHON_VERSION = 'pypy' ]; then pip install --upgrade 'git+https://github.com/gjhiggins/isodate#egg=isodate'; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS rdflibsqla_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database rdflibsqla_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS rdflibsqla_test'; fi"

requirements-py2.txt

@@ -1,3 +1,3 @@
+-e git+https://github.com/RDFLib/rdflib.git#egg=rdflib
 psycopg2
 MySQL-python
--e git+https://github.com/RDFLib/rdflib.git#egg=rdflib

requirements-py3.txt

@@ -1,3 +1,3 @@
-psycopg2
 -e git+https://github.com/RDFLib/rdflib.git#egg=rdflib
+psycopg2
 -e git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python

setup.py

@@ -97,13 +97,15 @@ def find_version(filename):
 
 if sys.version_info[0] >= 3:
     from setuptools import setup
+    assert setup
     config.update({'use_2to3': True})
     config.update({'src_root': setup_python3()})
 else:
     if sys.version_info[:2] < (2, 6):
-        install_requires += ['pysqlite', 'hashlib', 'simplejson']
+        install_requires += ['pysqlite']
     try:
         from setuptools import setup
+        assert setup
         config.update({'test_suite': "nose.collector"})
     except ImportError:
         from distutils.core import setup

test/test_aggregate_graphs.py

@@ -120,7 +120,7 @@ def testAggregateRaw(self):
 
 
 class GraphAggregates2(unittest.TestCase):
-    known_issue = True
+    # known_issue = True
 
     def setUp(self):
         memStore = plugin.get('SQLAlchemy', Store)(

tox.ini

@@ -22,10 +22,8 @@ deps =
     nose
     git+http://github.com/RDFLib/rdflib#egg=rdflib
     SQLAlchemy
-    hashlib
     pysqlite
     psycopg2
-    simplejson
     MySQL-python
 
 [testenv:py32]