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 to v1.x #5937

Merged
merged 2 commits into from Nov 29, 2017

Conversation

Projects
None yet
5 participants
@parkr
Member

parkr commented Mar 7, 2017

This updates Pygments and our related tests to support Pygments.rb 1.x.

This is required to ship #5687.

/cc @jekyll/build @ashmaroli

@parkr parkr requested review from pathawks and ayastreb Mar 7, 2017

@ashmaroli

This comment has been minimized.

Show comment
Hide comment
@ashmaroli

ashmaroli Mar 7, 2017

Member
  • Windows is incompatible with pygments.rb 1.0 - 1.1.1 because of symlinks, and the pygments team do not seem to be keen on extending support to Windows.
  • Ruby on Windows is still at 2.3.3. Mentioning it here, as the changes proposed here was initiated by a proposal to use Ruby 2.4.0.

--
Edit: Oh wait!, AppVeyor only fails for Ruby versions <= 2.2 😇

Member

ashmaroli commented Mar 7, 2017

  • Windows is incompatible with pygments.rb 1.0 - 1.1.1 because of symlinks, and the pygments team do not seem to be keen on extending support to Windows.
  • Ruby on Windows is still at 2.3.3. Mentioning it here, as the changes proposed here was initiated by a proposal to use Ruby 2.4.0.

--
Edit: Oh wait!, AppVeyor only fails for Ruby versions <= 2.2 😇

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 7, 2017

Member
Member

parkr commented Mar 7, 2017

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Mar 31, 2017

Member

To avoid the Windows issue with pygments.rb's upgrade to Pygments 2.2, I'm going to close this.

Member

parkr commented Mar 31, 2017

To avoid the Windows issue with pygments.rb's upgrade to Pygments 2.2, I'm going to close this.

@parkr parkr closed this Mar 31, 2017

@parkr parkr deleted the pygments-upgrade branch Mar 31, 2017

@ashmaroli

This comment has been minimized.

Show comment
Hide comment
@ashmaroli

ashmaroli Mar 31, 2017

Member

TODO: Reconsider when Jekyll drops support for Ruby v2.2 and below.

Member

ashmaroli commented Mar 31, 2017

TODO: Reconsider when Jekyll drops support for Ruby v2.2 and below.

@ashmaroli ashmaroli restored the pygments-upgrade branch Nov 29, 2017

@ashmaroli ashmaroli reopened this Nov 29, 2017

@ashmaroli

This comment has been minimized.

Show comment
Hide comment
@ashmaroli

ashmaroli Nov 29, 2017

Member

@parkr Apparently the folks at pygments.rb removed the use of symlinks.
Which means this can be merged.. 🎉

/cc @pup @DirtyF

Member

ashmaroli commented Nov 29, 2017

@parkr Apparently the folks at pygments.rb removed the use of symlinks.
Which means this can be merged.. 🎉

/cc @pup @DirtyF

assert_equal \
"<div class=\"highlight\"><pre><code class=\"language-ruby\" " \
"data-lang=\"ruby\"><span></span><span class=\"nb\">puts</span> <span " \
"class=\"s2\">&quot;Hello world&quot;</span>\n</code></pre></div>",

This comment has been minimized.

@ashmaroli

ashmaroli Nov 29, 2017

Member

We can ideally avoid escaping the double-quote here by using %{} like in test_tags.rb..
But on further inspection, there are multiple such instances.. best handled in a separate PR.. 👍

@ashmaroli

ashmaroli Nov 29, 2017

Member

We can ideally avoid escaping the double-quote here by using %{} like in test_tags.rb..
But on further inspection, there are multiple such instances.. best handled in a separate PR.. 👍

This comment has been minimized.

@parkr

parkr Nov 29, 2017

Member

Feel free to take over this PR and commit directly to this branch.

@parkr

parkr Nov 29, 2017

Member

Feel free to take over this PR and commit directly to this branch.

@ashmaroli ashmaroli referenced this pull request Nov 29, 2017

Merged

Bump yajl-ruby #6582

@DirtyF

DirtyF approved these changes Nov 29, 2017

@DirtyF

This comment has been minimized.

Show comment
Hide comment
@DirtyF

DirtyF Nov 29, 2017

Member

Thanks @parkr ❤️

Let's avoid exposing our users to potential critical flaws.
@jekyllbot: merge +dev

Member

DirtyF commented Nov 29, 2017

Thanks @parkr ❤️

Let's avoid exposing our users to potential critical flaws.
@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit c14b8b5 into master Nov 29, 2017

3 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot deleted the pygments-upgrade branch Nov 29, 2017

DirtyF added a commit that referenced this pull request Dec 7, 2017

Upgrade pygments to v1.x (#5937)
Merge pull request 5937

DirtyF added a commit that referenced this pull request Dec 7, 2017

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