search

UMPsychMethodsCore / MethodsCore

All of the projects that the methods core develops, combined into one repository!
7 stars 0 forks source link

Update spm8 to R6313 #402

Closed saigerutherford closed 6 years ago

saigerutherford commented 6 years ago

First pull

rcwelsh commented 6 years ago

@mangstad @saigerutherford isn't this supposed to go into dev first?

saigerutherford commented 6 years ago

Probably, I was working with Bennet on an intro to the MethodsCore GitHub and he made these changes. Still need to meet with Mike about the organization/structure of this account.

mangstad commented 6 years ago

Robert is right. The current flow is to merge new things into dev first, it's laid out here: https://github.com/UMPsychMethodsCore/MethodsCore/wiki/Standards

Though at the moment dev has the testing but not fully released update to SPM12 in it, so updating a bunch of templates to a newer spm8 version will likely conflict.

@saigerutherford @justbennet I know we talked about this pull request the other day when you were meeting, but on reflection, we should probably just move forward with the push to SPM12. I'll have probably one more commit for that today or tomorrow and then we can look at doing a review and prep for that release.

justbennet commented 6 years ago

Should there be a final SPM8 branch for people who are sticking with it? Whatever that is called, it should probably use the updated SPM 8, yes? I think I'm reading things correctly, but didn't commit

https://github.com/UMPsychMethodsCore/MethodsCore/commit/3e01e3b3a026cccbad1d6bd061f61909dc904c72

from Oct, 2015, update things for the 6313 version of SPM? The template files did not get updated, except in one file, which was accepted as PR #398 this last April.

This would just finish the process so that SPM8 users are not using two different versions of SPM.

As Mike points out, the dev branch is for SPM12 and not for fixes to the current SPM8 supported 'production'/public branch. I think of this as a more a bug fix than a real change, but it's up to you guys.

mangstad commented 6 years ago

That's a good point, and we certainly could shoehorn this in as a bugfix.

Though at the same time, anyone wanting to stick with SPM8 is likely going to have to manually alter their templates anyway, unless they're forcefully keeping their installed repo pointed to an out of date branch, so I'm not sure how much this would accomplish there.

justbennet commented 6 years ago

I would just consider it a 'final wrap' on the SPM 8 version. Then it will get closed and be internally consistent when the SPM12 version is released.

How will the two be distinguished? Usually with software, this would be a major version number increment, but it doesn't look like any version numbering has been previously used.

Should SPM8 be retroactively called version 1.0, and the SPM12 version be called version 2.0? Or do you want to track the SPM version? and maybe patch level?

That would make things clearer for future work, perhaps?

I'm not such a great release/tag/version juggler with Git, so I will defer to you guys, if you're used to doing that elsewhere. Otherwise, I can consult with my local expert about how that usually goes.

On Mon, Oct 9, 2017 at 1:53 PM, Mike Angstadt notifications@github.com wrote:

That's a good point, and we certainly could shoehorn this in as a bugfix.

Though at the same time, anyone wanting to stick with SPM8 is likely going to have to manually alter their templates anyway, unless they're forcefully keeping their installed repo pointed to an out of date branch, so I'm not sure how much this would accomplish there.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/UMPsychMethodsCore/MethodsCore/pull/402#issuecomment-335234542, or mute the thread https://github.com/notifications/unsubscribe-auth/ABhYwluh8tUoiLsJKcZnmdS2gxk5iUWzks5sql20gaJpZM4Pw_X6 .

mangstad commented 6 years ago

There are version number tags on where each release has happened

justbennet commented 6 years ago

:dopeslap: Shoulda looked at the Releases/Tags tab.

Yeah, I see that now. So, the next release would be 3.0?

If the final switchover for SPM8 were put in that would be 2.1 and final.

On Mon, Oct 9, 2017 at 2:43 PM, Mike Angstadt notifications@github.com wrote:

There are version number tags on where each release has happened

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/UMPsychMethodsCore/MethodsCore/pull/402#issuecomment-335251582, or mute the thread https://github.com/notifications/unsubscribe-auth/ABhYwjyALeYL2Y2dr8WWL_hPEonna7FDks5sqmk5gaJpZM4Pw_X6 .