| | 24 | * Qt 6.2 |
| | 25 | - Tom built Qt 6 on ChimeraX on Mac, Linux, Windows and tested. Has been using Qt6 ChimeraX for a few weeks. |
| | 26 | - Greg will put Qt 6 preview builds on download page. |
| | 27 | - We will notify developers: Tristan, Tony, Ben Webb about Qt 6 version. |
| | 28 | - We will also use the Qt 6 version. |
| | 29 | - Test for 2 weeks to a month then make normal daily build use Qt 6. |
| | 30 | - Will not make licensed wheels for Apple M1 until needed. |
| | 31 | |
| | 32 | * Update prereqs |
| | 33 | - Eric, Greg and Tom updated ChimeraX prereqs to current versions. |
| | 34 | - Have suds-jurko compile error breaking linux nightly builds, Greg looking into it. Maybe pip update caused it. |
| | 35 | - Greg would like to put security hash in pip requirements.txt. |
| | 36 | |
| | 37 | * Web services |
| | 38 | - Eric asks Zach about status of web services. Can Eric use it for alignment services now or in a week? |
| | 39 | - Zach plans to release it after testing on testwebservice backend machine. |
| | 40 | - Zach will write up docs before giving web services developer meeting presentation in two weeks as requested by Scooter. |
| | 41 | |
| | 42 | * Git merge master and develop? |
| | 43 | - Should we try to merge master into develop? Zach asked. |
| | 44 | - There are commits on the 1.3 branch and in master which is at 1.3 which do not belong in develop. |
| | 45 | - Eric says attribute registration code in 1.3 branch diverged from develop, as an example. |
| | 46 | - Decided to leave master branch (which says it is ahead of develop by hundreds of commits, and behind by hundreds) as is. |
| | 47 | - Greg may look into how git flow is supposed to handle this. |
| | 48 | - When a commit is made on a release branch (e.g. 1.3) that belongs also in 1.4 then the developer has to also commit it to develop branch. |
| | 49 | |
| | 50 | |
![[ChimeraX Issue Tracking System]](/trac/ChimeraX/chrome/site/ChimeraX-icon.svg){kind=icon}
