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.

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

Final tweaks before 0.3.3 tagging #9120

Merged
merged 5 commits into from
Nov 23, 2014
Merged

Final tweaks before 0.3.3 tagging #9120

merged 5 commits into from
Nov 23, 2014

Conversation

staticfloat
Copy link
Sponsor Member

Merges #7590, and fixes a few doc warnings from make release-candidate.

The only controversial thing here is the change of the unicode article link to an archive.org link. What do you guys think of that? Pinging @jiahao and @StefanKarpinski because you guys always have an opinion on stuff like this.

tkelman and others added 5 commits November 23, 2014 00:30
currently only integer modes, can do string modes like +x later
fixes #7574

Conflicts:
	src/jl_uv.c
Without this fix, the following warning appears:

```
Warning, treated as error:
/Users/vagrant/src/julia-0.3/doc/stdlib/base.rst:5388: WARNING: Inline literal start-string without end-string.
```
@ivarne
Copy link
Sponsor Member

ivarne commented Nov 23, 2014

Looks good to me, but @tkelman probably have more input on the Windows issues.

@staticfloat
Copy link
Sponsor Member Author

This branch builds and passes all tests on Ubuntu 14.04-x64, Ubuntu 12.04-x86, Windows 8.1-x64, and OSX 10.10 (always x64). I'm currently running a paranoid test on Windows 8.1-x86, but I expect I will not be surprised. Additionally, all doctests and such pass, (as long as the exception paths in string.rst are changed, of course. We really need to do something about those guys.) so I think we're in pretty good shape

@StefanKarpinski
Copy link
Sponsor Member

This is great – thanks, @staticfloat.

@tkelman
Copy link
Contributor

tkelman commented Nov 23, 2014

If others are okay with backporting a new function, then alright. Oh, and for future backports it helps to use git cherry-pick -x to get the cross-reference sha link in the log.

Once this passes tests for me on a local build I'll click merge on it and we'll be good to tag if everything else on the checklist is okay. Running the git and pkg tests is time-consuming in a windows build as it requires make dist and using the installer to get the bundled git in the correct place.

@ivarne
Copy link
Sponsor Member

ivarne commented Nov 23, 2014

I have

[alias]
    cp = cherry-pick -e -x

in my ~/.gitconfig so that I get the automatic sha reference and the opportunity edit the commit message to link the original PR and avoid @ pinging users.

@StefanKarpinski
Copy link
Sponsor Member

That -x flag is a nice pro tip.

@jiahao
Copy link
Member

jiahao commented Nov 23, 2014

Updating the URL is fine.

@wlbksy
Copy link
Contributor

wlbksy commented Nov 23, 2014

the old url address is not deleted?

@ViralBShah
Copy link
Member

Would love to get #9126 into 0.3.3.

ivarne added a commit that referenced this pull request Nov 23, 2014
Final tweaks before 0.3.3 tagging
@ivarne ivarne merged commit e596df2 into release-0.3 Nov 23, 2014
@staticfloat
Copy link
Sponsor Member Author

@wlbksy It looks like that, but the archive.org link format includes the original URL in its URL.

@tkelman
Copy link
Contributor

tkelman commented Nov 23, 2014

@ivarne merged before my tests were finished running (I need some better hardware), but I'm satisfied. We can tag either now or after updating NEWS.md. The repl test is freezing on XP, but I don't think that's new - IIRC the fix for #7082 in libuv only works for Vista-and-newer.

@staticfloat staticfloat deleted the sf/0.3.3-testing branch January 27, 2015 20:18
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.

7 participants