Remove last traces of python 2 special handling#328
Conversation
|
Hi @ZedThree, if you could fix the conflicts on this one and then I'll review it... Thanks :-) |
* master: pr #322. Updated changelog ready for merge to master. #322 try quoting python versions in GHA yml #322 updates for review #323 update changelog Use Sphinx roles to some docstrings Add some test docstrings Move entity decl test under f2003 directory Auto-use parser creation fixtures Add more tests for `get_name` methods Add `.get_name()` to `Function_Stmt` and `Entity_Decl`
Codecov Report
@@ Coverage Diff @@
## master #328 +/- ##
==========================================
- Coverage 91.28% 91.25% -0.04%
==========================================
Files 36 36
Lines 13046 13022 -24
==========================================
- Hits 11909 11883 -26
- Misses 1137 1139 +2
Continue to review full report at Codecov.
|
|
@arporter Good to go :) |
Codecov Report
@@ Coverage Diff @@
## master #328 +/- ##
==========================================
- Coverage 91.28% 91.27% -0.02%
==========================================
Files 36 36
Lines 13046 12994 -52
==========================================
- Hits 11909 11860 -49
+ Misses 1137 1134 -3
Continue to review full report at Codecov.
|
arporter
left a comment
There was a problem hiding this comment.
Many thanks for taking this on Peter - it's a big improvement.
GHA and coverage is all fine.
Documentation builds and looks fine.
There's one method that still talks quite a lot about Py2 and Py3.
There's also one test that you've removed completely and I'm not sure why.
Apart from that, there are just a few places where I've taken the opportunity to ask for fixes to associated pylint warnings. (I tried to keep this to a minimum because otherwise you'd be here all year given the state of some of the existing code.)
|
One other change that I've not done but just seen is use of |
I think I'd like that kept for a separate PR (not necessarily by you!) - this is already quite big. |
|
Hi @ZedThree, is this ready for review again? |
|
@arporter Yep, all done! |
arporter
left a comment
There was a problem hiding this comment.
Almost there apart from those places where a return None is needed :-)
Please note that our way of working on GitHub is for the reviewer to mark conversations as 'resolved' as that makes it easier for them to ensure that each has been done to their satisfaction.
arporter
left a comment
There was a problem hiding this comment.
Many thanks for the updates.
Just a couple of comments to address and then this can be merged.
arporter
left a comment
There was a problem hiding this comment.
All good now thanks. Will proceed to merge once CI is complete (and happy).
|
The missed lines are all statements where |
* master: (22 commits) #328 update changelog Rename `BeginStatement.handle_unknown_item` Return `None` from unimplemented function Use `f` prefix on all lines of multiline f-string Return `None` explicitly from some functions Remove redundant `return` statements from the end of functions Convert some `str.format()` calls to f-strings Remove py2 `unicode` string literal Remove py2 `unicode` special handling Change type in docstring to py3 style hint Remove reference to py2 from comments/docstring Revert accidental removal of test case Fix wrong variable in error message Remove duplicated `str` in `isinstance` argument Use f-string to print error message Remove mention of `six` from documentation Use py3 style class/metaclass syntax Remove imports of `__future__` Remove use of `six.StringIO` Remove some special handling for differences in capsys between py2/3 ...
* master: (44 commits) stfc#336 update changelog stfc#343 update version to 0.0.15 Update changelog stfc#328 update changelog Rename `BeginStatement.handle_unknown_item` Return `None` from unimplemented function Use `f` prefix on all lines of multiline f-string Return `None` explicitly from some functions Remove redundant `return` statements from the end of functions Convert some `str.format()` calls to f-strings Remove py2 `unicode` string literal Remove py2 `unicode` special handling Change type in docstring to py3 style hint Remove reference to py2 from comments/docstring Revert accidental removal of test case Fix wrong variable in error message Remove duplicated `str` in `isinstance` argument pr stfc#322. Updated changelog ready for merge to master. stfc#322 try quoting python versions in GHA yml stfc#322 updates for review ...
PR into #322 removing last few bits of
sixand python 2 special handling