Skip to content

Fixed wrong version in setup.py for release tag 1.3 - #30

Open
vjancik wants to merge 2 commits into
alexz-enwp:masterfrom
vjancik:master
Open

Fixed wrong version in setup.py for release tag 1.3#30
vjancik wants to merge 2 commits into
alexz-enwp:masterfrom
vjancik:master

Conversation

@vjancik

@vjancik vjancik commented Jul 21, 2015

Copy link
Copy Markdown

No description provided.

@mzmcbride

Copy link
Copy Markdown
Collaborator

This pull request is confusing me.

It looks like this pull request was created on July 21, 2015 and has two associated commits.

One of the pull request's commits, a18b321, is dated July 21, 2015.

The other, 8e203e7, is dated June 6, 2015. This commit has a subject line of "Fixed wrong version in setup.py for release tag 1.3" and is changing the version number from 1.3 to 1.4. I'm not sure whether this was intentional.

Meanwhile, 72a00c9 from June 6, 2015 already landed in master. This commit similarly has a subject line of "1.3 released" but is actually changing the version strings to 1.4.

I'm lost. What should happen with this pull request? Should it be merged or closed at this point?

Maybe wikitools 1.3 will end up being like PHP 6 or Windows 9? :-)

@vjancik

vjancik commented Jun 5, 2016

Copy link
Copy Markdown
Author

Close. The issue was that the commit marked as release 1.3 had version 1.2.
Only fix for this would be to modify the history (e.g. rebase these commits into the history) and make a new release commit pointer, that points to the fixed commit with version 1.3.
And the reason we needed this (we fixed it locally with a patch) was that we were pointing to your release 1.3 in a Fedora Package (git source), but there was an installation (or something else, don't remember) issue, which required the correct version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants