Transition from 2to3 to use of six.py to be merged in 5.0.0-dev #519
Conversation
|
Looking at some of the files you already did Jörn, I guess we are happy leaving in |
gromgull
force-pushed
the
six_2to3
branch
11 times, most recently
from
f5f7d3e
to
df7f20e
Compare
|
awesome! |
|
Jörn, this is pretty much done. How to proceed? I would maybe squash merge into the 5.0.0 branch, so it's all one commit. |
|
hmm, i'm against squashing, as a single huge commit is always harder to merge than individual ones on upcoming conflicts, etc... except for a lying cleaner and shorter history, what's the benefit? |
the types variable became an iterable and was exhausted on 2nd check in py3
gromgull
force-pushed
the
six_2to3
branch
2 times, most recently
from
ae268a3
to
362ba4f
Compare
|
So I've converted the rest and removed all special py3 handling from setup et al. However, py3compat has grown ridicolously - I think having this: https://github.com/RDFLib/rdflib/blob/six_2to3/rdflib/py3compat.py#L18-L52 is weird, when we use six anyway. I'll do a global search replace and import these straight from six in every place. That way we don't import everything but the kitchen sink for every rdflib module. |
setup.py
Outdated
|
|
||
| version = find_version('rdflib/__init__.py') | ||
| from rdflib import __version__ as version |
There was a problem hiding this comment.
this is bad: if any of the requirements listed above isn't present it will fail... at build time we don't want to import rdflib
the reason it doesn't fail in CI is cause we do a pip install -r requirements.txt in travis... maybe we shouldn't
There was a problem hiding this comment.
I thought I remembered it being bad for some reason - but figure I'll let travis decide :)
now six is used throughout.
.travis.yml
Outdated
| @@ -16,7 +16,6 @@ python: | |||
| - 3.6 | |||
|
|
|||
| before_install: | |||
| - pip install -U setuptools pip # seems travis comes with a too old setuptools for html5lib | |||
There was a problem hiding this comment.
bugger, this wasn't mean to go in this commit.
replaced with doctest-ignore-unicode noseplugin
|
tests pass, i went over the last couple of commits and quickly skimmed the whole (as good as possible with 156 changed files)... in the interest of finishing this ~ 1.5 years process, i'm just going ahead and merging this... other bugs and cleanups can be fixed later |
requirements.txt
Outdated
| @@ -4,3 +4,4 @@ isodate | |||
| pyparsing | |||
| six | |||
| SPARQLWrapper | |||
| doctest-ignore-unicode | |||
There was a problem hiding this comment.
@joernhees after I went to bed I realise that this should have been in test_requires in setup.py and not here :D
And then we could run the tests with python setup.py nosetests on travis.
But we can fix in master!
related to and closes #438 but compares to branch 5.0.0-dev instead of master
The old porting approach in #374 to six became quite messy because it started by deactivating 2to3 and then tried to fix all errors. Instead let's try to work through a diff of py2 with py3 after 2to3 and deactivate 2to3 one by one whenever a file is done. In the process the tests are meant to always pass.
Branch is unstable!