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 "DEV: Fix editable install on Windows" #1233

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Conversation

pllim
Copy link
Contributor

@pllim pllim commented Apr 6, 2022

Reverts #1218

@pllim pllim added the no-changelog-entry-needed changelog bot directive label Apr 6, 2022
@pllim pllim added this to the 2.5 milestone Apr 6, 2022
@github-actions github-actions bot added the documentation Explanation of code and concepts label Apr 6, 2022
@codecov
Copy link

codecov bot commented Apr 6, 2022

Codecov Report

Merging #1233 (d08a4ea) into main (5ea24d5) will increase coverage by 0.08%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #1233      +/-   ##
==========================================
+ Coverage   77.84%   77.93%   +0.08%     
==========================================
  Files          90       90              
  Lines        7205     7205              
==========================================
+ Hits         5609     5615       +6     
+ Misses       1596     1590       -6     
Impacted Files Coverage Δ
...configs/default/plugins/data_tools/file_chooser.py 69.14% <0.00%> (+3.42%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5ea24d5...d08a4ea. Read the comment docs.

@rosteen
Copy link
Collaborator

rosteen commented Apr 6, 2022

I can't seem to pull this down with the command line instructions, but...I think I trust you that this is just a reversion?

@pllim
Copy link
Contributor Author

pllim commented Apr 6, 2022

What do you mean can't pull it down?

Yes, I hit the GitHub "Revert" button.

@rosteen
Copy link
Collaborator

rosteen commented Apr 6, 2022

The instructions given in "Merging via command line" don't work:

git fetch origin
git checkout -b revert-1218-win-setup-dev origin/revert-1218-win-setup-dev
git merge main

I get fatal: 'origin/revert-1218-win-setup-dev' is not a commit and a branch 'revert-1218-win-setup-dev' cannot be created from it

@pllim
Copy link
Contributor Author

pllim commented Apr 6, 2022

origin points to your fork, right? You need upstream.

@rosteen
Copy link
Collaborator

rosteen commented Apr 6, 2022

Of course 🤦

@pllim
Copy link
Contributor Author

pllim commented Apr 6, 2022

I am a little sad but we can't anger Steve Job's ghost... Thanks for review!

@pllim pllim merged commit df79db5 into main Apr 6, 2022
@pllim pllim deleted the revert-1218-win-setup-dev branch April 6, 2022 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Explanation of code and concepts no-changelog-entry-needed changelog bot directive
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants