Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop use_2to3 and restore rdflib interoperability #105

Merged
merged 7 commits into from
Sep 10, 2021
Merged

Drop use_2to3 and restore rdflib interoperability #105

merged 7 commits into from
Sep 10, 2021

Commits on Sep 10, 2021

  1. Temporary - Pin rdflib to pre-6.0.0 

    This patch establishes the baseline state of unit tests passing.

Unit test results: 5 tests report a FAIL status, all related to JSON-LD
compaction. I suggest that these tests are out of scope of the mission
of restoring builds functioning, related to removing the use_2to3 flag.

References:
* RDFLib/rdflib#1405

Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    73a3066 View commit details
    Browse the repository at this point in the history

  2. Remove use_2to3 flag 

    The resolution of setuptools 2769 made any package using `use_2to3` to
fail its build.  This patch removes the flag, in support of outroducing
rdflib-jsonld.

The test suite is showing other follow-on patches will be necessary to
fix matters 2to3 had been quietly fixing along the way.  However, this
first patch does restore a working call to `pip install .` with
up-to-date setuptools.

Unit test results: This causes only the same five tests as were
previously failing to fail.

setuptools versions tested:
* 41.2.0
* 58.0.4

References:
* pypa/setuptools#2769
* RDFLib/rdflib#1405

Reported-by: Ralf Grubenmann <[email protected]>
Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    2bf7fb8 View commit details
    Browse the repository at this point in the history

  3. Catch rename of NTriplesParser 

    This is to prepare for rdflib 6.0.0.

The original rename was performed in this rdflib commit:
ceab6b2f71f97e45007b5306d2e0416bfefcea75

Unit test results: This causes only the same five tests as were
previously failing to fail.

Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    e416b1a View commit details
    Browse the repository at this point in the history

  4. Unpin rdflib version, permitting 6.0.0-onward 

    Unit test results: now reporting 135 errors, 1 failure (docstring).

Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    ee791ca View commit details
    Browse the repository at this point in the history

  5. Update patched function signature 

    The upstream signature had changed in this commit:
1a5df0084c6f361c9059ac19e64d632ae503b9b3

Unit test results: This patch addresses 124 of 135 errors raised in the
unit tests.  Failure (docstring) remains.

Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    9a009ca View commit details
    Browse the repository at this point in the history

  6. Adjust documentation and test behaviors to assume and/or force charac… 

    …ter strings

Graph.serialize() returns either a character string or a byte string in
rdflib 6.0.0.  This patch addresses the errors reported by nosetests.

Unit test results: This causes only the same five tests as were
initially failing to fail.

Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    38c90a2 View commit details
    Browse the repository at this point in the history

  7. Adjust documentation for rdflib <6 

    This docstring was a new test failure reported by nosetests when trying
one last time to pin rdflib to pre-6.0.0.

With this patch, test results match when using rdflib 5.0.0 or 6.0.0.

Unit test results: This causes only the same five tests as were
initially failing to fail.

setuptools versions tested:
* 41.2.0
* 58.0.4

Signed-off-by: Alex Nelson <[email protected]>
    @ajnelson-nist
    ajnelson-nist committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    76277e3 View commit details
    Browse the repository at this point in the history