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

Pr 280 support windows #282

Merged
merged 27 commits into from
Jul 6, 2015
Merged

Pr 280 support windows #282

merged 27 commits into from
Jul 6, 2015

Conversation

pv
Copy link
Collaborator

@pv pv commented Jun 27, 2015

Rebased #280 plus some additional fixes for Windows.
New PR so that Appveyor tests run.

mdboom and others added 4 commits June 27, 2015 17:03
Based on Robert McGibbon's patch
Based on Robert McGibbon's patch
Based on Robert McGibbon's patch
@pv pv mentioned this pull request Jun 27, 2015
@pv pv force-pushed the pr-280-windows branch 6 times, most recently from a38d41a to 5fbbc81 Compare June 28, 2015 16:26
It appears the Python DLLs in created (Conda) environments stay in use
when run on Windows/Appveyor, so that removing the environments fails
and their re-creation cannot be tested.  Does not occur on all Windows
platoforms, however, and adding sleeps does not seem to resolve it.
@pv
Copy link
Collaborator Author

pv commented Jun 28, 2015

Tests pass currently; discussion on the one additional xfail is in #280 (comment)

return exe
exe = os.path.join(self._path, executable)
if os.path.isfile(exe):
return exe
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe move this to util or a base class, since it's repeated in virtualenv.py?

@pv
Copy link
Collaborator Author

pv commented Jun 28, 2015

Ok, refactored a bit.

@pv
Copy link
Collaborator Author

pv commented Jul 5, 2015

Ok to merge?

raise

self.save_info_file(self._path)

self._is_setup = True

def _setup(self):
def setup(self):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the change to public? The original intention here was that this should only be called from create...

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, reverted setup back to _setup.

@mdboom
Copy link
Collaborator

mdboom commented Jul 6, 2015

Great to see this working on Windows!

Other than my few minor comments, I think this is ready to merge. Thanks for this!

# This loop cannot use xrange, because xrange on Python2 on
# 32-bit systems can only deal with 32-bit integers, and
# Javascript timestamps (1000*unix_timestamp) handled here
# overflow this range
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. The comment addresses this nicely.

mdboom added a commit that referenced this pull request Jul 6, 2015
@mdboom mdboom merged commit ad2c7ff into airspeed-velocity:master Jul 6, 2015
@pv pv deleted the pr-280-windows branch August 19, 2018 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants