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

fix mac installation issues #11

Merged
merged 5 commits into from
Aug 14, 2013
Merged

Conversation

kmike
Copy link
Member

@kmike kmike commented Aug 12, 2013

  • add pyOpenSSL to requirements;
  • use psutil for get_num_fds;
  • handle cases when RLIMIT_NOFILE can't be increased to hard maximum

This PR adds psutil to requirements. What do you think about using it instead of stdlib's resources module for other things as well?

* add pyOpenSSL to requirements;
* use psutil for get_num_fds;
* handle cases when RLIMIT_NOFILE can't be increased to hard maximum
@pablohoffman
Copy link
Contributor

Thanks for the contribution @kmike.

I was reluctant at first to add external dependencies, so I went with reading /proc/ instead of adding psutil dependency, but I'm in favor of adding dependencies if it means more portability, and as long as it's done in a controlled way.

@pablohoffman
Copy link
Contributor

I would also move pyOpenSSL to the test requirements section in requirements.txt

It used to work on OS X 10.7, but in 10.8 splash requires
more time to start and this makes all tests fail.
@kmike
Copy link
Member Author

kmike commented Aug 14, 2013

@pablohoffman could you please review this? I fixed pyOpenSSL as you suggested; also, there was an another hair-pulling OS X installation issue that is sort-of fixed now (at least tests work reliably for me).

@kmike kmike mentioned this pull request Aug 14, 2013
3 tasks
pablohoffman added a commit that referenced this pull request Aug 14, 2013
@pablohoffman pablohoffman merged commit 4e46266 into scrapinghub:master Aug 14, 2013
@kmike kmike deleted the mac-installation branch July 10, 2014 22:29
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.

2 participants