loujine: heard you ran into ruaok! We see you monday afternoon then? :)
2017-04-01 09141, 2017
D4RK-PH0ENiX joined the channel
2017-04-01 09110, 2017
d4rkie has quit
2017-04-01 09135, 2017
Leftmost
He's a real boy now, reo.
2017-04-01 09116, 2017
d4rkie joined the channel
2017-04-01 09148, 2017
Nyanko-sensei has quit
2017-04-01 09134, 2017
agentsim joined the channel
2017-04-01 09102, 2017
LordSputnik
reosarevok: not any more, last year I could've been a student but was a mentor instead
2017-04-01 09121, 2017
agentsim has quit
2017-04-01 09137, 2017
Nyanko-sensei joined the channel
2017-04-01 09100, 2017
d4rkie has quit
2017-04-01 09157, 2017
zas
samj1912: ping
2017-04-01 09155, 2017
samj1912
pong
2017-04-01 09103, 2017
samj1912
zas: moin o/
2017-04-01 09128, 2017
zas
Moin
2017-04-01 09104, 2017
zas
Are you available for the release this morning?
2017-04-01 09132, 2017
samj1912
yeah
2017-04-01 09138, 2017
samj1912
we can release at 14:10 UTC?
2017-04-01 09112, 2017
suhas2go joined the channel
2017-04-01 09155, 2017
samj1912
zas: can you mark it for 1.4.1?
2017-04-01 09159, 2017
samj1912
we can build it then?
2017-04-01 09116, 2017
JonnyJD joined the channel
2017-04-01 09108, 2017
zas
Ok, coffee for now, then we start
2017-04-01 09126, 2017
samj1912
okay :D
2017-04-01 09121, 2017
Major_Lurker joined the channel
2017-04-01 09120, 2017
MajorLurker has quit
2017-04-01 09157, 2017
Freso
Will you merge Qt5 stuff today?
2017-04-01 09114, 2017
Freso
(Post-1.4.1 release.)
2017-04-01 09148, 2017
Sophist
Don't forget to create a 1.4.2 branch so we can spin off minor maintenance releases.
2017-04-01 09151, 2017
samj1912
Freso: I think we can
2017-04-01 09156, 2017
samj1912
Sophist: yes
2017-04-01 09116, 2017
Sophist
Since we will need to redo the dev environment, it might make sense to merge the Qt5 and Py3 changes at the same time so that I only need to redo it once.
2017-04-01 09115, 2017
Sophist
Good morning from my BTW.
2017-04-01 09130, 2017
samj1912
Sophist: actually we can merge the qt5 changes, I made the travis and other changes for it in the PR too
2017-04-01 09157, 2017
samj1912
the qt5 PR is standalone
2017-04-01 09147, 2017
Sophist
Sorry - what I said was confusing - I mean our personal dev environments on our PCs.
2017-04-01 09116, 2017
samj1912
you just need pyqt5?
2017-04-01 09140, 2017
samj1912
setting up the dev env for py3 is quite easy since everything is available on pip
2017-04-01 09152, 2017
samj1912
so you can easily do it later
2017-04-01 09100, 2017
samj1912
the py3 port will take some time to debug
2017-04-01 09126, 2017
samj1912
plus the qt5 port alone offers better performance
2017-04-01 09112, 2017
samj1912
and for any debugging in the qt5 part, someone will have to branch off of my PR
2017-04-01 09120, 2017
samj1912
better to have the changes in master
2017-04-01 09133, 2017
arbenina joined the channel
2017-04-01 09144, 2017
Freso
No need to make a 1.4.2 branch before it's needed though.
2017-04-01 09153, 2017
samj1912
Freso we have a couple of pending PRs that can be merged into 1.4.2
2017-04-01 09100, 2017
Freso
Oh, okay.
2017-04-01 09119, 2017
samj1912
However I think they have to be opened again against 1.4.2 instead of master?
2017-04-01 09122, 2017
Freso would probably name the branch something like "1.4.x" rather than making it specific to .2
2017-04-01 09143, 2017
samj1912
Yeah, works for me
2017-04-01 09144, 2017
Freso
samj1912: You can just cherry-pick or merge.
2017-04-01 09102, 2017
samj1912
👍
2017-04-01 09109, 2017
Freso
Esp. if you merge those after 1.4.1 release but before 2.0 breaking PRs.
2017-04-01 09137, 2017
Freso
Making 1.4.2 and 2.0 share common commit history as much as possible, instead of having duplicated commits due to cherry-picking. :)
2017-04-01 09143, 2017
samj1912
Well they'd be useless in 2.0 I think since all of that code might be rewritten
2017-04-01 09149, 2017
samj1912
Let's see
2017-04-01 09147, 2017
Freso
Ah.
2017-04-01 09102, 2017
Freso
Well, you can always merge the PRs manually instead of doing it through the GH interface.
2017-04-01 09120, 2017
Freso
Then you are in completely control over which branches they get applied to.
2017-04-01 09131, 2017
samj1912
Yup
2017-04-01 09141, 2017
Freso
Also, if the code will get rewritten, it likely won't do any harm to have the PRs merged into the branch anyway.
2017-04-01 09128, 2017
Freso
Some people (e.g., me :)) are using Picard from latest/recent git/master, so until the 2.0 changes are actually done, the 1.4.2 ones might be nice to have.
2017-04-01 09129, 2017
Freso
navap: Happy birthday :)
2017-04-01 09152, 2017
Sophist
If we are happy to have 1.4.2 using Qt5, then we don't need a 1.4.2 branch yet. But if we want to stick with At4 for the 1.4.x releases we need to split off the maintenance branch before merging Qt5.
2017-04-01 09127, 2017
Sophist
Freso: That is why I was asking about Qt5 in the 1.4.2 - people running from source will need to install Qt5.
2017-04-01 09155, 2017
Freso
Sophist: If they run raw, ie. straight from git, they will have to keep up with git and they should know as much.
2017-04-01 09102, 2017
zas
1.4.2 will stay on py2/qt4, and will only contain bug fixes
2017-04-01 09115, 2017
Freso
If they run from some package, say AUR's picard-git, then the packaging should handle that for them.
2017-04-01 09119, 2017
Sophist
zas: I think that is best too.
2017-04-01 09137, 2017
Sophist
In which case we need to split off the 1.4.x branch before merging Qt5.
2017-04-01 09146, 2017
Freso
Sophist: Not really.
2017-04-01 09110, 2017
Freso
The 1.4.2 branch can be split off three years from now from a commit five years ago, if we wanted to.
2017-04-01 09111, 2017
Sophist
Oh. Perhaps I don;t understand Git that well then.
