Closed terry-longmacch closed 5 years ago
Wow impressive work. I can review later this week. Thanks.
Yeah we will drop py2exe and use something else I think. I have a early branch that I can bring back alive
On Fri., 9 Aug. 2019, 8:17 pm Terry McDonell, notifications@github.com wrote:
Making some very preliminary updates towards QGIS 3 (probably naively!).
Hit a wall with py2exe (and the alternative cx_Freeze). There is a new fork of py2exe that claims to have some compatibility with Python 3.7, but haven't been able to get it working, as yet (getting stuck on isSystemDLL). Have quite a bit of experience with other languages, but not much with Python, so struggling to get my head around the flow of setup.py.
Happy to continue on, if someone can help point me in the right direction.
Cheers, Terry
You can view, comment on, or merge this pull request online at:
https://github.com/roam-qgis/Roam/pull/440 Commit Summary
- Update setenv for QGIS 3.x
- Initial updates for QGIS 3.x
- Document required pip installation
- Updated python requirements to latest package versions
- Improve path variable selection and update for Python 3.7
- Revert "Document required pip installation"
- Update to QGIS 3 and remove requirement for version number
- Version number no longer required
- Use environment variables to define QGIS path
- Add py2exe as requirement
- Test and text isn't necessary, handled in setenv.bat
- Print is a function in Python 3, so needs parenthesis
- Syntax for catching an exception into a variable has changed.
- The previous version of fabricate was causing errors in Python 3.7
- Trying a new py2exe updated for Python 3.7?
File Changes
- M BUILDING.md https://github.com/roam-qgis/Roam/pull/440/files#diff-0 (12)
- M build.bat https://github.com/roam-qgis/Roam/pull/440/files#diff-1 (28)
- A libs/py2exe-0.9.3.1-cp37-none-win32.whl https://github.com/roam-qgis/Roam/pull/440/files#diff-2 (0)
- D libs/py2exe/init.py https://github.com/roam-qgis/Roam/pull/440/files#diff-3 (86)
- D libs/py2exe/boot_com_servers.py https://github.com/roam-qgis/Roam/pull/440/files#diff-4 (121)
- D libs/py2exe/boot_common.py https://github.com/roam-qgis/Roam/pull/440/files#diff-5 (98)
- D libs/py2exe/boot_ctypes_com_server.py https://github.com/roam-qgis/Roam/pull/440/files#diff-6 (89)
- D libs/py2exe/boot_service.py https://github.com/roam-qgis/Roam/pull/440/files#diff-7 (200)
- D libs/py2exe/build_exe.py https://github.com/roam-qgis/Roam/pull/440/files#diff-8 (1708)
- D libs/py2exe/mf.py https://github.com/roam-qgis/Roam/pull/440/files#diff-9 (809)
- D libs/py2exe/py2exe_util.pyd https://github.com/roam-qgis/Roam/pull/440/files#diff-10 (0)
- D libs/py2exe/resources/StringTables.py https://github.com/roam-qgis/Roam/pull/440/files#diff-11 (120)
- D libs/py2exe/resources/VersionInfo.py https://github.com/roam-qgis/Roam/pull/440/files#diff-12 (291)
- D libs/py2exe/resources/init.py https://github.com/roam-qgis/Roam/pull/440/files#diff-13 (1)
- D libs/py2exe/run.exe https://github.com/roam-qgis/Roam/pull/440/files#diff-14 (0)
- D libs/py2exe/run_ctypes_dll.dll https://github.com/roam-qgis/Roam/pull/440/files#diff-15 (0)
- D libs/py2exe/run_dll.dll https://github.com/roam-qgis/Roam/pull/440/files#diff-16 (0)
- D libs/py2exe/run_isapi.dll https://github.com/roam-qgis/Roam/pull/440/files#diff-17 (0)
- D libs/py2exe/run_w.exe https://github.com/roam-qgis/Roam/pull/440/files#diff-18 (0)
- M requirements.txt https://github.com/roam-qgis/Roam/pull/440/files#diff-19 (19)
- M scripts/editors/pycharm-pyqgis.bat https://github.com/roam-qgis/Roam/pull/440/files#diff-20 (2)
- D scripts/env-2.16.bat https://github.com/roam-qgis/Roam/pull/440/files#diff-21 (3)
- D scripts/env-2.18.bat https://github.com/roam-qgis/Roam/pull/440/files#diff-22 (3)
- M scripts/fabricate.py https://github.com/roam-qgis/Roam/pull/440/files#diff-23 (561)
- M scripts/package.bat https://github.com/roam-qgis/Roam/pull/440/files#diff-24 (5)
- M scripts/setenv.bat https://github.com/roam-qgis/Roam/pull/440/files#diff-25 (41)
- M scripts/watchui.py https://github.com/roam-qgis/Roam/pull/440/files#diff-26 (2)
- M setup.py https://github.com/roam-qgis/Roam/pull/440/files#diff-27 (8)
- M src/configmanager/bundle.py https://github.com/roam-qgis/Roam/pull/440/files#diff-28 (2)
- M src/configmanager/ui/configmanagerdialog.py https://github.com/roam-qgis/Roam/pull/440/files#diff-29 (6)
- M src/configmanager/ui/layerwidgets.py https://github.com/roam-qgis/Roam/pull/440/files#diff-30 (2)
- M src/configmanager/utils.py https://github.com/roam-qgis/Roam/pull/440/files#diff-31 (33)
- M src/plugins/search_plugin/search.py https://github.com/roam-qgis/Roam/pull/440/files#diff-32 (4)
- M src/roam.tests/conftest.py https://github.com/roam-qgis/Roam/pull/440/files#diff-33 (2)
- M src/roam/api/init.py https://github.com/roam-qgis/Roam/pull/440/files#diff-34 (2)
- M src/roam/api/featureform.py https://github.com/roam-qgis/Roam/pull/440/files#diff-35 (4)
- M src/roam/api/gps.py https://github.com/roam-qgis/Roam/pull/440/files#diff-36 (4)
- M src/roam/editorwidgets/VideoCapture.py https://github.com/roam-qgis/Roam/pull/440/files#diff-37 (8)
- M src/roam/infodock.py https://github.com/roam-qgis/Roam/pull/440/files#diff-38 (6)
- M src/roam/listmodulesdialog.py https://github.com/roam-qgis/Roam/pull/440/files#diff-39 (2)
- M src/roam/mapwidget.py https://github.com/roam-qgis/Roam/pull/440/files#diff-40 (8)
- M src/roam/project.py https://github.com/roam-qgis/Roam/pull/440/files#diff-41 (14)
- M src/roam/query.py https://github.com/roam-qgis/Roam/pull/440/files#diff-42 (6)
- M src/roam/structs.py https://github.com/roam-qgis/Roam/pull/440/files#diff-43 (2)
- M src/roam/syncing/replication.py https://github.com/roam-qgis/Roam/pull/440/files#diff-44 (2)
- M src/roam/syncwidget.py https://github.com/roam-qgis/Roam/pull/440/files#diff-45 (2)
- M src/roam/updater.py https://github.com/roam-qgis/Roam/pull/440/files#diff-46 (2)
- M src/roam/utils.py https://github.com/roam-qgis/Roam/pull/440/files#diff-47 (2)
Patch Links:
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AAC5FXHXIMIXJ3LPTW4BTFTQDU72VA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HELTYOA, or mute the thread https://github.com/notifications/unsubscribe-auth/AAC5FXFVIELVQBQ73FS6AJLQDU72VANCNFSM4IKSURCA .
Thanks Nathan - particularly for all of your work on this great project!
I've had a few people warn me about the joys of upgrading Python projects from 2 to 3!!
Haha yes it is not as fast as I would like and the lack of unit tests don't help here. Things I would fix if I had a time machine.
On Fri., 9 Aug. 2019, 8:24 pm Terry McDonell, notifications@github.com wrote:
Thanks Nathan - particularly for all of your work on this great project!
I've had a few people warn me about the joys of upgrading Python projects from 2 to 3!!
— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AAC5FXCP3LA34N3DGACNPWDQDVAUDA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD36I3FI#issuecomment-519867797, or mute the thread https://github.com/notifications/unsubscribe-auth/AAC5FXC5SJ5KMLIGIWONYATQDVAUDANCNFSM4IKSURCA .
@terry-longmacch I'm going to start on a review of this starting Monday arvo hopefully. Will be in touch. Thanks for the start.
I have merged this now @terry-longmacch. We will work off master for the Roam 3 update as there is a branch for 2.7.2 with fixes for that.
@NathanW2, just tried a commit to main branch but looks like it is still protected? Could you please check for me? Thanks.
@terry-longmacch master is protected from a force push to avoid nuking other changes you will need to do
git pull
before your push
Sorry @NathanW2, still finding my way here. Was using GitHub Desktop, but please see below.
C:\Development\Roam>git pull
Already up to date.
C:\Development\Roam>git push
Counting objects: 3, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 460 bytes | 92.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: At least 1 approving review is required by reviewers with write access.
To https://github.com/roam-qgis/Roam.git
! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'https://github.com/roam-qgis/Roam.git'
Yeah all good. Ok I see, Fixed now. I missed those settings.
On Tue, Aug 27, 2019 at 3:52 PM Terry McDonell notifications@github.com wrote:
Sorry @NathanW2 https://github.com/NathanW2, still finding my way here. Was using GitHub Desktop, but please see below.
C:\Development\Roam>git pull Already up to date.
C:\Development\Roam>git push Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 460 bytes | 92.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: Resolving deltas: 100% (2/2), completed with 2 local objects. remote: error: GH006: Protected branch update failed for refs/heads/master. remote: error: At least 1 approving review is required by reviewers with write access. To https://github.com/roam-qgis/Roam.git ! [remote rejected] master -> master (protected branch hook declined) error: failed to push some refs to 'https://github.com/roam-qgis/Roam.git'
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AAC5FXBEECNWZ5PRSPIPMGDQGS6JXA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5GSIRY#issuecomment-525149255, or mute the thread https://github.com/notifications/unsubscribe-auth/AAC5FXBZOY5B6DWMN4JUM3TQGS6JXANCNFSM4IKSURCA .
No problem, all good now. What's the best way for me to ask you about particular sections of code?
Regards,
Terry McDonell Principal Consultant Long Macch IT Solutions
p: 0458 238 915 w: www.longmacch.com.au
On Tue, 27 Aug 2019 at 15:57, Nathan Woodrow notifications@github.com wrote:
Yeah all good. Ok I see, Fixed now. I missed those settings.
On Tue, Aug 27, 2019 at 3:52 PM Terry McDonell notifications@github.com wrote:
Sorry @NathanW2 https://github.com/NathanW2, still finding my way here. Was using GitHub Desktop, but please see below.
C:\Development\Roam>git pull Already up to date.
C:\Development\Roam>git push Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 460 bytes | 92.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: Resolving deltas: 100% (2/2), completed with 2 local objects. remote: error: GH006: Protected branch update failed for refs/heads/master. remote: error: At least 1 approving review is required by reviewers with write access. To https://github.com/roam-qgis/Roam.git ! [remote rejected] master -> master (protected branch hook declined) error: failed to push some refs to ' https://github.com/roam-qgis/Roam.git'
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub < https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AAC5FXBEECNWZ5PRSPIPMGDQGS6JXA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5GSIRY#issuecomment-525149255 , or mute the thread < https://github.com/notifications/unsubscribe-auth/AAC5FXBZOY5B6DWMN4JUM3TQGS6JXANCNFSM4IKSURCA
.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AIP6T7SNCSHFGS3O2QTYGC3QGS65NA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5GSSTA#issuecomment-525150540, or mute the thread https://github.com/notifications/unsubscribe-auth/AIP6T7VQ4G6PQESK2MTJXHLQGS65NANCNFSM4IKSURCA .
Feel free to call me if you need, or open a ticket for it and we chat on there.
On Tue, Aug 27, 2019 at 4:03 PM Terry McDonell notifications@github.com wrote:
No problem, all good now. What's the best way for me to ask you about particular sections of code?
Regards,
Terry McDonell Principal Consultant Long Macch IT Solutions
p: 0458 238 915 w: www.longmacch.com.au
On Tue, 27 Aug 2019 at 15:57, Nathan Woodrow notifications@github.com wrote:
Yeah all good. Ok I see, Fixed now. I missed those settings.
On Tue, Aug 27, 2019 at 3:52 PM Terry McDonell <notifications@github.com
wrote:
Sorry @NathanW2 https://github.com/NathanW2, still finding my way here. Was using GitHub Desktop, but please see below.
C:\Development\Roam>git pull Already up to date.
C:\Development\Roam>git push Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 460 bytes | 92.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: Resolving deltas: 100% (2/2), completed with 2 local objects. remote: error: GH006: Protected branch update failed for refs/heads/master. remote: error: At least 1 approving review is required by reviewers with write access. To https://github.com/roam-qgis/Roam.git ! [remote rejected] master -> master (protected branch hook declined) error: failed to push some refs to ' https://github.com/roam-qgis/Roam.git'
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <
, or mute the thread <
https://github.com/notifications/unsubscribe-auth/AAC5FXBZOY5B6DWMN4JUM3TQGS6JXANCNFSM4IKSURCA
.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub < https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AIP6T7SNCSHFGS3O2QTYGC3QGS65NA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5GSSTA#issuecomment-525150540 , or mute the thread < https://github.com/notifications/unsubscribe-auth/AIP6T7VQ4G6PQESK2MTJXHLQGS65NANCNFSM4IKSURCA
.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/roam-qgis/Roam/pull/440?email_source=notifications&email_token=AAC5FXBKQEY25XAGAMVVM5LQGS7UJA5CNFSM4IKSURCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5GS6WQ#issuecomment-525152090, or mute the thread https://github.com/notifications/unsubscribe-auth/AAC5FXEBCVXFOCRSXBLU47TQGS7UJANCNFSM4IKSURCA .
Making some very preliminary updates towards QGIS 3 (probably naively!).
Hit a wall with py2exe (and the alternative cx_Freeze). There is a new fork of py2exe that claims to have some compatibility with Python 3.7, but haven't been able to get it working, as yet (getting stuck on isSystemDLL). Have quite a bit of experience with other languages, but not much with Python, so struggling to get my head around the flow of setup.py.
Happy to continue on, if someone can help point me in the right direction.
Cheers, Terry