removed special py3 handling code from setup.py and travis files

Author: gromgull

.travis.yml

@@ -14,29 +14,21 @@ python:
     - 3.4
     - 3.5
     - 3.6
-    # - "pypy"
 
 before_install:
     - pip install -U setuptools pip  # seems travis comes with a too old setuptools for html5lib
     - bash .travis.fuseki_install_optional.sh
 
 install:
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install --default-timeout 60 -r requirements.py2.txt; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install --default-timeout 60 -r requirements.py3.txt; fi
-    # isodate0.4.8 is problematic with Pypy, use fixed version
-    - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install --upgrade "https://bitbucket.org/gjhiggins/isodate/downloads/isodate-0.4.8.tar.gz"; pip install --default-timeout 60 "elementtree"; fi
+    - pip install --default-timeout 60 -r requirements.txt
     - pip install --default-timeout 60 coverage coveralls nose-timer && export HAS_COVERALLS=1
     - python setup.py install
 
 before_script:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then flake8 --exclude=pyRdfa,extras,host,transform,rdfs,sparql,results,pyMicrodata --exit-zero rdflib; fi
+    - flake8 --exclude=pyRdfa,extras,host,transform,rdfs,sparql,results,pyMicrodata --exit-zero rdflib; fi
 
 script:
-    # Must run the tests in build/src so python3 doesn't get confused and run
-    # the python2 code from the current directory instead of the installed
-    # 2to3 version in build/src.
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then PYTHONWARNINGS=default nosetests --with-timer --timer-top-n 42 --with-coverage --cover-tests --cover-package=rdflib ; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then PYTHONWARNINGS=default nosetests --with-timer --timer-top-n 42 --with-coverage --cover-tests --cover-package=build/src/rdflib --where=./build/src; fi
+    - PYTHONWARNINGS=default nosetests --with-timer --timer-top-n 42 --with-coverage --cover-tests --cover-package=rdflib
 
 after_success:
     - if [[ $HAS_COVERALLS ]] ; then coveralls ; fi

requirements.py3.txt

@@ -1,324 +1,16 @@
 #!/usr/bin/env python
-import sys
-import os
-import re
-
-
-def setup_python3():
-    # Taken from "distribute" setup.py
-    from distutils.filelist import FileList
-    from distutils import dir_util, file_util, util, log
-    from os.path import join, exists
-
-    tmp_src = join("build", "src")
-    # Not covered by "setup.py clean --all", so explicit deletion required.
-    if exists(tmp_src):
-        dir_util.remove_tree(tmp_src)
-    # log.set_verbosity(1)
-    fl = FileList()
-    for line in open("MANIFEST.in"):
-        if not line.strip():
-            continue
-        fl.process_template_line(line)
-    dir_util.create_tree(tmp_src, fl.files)
-    outfiles_2to3 = []
-    for f in fl.files:
-        outf, copied = file_util.copy_file(f, join(tmp_src, f), update=1)
-        if copied and outf.endswith(".py"):
-            outfiles_2to3.append(outf)
-
-    six_ed = [  # uncomment files which have already been transformed to use six
-        join(tmp_src, 'docs', 'conf.py'),
-        join(tmp_src, 'docs', 'plugintable.py'),
-        join(tmp_src, 'examples', '__init__.py'),
-        join(tmp_src, 'examples', 'conjunctive_graphs.py'),
-        join(tmp_src, 'examples', 'custom_datatype.py'),
-        join(tmp_src, 'examples', 'custom_eval.py'),
-        join(tmp_src, 'examples', 'film.py'),
-        join(tmp_src, 'examples', 'foafpaths.py'),
-        join(tmp_src, 'examples', 'prepared_query.py'),
-        join(tmp_src, 'examples', 'rdfa_example.py'),
-        join(tmp_src, 'examples', 'resource.py'),
-        join(tmp_src, 'examples', 'simple_example.py'),
-        join(tmp_src, 'examples', 'sleepycat_example.py'),
-        join(tmp_src, 'examples', 'slice.py'),
-        join(tmp_src, 'examples', 'smushing.py'),
-        join(tmp_src, 'examples', 'sparql_query_example.py'),
-        join(tmp_src, 'examples', 'sparql_update_example.py'),
-        join(tmp_src, 'examples', 'sparqlstore_example.py'),
-        join(tmp_src, 'examples', 'swap_primer.py'),
-        join(tmp_src, 'examples', 'transitive.py'),
-        join(tmp_src, 'rdflib', '__init__.py'),
-        join(tmp_src, 'rdflib', 'collection.py'),
-        join(tmp_src, 'rdflib', 'compare.py'),
-        join(tmp_src, 'rdflib', 'compat.py'),
-        join(tmp_src, 'rdflib', 'events.py'),
-        join(tmp_src, 'rdflib', 'exceptions.py'),
-        join(tmp_src, 'rdflib', 'extras', '__init__.py'),
-        join(tmp_src, 'rdflib', 'extras', 'cmdlineutils.py'),
-        join(tmp_src, 'rdflib', 'extras', 'describer.py'),
-        join(tmp_src, 'rdflib', 'extras', 'infixowl.py'),
-        join(tmp_src, 'rdflib', 'graph.py'),
-        join(tmp_src, 'rdflib', 'namespace.py'),
-        join(tmp_src, 'rdflib', 'parser.py'),
-        join(tmp_src, 'rdflib', 'paths.py'),
-        join(tmp_src, 'rdflib', 'plugin.py'),
-        join(tmp_src, 'rdflib', 'plugins', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'memory.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'hturtle.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'notation3.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'nquads.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'nt.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'ntriples.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyMicrodata', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyMicrodata', 'microdata.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyMicrodata', 'registry.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyMicrodata', 'utils.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'embeddedRDF.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'extras', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'extras', 'httpheader.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'host', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'host', 'atom.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'host', 'html5.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'initialcontext.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'options.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'parse.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'property.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'rdfs', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'rdfs', 'cache.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'rdfs', 'process.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'state.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'termorcurie.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'transform', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'transform', 'DublinCore.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'transform', 'lite.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'transform', 'metaname.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'transform', 'OpenID.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'transform', 'prototype.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'pyRdfa', 'utils.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'rdfxml.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'structureddata.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'trig.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'parsers', 'trix.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'n3.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'nquads.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'nt.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'rdfxml.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'trig.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'trix.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'turtle.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'serializers', 'xmlwriter.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sleepycat.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'aggregates.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'algebra.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'datatypes.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'evaluate.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'evalutils.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'operators.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'parser.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'parserutils.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'processor.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', 'csvresults.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', 'jsonresults.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', 'rdfresults.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', 'tsvresults.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', 'txtresults.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'results', 'xmlresults.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'sparql.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'sparql', 'update.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'stores', '__init__.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'stores', 'auditable.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'stores', 'concurrent.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'stores', 'regexmatching.py'),
-        join(tmp_src, 'rdflib', 'plugins', 'stores', 'sparqlstore.py'),
-        join(tmp_src, 'rdflib', 'py3compat.py'),
-        join(tmp_src, 'rdflib', 'query.py'),
-        join(tmp_src, 'rdflib', 'resource.py'),
-        join(tmp_src, 'rdflib', 'serializer.py'),
-        join(tmp_src, 'rdflib', 'store.py'),
-        join(tmp_src, 'rdflib', 'term.py'),
-        join(tmp_src, 'rdflib', 'tools', '__init__.py'),
-        join(tmp_src, 'rdflib', 'tools', 'csv2rdf.py'),
-        join(tmp_src, 'rdflib', 'tools', 'graphisomorphism.py'),
-        join(tmp_src, 'rdflib', 'tools', 'rdf2dot.py'),
-        join(tmp_src, 'rdflib', 'tools', 'rdfpipe.py'),
-        join(tmp_src, 'rdflib', 'tools', 'rdfs2dot.py'),
-        join(tmp_src, 'rdflib', 'util.py'),
-        join(tmp_src, 'rdflib', 'void.py'),
-        join(tmp_src, 'run_tests.py'),
-        join(tmp_src, 'test', '__init__.py'),
-        join(tmp_src, 'test', 'earl.py'),
-        join(tmp_src, 'test', 'manifest.py'),
-        join(tmp_src, 'test', 'rdfa', '__init__.py'),
-        join(tmp_src, 'test', 'rdfa', 'run_w3c_rdfa_testsuite.py'),
-        join(tmp_src, 'test', 'rdfa', 'test_non_xhtml.py'),
-        join(tmp_src, 'test', 'store_performance.py'),
-        join(tmp_src, 'test', 'test_aggregate_graphs.py'),
-        join(tmp_src, 'test', 'test_bnode_ncname.py'),
-        join(tmp_src, 'test', 'test_comparison.py'),
-        join(tmp_src, 'test', 'test_conjunctive_graph.py'),
-        join(tmp_src, 'test', 'test_conneg.py'),
-        join(tmp_src, 'test', 'test_conventions.py'),
-        join(tmp_src, 'test', 'test_core_sparqlstore.py'),
-        join(tmp_src, 'test', 'test_dataset.py'),
-        join(tmp_src, 'test', 'test_datetime.py'),
-        join(tmp_src, 'test', 'test_dawg.py'),
-        join(tmp_src, 'test', 'test_diff.py'),
-        join(tmp_src, 'test', 'test_empty_xml_base.py'),
-        join(tmp_src, 'test', 'test_evaluate_bind.py'),
-        join(tmp_src, 'test', 'test_events.py'),
-        join(tmp_src, 'test', 'test_expressions.py'),
-        join(tmp_src, 'test', 'test_finalnewline.py'),
-        join(tmp_src, 'test', 'test_graph.py'),
-        join(tmp_src, 'test', 'test_graph_context.py'),
-        join(tmp_src, 'test', 'test_graph_formula.py'),
-        join(tmp_src, 'test', 'test_graph_items.py'),
-        join(tmp_src, 'test', 'test_initbindings.py'),
-        join(tmp_src, 'test', 'test_iomemory.py'),
-        join(tmp_src, 'test', 'test_issue084.py'),
-        join(tmp_src, 'test', 'test_issue154.py'),
-        join(tmp_src, 'test', 'test_issue160.py'),
-        join(tmp_src, 'test', 'test_issue161.py'),
-        join(tmp_src, 'test', 'test_issue184.py'),
-        join(tmp_src, 'test', 'test_issue190.py'),
-        join(tmp_src, 'test', 'test_issue200.py'),
-        join(tmp_src, 'test', 'test_issue209.py'),
-        join(tmp_src, 'test', 'test_issue247.py'),
-        join(tmp_src, 'test', 'test_issue248.py'),
-        join(tmp_src, 'test', 'test_issue363.py'),
-        join(tmp_src, 'test', 'test_issue375.py'),
-        join(tmp_src, 'test', 'test_issue379.py'),
-        join(tmp_src, 'test', 'test_issue_git_200.py'),
-        join(tmp_src, 'test', 'test_issue_git_336.py'),
-        join(tmp_src, 'test', 'test_literal.py'),
-        join(tmp_src, 'test', 'test_memory_store.py'),
-        join(tmp_src, 'test', 'test_n3.py'),
-        join(tmp_src, 'test', 'test_n3_suite.py'),
-        join(tmp_src, 'test', 'test_namespace.py'),
-        join(tmp_src, 'test', 'test_nodepickler.py'),
-        join(tmp_src, 'test', 'test_nquads.py'),
-        join(tmp_src, 'test', 'test_nquads_w3c.py'),
-        join(tmp_src, 'test', 'test_nt_misc.py'),
-        join(tmp_src, 'test', 'test_nt_suite.py'),
-        join(tmp_src, 'test', 'test_nt_w3c.py'),
-        join(tmp_src, 'test', 'test_parser.py'),
-        join(tmp_src, 'test', 'test_parser_helpers.py'),
-        join(tmp_src, 'test', 'test_parser_structure.py'),
-        join(tmp_src, 'test', 'test_path_div_future.py'),
-        join(tmp_src, 'test', 'test_prefixTypes.py'),
-        join(tmp_src, 'test', 'test_preflabel.py'),
-        join(tmp_src, 'test', 'test_prettyxml.py'),
-        join(tmp_src, 'test', 'test_rdf_lists.py'),
-        join(tmp_src, 'test', 'test_rdfxml.py'),
-        join(tmp_src, 'test', 'test_roundtrip.py'),
-        join(tmp_src, 'test', 'test_rules.py'),
-        join(tmp_src, 'test', 'test_seq.py'),
-        join(tmp_src, 'test', 'test_serializexml.py'),
-        join(tmp_src, 'test', 'test_slice.py'),
-        join(tmp_src, 'test', 'test_sparql.py'),
-        join(tmp_src, 'test', 'test_sparqlstore.py'),
-        join(tmp_src, 'test', 'test_sparqlupdatestore.py'),
-        join(tmp_src, 'test', 'test_swap_n3.py'),
-        join(tmp_src, 'test', 'test_term.py'),
-        join(tmp_src, 'test', 'test_trig.py'),
-        join(tmp_src, 'test', 'test_trig_w3c.py'),
-        join(tmp_src, 'test', 'test_trix_parse.py'),
-        join(tmp_src, 'test', 'test_trix_serialize.py'),
-        join(tmp_src, 'test', 'test_tsvresults.py'),
-        join(tmp_src, 'test', 'test_turtle_serialize.py'),
-        join(tmp_src, 'test', 'test_turtle_w3c.py'),
-        join(tmp_src, 'test', 'test_util.py'),
-        join(tmp_src, 'test', 'test_xmlliterals.py'),
-        join(tmp_src, 'test', 'testutils.py'),
-        join(tmp_src, 'test', 'triple_store.py'),
-        join(tmp_src, 'test', 'type_check.py'),
-        join(tmp_src, 'rdflib', 'extras', 'external_graph_libs.py'),
-        join(tmp_src, 'examples', 'graph_digest_benchmark.py'),
-        join(tmp_src, 'test', 'test_auditable.py'),
-        join(tmp_src, 'test', 'test_canonicalization.py'),
-        join(tmp_src, 'test', 'test_extras_external_graph_libs.py'),
-        join(tmp_src, 'test', 'test_issue223.py'),
-        join(tmp_src, 'test', 'test_issue381.py'),
-        join(tmp_src, 'test', 'test_issue432.py'),
-        join(tmp_src, 'test', 'test_issue446.py'),
-        join(tmp_src, 'test', 'test_issue457.py'),
-        join(tmp_src, 'test', 'test_issue492.py'),
-        join(tmp_src, 'test', 'test_issue523.py'),
-        join(tmp_src, 'test', 'test_issue532.py'),
-        join(tmp_src, 'test', 'test_issue535.py'),
-        join(tmp_src, 'test', 'test_issue545.py'),
-        join(tmp_src, 'test', 'test_issue554.py'),
-        join(tmp_src, 'test', 'test_issue563.py'),
-        join(tmp_src, 'test', 'test_issue576.py'),
-        join(tmp_src, 'test', 'test_issue579.py'),
-        join(tmp_src, 'test', 'test_issue604.py'),
-        join(tmp_src, 'test', 'test_issue655.py'),
-        join(tmp_src, 'test', 'test_sparql_agg_distinct.py'),
-        join(tmp_src, 'test', 'test_sparql_agg_undef.py'),
-        join(tmp_src, 'test', 'test_turtle_sort_issue613.py'),
-        join(tmp_src, 'test', 'test_wide_python.py'),
-    ]
-    for fn in six_ed:
-        outfiles_2to3.remove(fn)
-    for fn in outfiles_2to3:
-        print('running 2to3 on', fn)
-
-    util.run_2to3(outfiles_2to3)
 
-    # arrange setup to use the copy
-    sys.path.insert(0, tmp_src)
-
-    return tmp_src
+import os
+from setuptools import setup, find_packages
 
 kwargs = {}
-if sys.version_info[0] >= 3:
-    from setuptools import setup, find_packages
-    # kwargs['use_2to3'] = True  # is done in setup_python3 above already
-    kwargs['install_requires'] = ['isodate', 'pyparsing']
-    kwargs['tests_require'] = ['html5lib', 'networkx']
-    kwargs['requires'] = [
-        'six', 'isodate', 'pyparsing',
-        ]
-    html5lib = 'html5lib'
-    kwargs['src_root'] = setup_python3()
-    assert setup
-else:
-    try:
-        from setuptools import setup, find_packages
-        assert setup
-        kwargs['test_suite'] = "nose.collector"
-        kwargs['install_requires'] = [
-            'six', 'isodate',
-            'pyparsing']
-        kwargs['tests_require'] = ['networkx']
-
-        html5lib = 'html5lib'
-
-    except ImportError:
-        from distutils.core import setup, find_packages
-        html5lib = None
-
-if html5lib is not None: # ie. we're not using the simplified distutils setup
-    kwargs['extras_require'] = {'sparql': ['SPARQLWrapper'], 'html': [html5lib]}
-    kwargs['tests_require'].append('SPARQLWrapper')
-    kwargs['tests_require'].append(html5lib)
-
+kwargs['install_requires'] = [ 'six', 'isodate', 'pyparsing']
+kwargs['tests_require'] = ['html5lib', 'networkx', 'SPARQLWrapper']
+kwargs['test_suite'] = "nose.collector"
+kwargs['extras_require'] = {'sparql': ['SPARQLWrapper'], 'html': ['html5lib']}
 
-# Find version. We have to do this because we can't import it in Python 3 until
-# its been automatically converted in the setup process.
-def find_version(filename):
-    _version_re = re.compile(r'__version__ = "(.*)"')
-    for line in open(filename):
-        version_match = _version_re.match(line)
-        if version_match:
-            return version_match.group(1)
 
-version = find_version('rdflib/__init__.py')
+from rdflib import __version__ as version
 
 packages = find_packages(exclude=('examples*', 'test*'))