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.

Sign up for GitHub

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

Jump to bottom

Fix use of non-EDM environment as a bootstrap environment on Windows. #512

Merged
merged 9 commits into from
Aug 27, 2019
Merged

Fix use of non-EDM environment as a bootstrap environment on Windows. #512

merged 9 commits into from
Aug 27, 2019

Conversation

mdickinson
Copy link
Member

Currently it's not possible to use etstool.py in a non-EDM environment on Windows, because it fails to find the EDM executable. This PR is an attempt to fix that issue.

mdickinson
mdickinson commented Aug 21, 2019
View reviewed changes
etstool.py Outdated Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented Aug 21, 2019 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@6586600). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #512   +/-   ##
=========================================
  Coverage          ?   65.33%           
=========================================
  Files             ?       44           
  Lines             ?     7058           
  Branches          ?     1415           
=========================================
  Hits              ?     4611           
  Misses            ?     2024           
  Partials          ?      423

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 6586600...112426a. Read the comment docs.

mdickinson
mdickinson commented Aug 21, 2019
View reviewed changes
etstool.py Show resolved Hide resolved
@mdickinson
Copy link
Member Author

I keep finding more things in etstool.py that I want to change; rather than piling them all on this PR, I'll make a separate one and keep this one clean.

I've reverted the handful of unrelated changes that were already in this PR, leaving it focused on the EDM command handling.

@mdickinson
Copy link
Member Author

Tested manually, and working for me on Windows, both from a non-EDM bootstrap environment and an EDM bootstrap environment.

@mdickinson
Copy link
Member Author

Merged master and resolved conflicts. Merging when CI completes.

@mdickinson mdickinson merged commit 026539c into master Aug 27, 2019
@mdickinson mdickinson deleted the ci/non-edm-as-bootstrap branch August 27, 2019 14:04
rahulporuri pushed a commit to enthought/envisage that referenced this pull request Sep 13, 2019
Update etstool to work with non-edm bootstrap env
eef42a3 
the changes are borrowed from
enthought/traits#512

	modified:   etstool.py
@rahulporuri rahulporuri mentioned this pull request Sep 13, 2019
Merged
mdickinson pushed a commit to enthought/envisage that referenced this pull request Sep 13, 2019
@mdickinson
Update etstool to work with non-edm bootstrap env on win (#203)
679acfc 
* Update etstool to work with non-edm bootstrap env

the changes are borrowed from
enthought/traits#512

	modified:   etstool.py

* FIX : dont use params before its defined!

and explicitly pass runtime and toolkit to the env name if its
not defined

	modified:   etstool.py
This was referenced Nov 25, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mdickinson @codecov-io