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

[MRG] Fix handling of memory limit command line argument #652

Merged
merged 3 commits into from Apr 30, 2019

Conversation

@betatim
Copy link
Member

betatim commented Apr 27, 2019

If a string of only numerals is passed as argument we assume it should
be converted to an integer and specifies a size in bytes.

When BinderHub constructs the repo2docker command-line it passes a value in bytes without a suffix. This is with a value of "3G" set in the values.yaml.

I think this will allow us to try out jupyterhub/mybinder.org-deploy#954

If a string of only numerals is passed as argument we assume it should
be converted to an integer and specifies a size in bytes.
@betatim betatim referenced this pull request Apr 30, 2019
5 of 5 tasks complete
@@ -299,7 +299,12 @@ def make_r2d(argv=None):
r2d.user_name = args.user_name

if args.build_memory_limit:
r2d.build_memory_limit = args.build_memory_limit
# if the string only contains numerals we assume it should be an int
# and specifies a size inn bytes

This comment has been minimized.

Copy link
@yuvipanda

yuvipanda Apr 30, 2019

Collaborator
Suggested change
# and specifies a size inn bytes
# and specifies a size in bytes
@yuvipanda

This comment has been minimized.

Copy link
Collaborator

yuvipanda commented Apr 30, 2019

I added a unit test to make codecov happy.

@betatim betatim merged commit 92d6901 into jupyter:master Apr 30, 2019
5 checks passed
5 checks passed
ci/circleci: build_docs Your tests passed on CircleCI!
Details
ci/dockercloud Your tests passed in Docker Cloud
Details
codecov/patch 100% of diff hit (target 20%)
Details
codecov/project 90.9% (+0.18%) compared to bc9554e
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@betatim betatim deleted the betatim:fix-memory-limit branch Apr 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.