[DONE] conda: update to qt5.12

[looo]

conda-forge is preparing for qt5.12. So again this means some work has to be done to get freecad updated:
https://github.com/conda-forge/qt-feedstock/pull/110

- [x] qt 5.12 https://anaconda.org/conda-forge/qt/fil ... ion=5.12.1
- [x] simage (optional dep of pivy) https://github.com/conda-forge/simage-feedstock/pull/10
- [x] update pyside2 to use qt5.12 https://github.com/conda-forge/pyside2- ... ck/pull/35
- [x] update soqt to use qt5.12 https://github.com/conda-forge/soqt-feedstock/pull/4
- [x] update pivy to updated pyside2 / soqt https://github.com/conda-forge/soqt-feedstock/pull/4
- [x] update freecad https://github.com/conda-forge/freecad- ... ck/pull/27

but as usual this will need some time.

[Kunda1]

Thanks for tracking this!

[looo]

Things went smooth until:

Code: Select all

1 invalid syntax ($PREFIX/Mod/Draft/importSVG.py, line 746)

https://github.com/FreeCAD/FreeCAD/blob ... VG.py#L746

[easyw-fc]

ping

issue confirmed on latest FC daily

[looo]

Problem still not solved. I wonder why ci's are passing?

[vocx]

Code: Select all

1 invalid syntax ($PREFIX/Mod/Draft/importSVG.py, line 746)

https://github.com/FreeCAD/FreeCAD/blob ... VG.py#L746

Thanks for tracking this!

Ping

The problem seems to be this: I submitted a bunch of changes to importSVG.py, so that the code complies with PEP 8 (flake8); the changes were mostly stylistic, so using 4 spaces instead of 8 spaces, and breaking lines that were longer than 80 characters, so that the code is more readable.

See the history here https://github.com/FreeCAD/FreeCAD/comm ... portSVG.py

My last git commit 3e11cc5 still works well. But immediately after, Yorik merged Kuda's git commit 2a139a8 which corrects spelling mistakes in many source files. In importSVG.py the spelling errors were in the comments, at the top of the file, however it seems that in line 746 some code was added. This added code was probably a mistake. Kunda's branch probably wasn't rebased on FreeCAD's master or on my own branch, so it seems there were some conflicts when merging. The code in Kunda's git commit 2a139a8, the green additions, aren't actually new code; that code is already there, but is shifted a few lines. See the current master branch, line 848.

The lines 746 to 835, that Kunda added, that start with if 'style' in data: are the same ones that already exist in lines 848 to 934. As I said, probably an accidental merge of conflicted code.

My suggestion is this: remove Kunda's commit. Then he should submit a new commit without the changes to importSVG.py code; then submit a separate commit for this file only, rebasing on the master branch as necessary. I think if these changes only correct spelling mistakes, it shouldn't be very difficult.

The continuous integration tests probably pass because there is no test for importSVG. It will only error if somebody imports it in their installed system. Probably we should write a test, creating some figures, exporting to SVG, and importing that same SVG.

[Kunda1]

That's weird. Not sure how that code got in there!

[vocx]

That's weird. Not sure how that code got in there!

Yeah, I know. I think I saw that strange code at some point, but since I was doing other commits I forgot about it.

Anyway, I just submitted pull request #2418.

It just deletes the extraneous code, but keeps the spelling corrections.

So now it's like git commit 3e11cc5 + spelling corrections. No need to revert anything or do complicated maneuvers, I think.

[triplus]

[DONE] conda: update to qt5.12

This is i guess one of the most impressive packaging related milestones reached in a while! Latest and greatest packages on all mayor platforms.

P.S. I had a huge (and unplanned) project to sort out in the past month and didn't follow FreeCAD development closely as a result. In a week or two i will have more free time again, will test all this new additions for sure!