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

Upgrade to Qt 5.13.2 - Issue 2247 #2271

Merged
merged 12 commits into from
Apr 16, 2020
Merged

Upgrade to Qt 5.13.2 - Issue 2247 #2271

merged 12 commits into from
Apr 16, 2020

Conversation

sgpearse
Copy link
Collaborator

@sgpearse sgpearse commented Apr 7, 2020 •
edited
Loading

Addresses #2247

These libraries are located in our Google Drive folder:
[Vapor Team Drive>]/Third Party Libraries

This link may or may not work:
https://drive.google.com/drive/u/0/folders/0B0dQMtxB89M0Q2F2U3ZaQ2dVeWs

Download the new third party libraries at the links below:
CentOS
Ubuntu
Darwin
Windows

@clyne clyne requested a review from StasJ April 7, 2020 17:32
StasJ
StasJ approved these changes Apr 7, 2020
View reviewed changes
Copy link
Collaborator

@StasJ StasJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirmed that this includes the libpng library. My only request is that you add a reference to the google drive files rather than direct share links so we don't have to reference this PR for the files.

@sgpearse
Copy link
Collaborator Author

sgpearse commented Apr 8, 2020 •
edited
Loading

My only request is that you add a reference to the google drive files rather than direct share links so we don't have to reference this PR for the files.

Got it. Description updated.

@shaomeng
Copy link
Contributor

Addresses #2247

These libraries are located in our Google Drive folder:
[Vapor Team Drive>]/Third Party Libraries

This link may or may not work:
https://drive.google.com/drive/u/0/folders/0B0dQMtxB89M0Q2F2U3ZaQ2dVeWs

Download the new third party libraries at the links below:
CentOS
Ubuntu
Darwin
Windows

Scott, just to confirm, the 3rd party libraries are more like March-2020, even though they're named Aug-2019, is that right?

If so, isn't this a pretty confusing situation?

@sgpearse
Copy link
Collaborator Author

@shaomeng, as we discussed in our email thread, all libraries were built in August of 2019 with the exception of Qt.

@shaomeng
Copy link
Contributor

@shaomeng, as we discussed in our email thread, all libraries were built in August of 2019 with the exception of Qt.

Got it, thanks for confirming Scott!

@shaomeng
Copy link
Contributor

shaomeng commented Apr 14, 2020 •
edited
Loading

When I test this PR on cisl-vapor, there are around a dozen QT related warnings. Other than that, this PR seems to be working well.

Though those warnings aren't specifically introduced by this PR, but given that this PR is still at a very manageable size, I'd suggest addressing them along this PR, instead of opening a new PR. @StasJ you might want to double check if there are warnings introduced by PWidgets.

@sgpearse
Copy link
Collaborator Author

@shaomeng, I see the warnings you're talking about. Many of them are about deprecated functions in Qt. I found and fixed only one warning regarding PWidgets, which I'm working closely with now. I'd like to make a more comprehensive effort to eliminate warnings in the near future.

@shaomeng
Copy link
Contributor

@sgpearse I built using Release configurations, maybe that gave me more warnings.

Also, isn't moving away from deprecated functions a price we already decided to pay when we upgraded QT?

But after all I do think those warnings hardly belong to this PR, so I have no problem with this particular PR.

@clyne
Copy link
Collaborator

clyne commented Apr 15, 2020

@sgpearse there are conflicts in the PR now. As soon as they are resolved we can merge.

@sgpearse
Copy link
Collaborator Author

@sgpearse I built using Release configurations, maybe that gave me more warnings.

Let's talk about this today. I'd be ok with fixing warnings on Ubuntu16 for this release, and enforcing a no-warning policy on PR's for only this OS.

@clyne clyne merged commit abf3388 into master Apr 16, 2020
@clyne clyne deleted the issue_2247 branch April 16, 2020 00:20
StasJ added a commit that referenced this pull request Jul 30, 2020
@StasJ
Squashed commit of the following:
62a79ba 
commit e0d7594
Author: Scott Pearse <[email protected]>
Date:   Thu Jul 30 09:32:48 2020 -0600

    write warning test failure to circle output upon failure

commit bb53927
Merge: 43aa394 805f7e2
Author: Stanislaw Jaroszynski <[email protected]>
Date:   Mon Jul 27 12:05:04 2020 -0600

    Merge branch 'master' of https://github.com/NCAR/VAPOR

commit 43aa394
Author: Samuel Li <[email protected]>
Date:   Mon Jul 27 12:00:03 2020 -0600

    fix git blame

commit 805f7e2
Author: StasJ <[email protected]>
Date:   Mon Jul 27 07:40:00 2020 -0600

    Fix GUI coloring (#2320)

commit f4bc6c5
Author: StasJ <[email protected]>
Date:   Sat Jul 25 13:25:22 2020 -0600

    Fix misc qt cmake issues (#2319)

commit a442ed0
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 09:00:55 2020 -0600

    Fix unguarded if clauses

commit 94b1708
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 08:41:28 2020 -0600

    re-enable warning/smoke tests on master

commit 05ebe5b
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 08:31:18 2020 -0600

    Disable manual release builds on master

commit eed3605
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 08:15:12 2020 -0600

    turn off weekly builds on master branch, which causes them to trigger on each PR

commit 59c3322
Author: sgpearse <[email protected]>
Date:   Fri Jun 26 16:46:11 2020 -0600

    Fix unused function warning (#2302)

    * Fix unused function warning

    * ifdef unused function instead of deleting it

commit 27e10f5
Author: Scott Pearse <[email protected]>
Date:   Fri Jun 26 06:00:25 2020 -0600

    rerun weekly build

commit ed79f29
Author: Scott Pearse <[email protected]>
Date:   Fri Jun 26 05:57:48 2020 -0600

    Fix osx library link

commit 8a44bb9
Author: sgpearse <[email protected]>
Date:   Wed Jun 24 17:17:53 2020 -0600

    Issue1701 (#2304)

    * incremental

    * Undo clearing of VaporTable

commit 54db3b7
Merge: 669a896 a9d19c5
Author: Scott Pearse <[email protected]>
Date:   Wed Jun 24 08:42:20 2020 -0600

    Merge branch 'master' of https://github.com/NCAR/VAPOR

commit 669a896
Author: Scott Pearse <[email protected]>
Date:   Wed Jun 24 08:31:08 2020 -0600

    update circle config

commit a9d19c5
Author: StasJ <[email protected]>
Date:   Tue Jun 23 08:43:52 2020 -0600

    Flow rendering refactor (#2280)

    * Flow rendering refactor

    * fix

    * Address GUI review comments

    * changes from second gui review meeting

    * Added documentation to shaders

    * Made var private

    * misc

    * misc

    * Line width

    * remove goto

commit 961ce70
Author: Stanislaw Jaroszynski <[email protected]>
Date:   Mon Jun 22 16:48:00 2020 -0600

    Casper fix

commit ac1c64b
Author: sgpearse <[email protected]>
Date:   Sat Jun 6 08:13:46 2020 -0600

    Fix dbus (#2300)

    * Fix dbus problem on CentOS

    * Fix dbus

commit 9f6636d
Author: sgpearse <[email protected]>
Date:   Fri May 29 13:02:40 2020 -0600

    fix #2295: wrong linker symbol in libvdc (#2296)

commit 8a1fef8
Author: clyne <[email protected]>
Date:   Tue May 19 14:56:12 2020 -0600

    Fixed #2276 - Add support for deriving zonal and meridional winds for MPAS model outputs (#2290)

    * Fixed #2276

    * Fixed memory leak

    * Check return code

commit 77f5869
Author: Scott Pearse <[email protected]>
Date:   Wed May 13 08:00:58 2020 -0600

    Point users to discourse forum

commit dc160bb
Merge: 8be32f5 661a966
Author: Scott Pearse <[email protected]>
Date:   Tue May 12 09:05:01 2020 -0600

    Merge branch 'master' of https://github.com/NCAR/VAPOR

commit 8be32f5
Author: Scott Pearse <[email protected]>
Date:   Tue May 12 09:04:55 2020 -0600

    added space to circle

commit 661a966
Author: Orhan Eroglu <[email protected]>
Date:   Tue May 12 06:22:22 2020 -0600

    game the system (#2293)

commit 15734b4
Author: Kevin Hallock <[email protected]>
Date:   Fri May 8 11:06:19 2020 -0600

    Add weekly build info to downloads.html (#2292)

commit e0592a5
Author: Scott Pearse <[email protected]>
Date:   Fri May 8 06:57:16 2020 -0600

    gameTheSystem

commit ff7640f
Author: sgpearse <[email protected]>
Date:   Sat May 2 10:03:13 2020 -0600

    Removed static_cast in c file (#2291)

commit 8dfa913
Author: sgpearse <[email protected]>
Date:   Thu Apr 30 14:18:13 2020 -0600

    Ubuntu warnings (#2289)

    * Fix warnings

    * fix warnings

commit 2e2dcfe
Author: sgpearse <[email protected]>
Date:   Wed Apr 22 15:33:00 2020 -0600

    Smoke tests (#2238)

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * ghr test

    * fix

    * test

    * save to workspace

    * save to workspace

    * save to workspace

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * osx test

    * osx test

    * Hopefully fixed CPack on OSX

    * test

    * test

    * open floodgates

    * adding cron

    * adding cron

    * adding cron

    * modified cron

    * modified cron

    * Vapor3 nightly build for installers

    * Vapor3 nightly build for installers

    * Vapor3 nightly build for installers

    * fixed timing of cron job to correspond to UTC

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * Updated nightly-release description

    * Clang tidy

    * fix schema

    * remove sudo

    * tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * osx cache test

    * osx cache test

    * osx cache test

    * osx cache test

    * osx cache test

    * osx cache test

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * installer cache test

    * installer cache test

    * installer cache test

    * installer cache test

    * installer cache test

    * installer cache test

    * increase timeout

    * Windows10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * first commit

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * windows10 persist to workspace

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * test

    * test

    * manual run of weekly build

    * reinstate weekly buildsw

    * reinstate weekly builds

    * update

    * Removed caching on OSX

    * Test synthetic grids

    * Changed names of nightly builds to weekly

    * incremental

    * test

    * test

    * incremental

    * manual weekly build

    * manual weekly build

    * ready for PR

    * Removed files

    * Removed files

    * Removed comments

    * Removed comment

    * Win10 test

    * Added descriptions

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * test

    * test

    * test

    * save dockerfile before stash

    * updates for clarifying nudge bug

    * removed diagnostic

    * smokeTest+Circle test

    * Fixed #2252

    * intermediate

    * added default baseline file generation

    * Added baseline files

    * updated baseline files, but there's a new bug

    * update dockerfile

    * test

    * Incremental

    * test

    * test

    * test

    * test

    * Remove grid test baseline files

    * Added python to ubuntu18 docker image

    * Add python

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * incremental

    * updates

    * Added ConstCoordItr and ConstNodeItr tests

    * test

    * indexing fix

    * Added margin of error to iterator tests

    * updates for code review

    * Added guards to if() statements

    * Change from AccessIJK to GetValueAtIndex

    * moved t0 up with other initializers

    * update baseline files

    Co-authored-by: John Clyne <[email protected]>

commit da1cb4d
Author: clyne <[email protected]>
Date:   Tue Apr 21 08:03:53 2020 -0600

    Fixed #2285 (#2286)

commit 00ac696
Author: StasJ <[email protected]>
Date:   Sun Apr 19 14:22:43 2020 -0600

    Change extension from .nc to .vdc (#2262)

    * Change extension from .nc to .vdc

    * warning

    * Change message output to stderr

    * Vapor command line arguments

    * Help message

    * Automatically determine dataset format

    * Change from return code to boolean

commit 2612810
Author: Scott Pearse <[email protected]>
Date:   Fri Apr 17 08:34:01 2020 -0600

    Update third party libraries

commit 744ee14
Author: clyne <[email protected]>
Date:   Wed Apr 15 20:07:58 2020 -0600

    Fixed #2273 - jsmall no longer opens (#2282)

    * Fixed #2273

    * Accidentally omitted changes to .h file.

commit abf3388
Author: sgpearse <[email protected]>
Date:   Wed Apr 15 18:20:21 2020 -0600

    Upgrade to Qt 5.13.2 - Issue 2247 (#2271)

    * initial commit

    * added build3rdParty.py

    * Ubuntu mods

    * CentOS updates

    * OSX updates

    * OSX updates

    * updates

    * Ubuntu update

    * Removed script

    * windows update

    * Fix PRegionSelector warning

commit 76a878a
Author: clyne <[email protected]>
Date:   Tue Apr 14 08:45:14 2020 -0600

    Fixed #2274 (#2275)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StasJ StasJ StasJ approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sgpearse @shaomeng @clyne @StasJ