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

Upgrade pygments.rb from 0.6.1 to 0.6.3 #145

Merged
merged 1 commit into from
Jun 10, 2015
Merged

Upgrade pygments.rb from 0.6.1 to 0.6.3 #145

merged 1 commit into from
Jun 10, 2015

Conversation

parkr
Copy link
Contributor

@parkr parkr commented Jun 8, 2015

Not entirely sure what's happened since 0.6.1 since 0.6.1 doesn't have a tag and there are no release notes in the changelog or in the GitHub Releases. If we base it off of the commit where v0.6.0 is created (I usually do this last when working on a gem release, not sure if tmm1 is the same), then we have:

pygments/pygments.rb@f6dceb2...v0.6.3

Appears to:

  1. bump yajl-ruby from ~> 1.1.0 to ~> 1.2.0
  2. Force MENTOS_TIMEOUT env var to be an Integer to determine timeout for subprocess
  3. Reads lexer file as rb instead of r
  4. Fixes discovery of py executable for Windows

Fixes #144

/cc @benbalter

@parkr
Copy link
Contributor Author

parkr commented Jun 9, 2015

/cc @benbalter @gjtorikian

@gjtorikian
Copy link
Contributor

Seems like a fix that'll be useful for Windows Pages users, if I'm reading it correctly. Otherwise they won't be able to use Pygments?

@parkr
Copy link
Contributor Author

parkr commented Jun 9, 2015

Seems like a fix that'll be useful for Windows Pages users, if I'm reading it correctly. Otherwise they won't be able to use Pygments?

Correctimundo!

@gjtorikian
Copy link
Contributor

/cc @github/appsec

Here's the diff in yajl-json: brianmario/yajl-ruby@1.1.0...1.2.0

Perhaps @brianmario or @tmm1 could also comment on the changes in the release. Overall this seems like a huge win for Windows users.

Because of the numerous yajl-json changes I don't feel comfortable releasing this without a 👍 from security. The pygments.rb changes themselves seem fine.

@parkr
Copy link
Contributor Author

parkr commented Jun 10, 2015

Thanks for handling this, @gjtorikian!

@btoews
Copy link

btoews commented Jun 10, 2015

👍

gjtorikian added a commit that referenced this pull request Jun 10, 2015
Upgrade pygments.rb from 0.6.1 to 0.6.3
@gjtorikian gjtorikian merged commit f6d05e0 into github:master Jun 10, 2015
@gjtorikian gjtorikian mentioned this pull request Jun 10, 2015
@parkr parkr deleted the patch-1 branch June 10, 2015 20:56
@parkr
Copy link
Contributor Author

parkr commented Jun 10, 2015

YAY! 🙌

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.

None yet

3 participants