-
Notifications
You must be signed in to change notification settings - Fork 228
Use rogue instead of pygments.rb which is not Python 3 compatible #233
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| highlighter: pygments | ||
| highlighter: rouge | ||
| markdown: kramdown | ||
| kramdown: | ||
| entity_output: symbol | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -553,7 +553,7 @@ <h3>Review Process</h3> | |
| <a href="/contributing.html">Contributing to Spark</a>. | ||
| In particular, if you are working on an area of the codebase you are unfamiliar with, look at the | ||
| Git history for that code to see who reviewed patches before. You can do this using | ||
| <code>git log --format=full <filename></code>, by examining the “Commit” field to see who committed each patch.</p> | ||
| <code class="highlighter-rouge">git log --format=full <filename></code>, by examining the “Commit” field to see who committed each patch.</p> | ||
|
|
||
| <h3>How to Merge a Pull Request</h3> | ||
|
|
||
|
|
@@ -562,34 +562,34 @@ <h3>How to Merge a Pull Request</h3> | |
|
|
||
| <h4>Setting up Remotes</h4> | ||
|
|
||
| <p>To use the <code>merge_spark_pr.py</code> script described below, you | ||
| will need to add a git remote called <code>apache</code> at <code>https://github.com/apache/spark</code>, | ||
| as well as one called <code>apache-github</code> at <code>git://github.com/apache/spark</code>.</p> | ||
| <p>To use the <code class="highlighter-rouge">merge_spark_pr.py</code> script described below, you | ||
| will need to add a git remote called <code class="highlighter-rouge">apache</code> at <code class="highlighter-rouge">https://github.com/apache/spark</code>, | ||
| as well as one called <code class="highlighter-rouge">apache-github</code> at <code class="highlighter-rouge">git://github.com/apache/spark</code>.</p> | ||
|
|
||
| <p>You will likely also have a remote <code>origin</code> pointing to your fork of Spark, and | ||
| <code>upstream</code> pointing to the <code>apache/spark</code> GitHub repo.</p> | ||
| <p>You will likely also have a remote <code class="highlighter-rouge">origin</code> pointing to your fork of Spark, and | ||
| <code class="highlighter-rouge">upstream</code> pointing to the <code class="highlighter-rouge">apache/spark</code> GitHub repo.</p> | ||
|
|
||
| <p>If correct, your <code>git remote -v</code> should look like:</p> | ||
| <p>If correct, your <code class="highlighter-rouge">git remote -v</code> should look like:</p> | ||
|
|
||
| <pre><code>apache https://github.com/apache/spark.git (fetch) | ||
| <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>apache https://github.com/apache/spark.git (fetch) | ||
| apache https://github.com/apache/spark.git (push) | ||
| apache-github git://github.com/apache/spark (fetch) | ||
| apache-github git://github.com/apache/spark (push) | ||
| origin https://github.com/[your username]/spark.git (fetch) | ||
| origin https://github.com/[your username]/spark.git (push) | ||
| upstream https://github.com/apache/spark.git (fetch) | ||
| upstream https://github.com/apache/spark.git (push) | ||
| </code></pre> | ||
| </code></pre></div></div> | ||
|
|
||
| <p>For the <code>apache</code> repo, you will need to set up command-line authentication to GitHub. This may | ||
| <p>For the <code class="highlighter-rouge">apache</code> repo, you will need to set up command-line authentication to GitHub. This may | ||
| include setting up an SSH key and/or personal access token. See:</p> | ||
|
|
||
| <ul> | ||
| <li>https://help.github.com/articles/connecting-to-github-with-ssh/</li> | ||
| <li>https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/</li> | ||
| </ul> | ||
|
|
||
| <p>Ask <code>[email protected]</code> if you have trouble with these steps, or want help doing your first merge.</p> | ||
| <p>Ask <code class="highlighter-rouge">[email protected]</code> if you have trouble with these steps, or want help doing your first merge.</p> | ||
|
|
||
| <h4>Merge Script</h4> | ||
|
|
||
|
|
@@ -601,9 +601,9 @@ <h4>Merge Script</h4> | |
|
|
||
| <p>If you want to amend a commit before merging – which should be used for trivial touch-ups – | ||
| then simply let the script wait at the point where it asks you if you want to push to Apache. | ||
| Then, in a separate window, modify the code and push a commit. Run <code>git rebase -i HEAD~2</code> and | ||
| Then, in a separate window, modify the code and push a commit. Run <code class="highlighter-rouge">git rebase -i HEAD~2</code> and | ||
| “squash” your new commit. Edit the commit message just after to remove your commit message. | ||
| You can verify the result is one change with <code>git log</code>. Then resume the script in the other window.</p> | ||
| You can verify the result is one change with <code class="highlighter-rouge">git log</code>. Then resume the script in the other window.</p> | ||
|
|
||
| <p>Also, please remember to set Assignee on JIRAs where applicable when they are resolved. The script | ||
| can do this automatically in most cases. However where the contributor is not yet a part of the | ||
|
|
@@ -615,7 +615,7 @@ <h4>Merge Script</h4> | |
|
|
||
| <h3>Policy on Backporting Bug Fixes</h3> | ||
|
|
||
| <p>From <a href="https://www.mail-archive.com/[email protected]/msg10284.html"><code>pwendell</code></a>:</p> | ||
| <p>From <a href="https://www.mail-archive.com/[email protected]/msg10284.html"><code class="highlighter-rouge">pwendell</code></a>:</p> | ||
|
|
||
| <p>The trade off when backporting is you get to deliver the fix to people running older versions | ||
| (great!), but you risk introducing new or even worse bugs in maintenance releases (bad!). | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -208,7 +208,7 @@ <h3>Have Questions?</h3> | |
| <h4>StackOverflow</h4> | ||
|
|
||
| <p>For usage questions and help (e.g. how to use this Spark API), it is recommended you use the | ||
| StackOverflow tag <a href="https://stackoverflow.com/questions/tagged/apache-spark"><code>apache-spark</code></a> | ||
| StackOverflow tag <a href="https://stackoverflow.com/questions/tagged/apache-spark"><code class="highlighter-rouge">apache-spark</code></a> | ||
| as it is an active forum for Spark users’ questions and answers.</p> | ||
|
|
||
| <p>Some quick tips when using StackOverflow:</p> | ||
|
|
@@ -217,17 +217,17 @@ <h4>StackOverflow</h4> | |
| <li>Prior to asking submitting questions, please: | ||
| <ul> | ||
| <li>Search StackOverflow’s | ||
| <a href="https://stackoverflow.com/questions/tagged/apache-spark"><code>apache-spark</code></a> tag to see if | ||
| <a href="https://stackoverflow.com/questions/tagged/apache-spark"><code class="highlighter-rouge">apache-spark</code></a> tag to see if | ||
| your question has already been answered</li> | ||
| <li>Search the nabble archive for | ||
| <a href="http://apache-spark-user-list.1001560.n3.nabble.com/">[email protected]</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>Please follow the StackOverflow <a href="https://stackoverflow.com/help/how-to-ask">code of conduct</a></li> | ||
| <li>Always use the <code>apache-spark</code> tag when asking questions</li> | ||
| <li>Always use the <code class="highlighter-rouge">apache-spark</code> tag when asking questions</li> | ||
| <li>Please also use a secondary tag to specify components so subject matter experts can more easily find them. | ||
| Examples include: <code>pyspark</code>, <code>spark-dataframe</code>, <code>spark-streaming</code>, <code>spark-r</code>, <code>spark-mllib</code>, | ||
| <code>spark-ml</code>, <code>spark-graphx</code>, <code>spark-graphframes</code>, <code>spark-tensorframes</code>, etc.</li> | ||
| Examples include: <code class="highlighter-rouge">pyspark</code>, <code class="highlighter-rouge">spark-dataframe</code>, <code class="highlighter-rouge">spark-streaming</code>, <code class="highlighter-rouge">spark-r</code>, <code class="highlighter-rouge">spark-mllib</code>, | ||
| <code class="highlighter-rouge">spark-ml</code>, <code class="highlighter-rouge">spark-graphx</code>, <code class="highlighter-rouge">spark-graphframes</code>, <code class="highlighter-rouge">spark-tensorframes</code>, etc.</li> | ||
| <li>Please do not cross-post between StackOverflow and the mailing lists</li> | ||
| <li>No jobs, sales, or solicitation is permitted on StackOverflow</li> | ||
| </ul> | ||
|
|
@@ -258,14 +258,14 @@ <h4>Mailing Lists</h4> | |
| <ul> | ||
| <li>Prior to asking submitting questions, please: | ||
| <ul> | ||
| <li>Search StackOverflow at <a href="https://stackoverflow.com/questions/tagged/apache-spark"><code>apache-spark</code></a> | ||
| <li>Search StackOverflow at <a href="https://stackoverflow.com/questions/tagged/apache-spark"><code class="highlighter-rouge">apache-spark</code></a> | ||
| to see if your question has already been answered</li> | ||
| <li>Search the nabble archive for | ||
| <a href="http://apache-spark-user-list.1001560.n3.nabble.com/">[email protected]</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>Tagging the subject line of your email will help you get a faster response, e.g. | ||
| <code>[Spark SQL]: Does Spark SQL support LEFT SEMI JOIN?</code></li> | ||
| <code class="highlighter-rouge">[Spark SQL]: Does Spark SQL support LEFT SEMI JOIN?</code></li> | ||
| <li>Tags may help identify a topic by: | ||
| <ul> | ||
| <li>Component: Spark Core, Spark SQL, ML, MLlib, GraphFrames, GraphX, TensorFrames, etc</li> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, it's rouge rather than rogue. Others are fixing it in the Docker image. I'll fix this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Argh ..