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

Revert accidental change merged with PR #3433 #3453

Merged
merged 1 commit into from
Sep 14, 2020

Conversation

david-waterworth
Copy link
Contributor

@david-waterworth david-waterworth commented Sep 10, 2020

What does this PR do?

As requested by @Borda PR #3433 included an accidental change of docs/source/introduction_guide.rst line 300 .. testcode:: was changed to .. code-block:: python. This PR reverts this change.

.. testcode::
.. code-block:: python

Fixes: #3406

@mergify mergify bot requested a review from a team September 10, 2020 23:15
@Borda Borda changed the title Fix #3406 simple docs example tests Sep 10, 2020
@Borda Borda added bug Something isn't working docs Documentation related labels Sep 10, 2020
@awaelchli
Copy link
Contributor

Rolls back accidentally change from testcode:: to code-block:: python in #3433

could you update the description? This PR seems to be about something else, I don't know what. A better title might also help :)

@david-waterworth
Copy link
Contributor Author

Apologies not sure how that happened - looks like GitHub auto-filled the title from an old PR I submitted and I forgot to amend it. I've updated the description.

@david-waterworth david-waterworth changed the title simple docs example tests Revert accidental change merged from PR #3433 Sep 11, 2020
@david-waterworth david-waterworth changed the title Revert accidental change merged from PR #3433 Revert accidental change merged with PR #3433 Sep 11, 2020
@awaelchli
Copy link
Contributor

@david-waterworth I don't see any reverted changes. As per your description, you need to change the code block directive to .. testcode, correct?

@david-waterworth
Copy link
Contributor Author

Yes I guess something got messed up when I created the pull request. I'll fix it tomorrow

@david-waterworth
Copy link
Contributor Author

david-waterworth commented Sep 13, 2020

@awaelchli it looks ok to me - if you click on commits then the final (3rd one) line 300 is back to .. testcode::, but for some reason files changed isn't showing the correct diff.

I think this is because the original PR for this branch has been merged. I modified my branch with commit #3 and created this PR. So the files change diff is from before the 3 commits even though 2 have been merged?

Edit: Also if you look at the top of the page is says "david-waterworth wants to merge 3 commits into PyTorchLightning:master from david-waterworth:Fix-#3406"

@rohitgr7
Copy link
Contributor

@david-alexander-white rebased with master. It's good now.

@codecov
Copy link

codecov bot commented Sep 13, 2020

Codecov Report

Merging #3453 into master will increase coverage by 5%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master   #3453    +/-   ##
=======================================
+ Coverage      86%     90%    +5%     
=======================================
  Files         107     107            
  Lines        8063    8063            
=======================================
+ Hits         6896    7284   +388     
+ Misses       1167     779   -388     

@mergify mergify bot requested a review from a team September 13, 2020 06:22
@mergify mergify bot requested a review from a team September 13, 2020 09:32
@SkafteNicki SkafteNicki added the ready PRs ready to be merged label Sep 14, 2020
@williamFalcon williamFalcon merged commit 50b8388 into Lightning-AI:master Sep 14, 2020
@Borda Borda added this to the 0.9.x milestone Sep 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working docs Documentation related ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Models defined by data
6 participants