diff --git a/Makefile b/Makefile index 01dc59d..5388540 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,15 @@ testall: $(addprefix test-,$(PYVERSIONS)) test-%: build-% docker run --rm -w /usr/src/app/ --entrypoint=/usr/local/bin/python -ti '$(REPO)/$(NAME):$(VERSION)-python$*' setup.py test --addopts "-vvv -s --pdb" ; -pip_test-%: - docker run --rm -ti python:$* pip install senpy ; +dist/$(NAME)-$(VERSION).tar.gz: + docker run --rm -ti -v $$PWD:/usr/src/app/ -w /usr/src/app/ python:$(PYMAIN) python setup.py sdist; + +sdist: dist/$(NAME)-$(VERSION).tar.gz + +pip_test-%: sdist + docker run --rm -v $$PWD/dist:/dist/ -ti python:$* pip install /dist/$(NAME)-$(VERSION).tar.gz ; + +pip_test: $(addprefix pip_test-,$(PYVERSIONS)) upload-%: test-% docker push '$(REPO)/$(NAME):$(VERSION)-python$(PYMAIN)' diff --git a/senpy/models.py b/senpy/models.py index ecbc09d..457b881 100644 --- a/senpy/models.py +++ b/senpy/models.py @@ -32,7 +32,9 @@ def get_schema_path(schema_file, absolute=False): def read_schema(schema_file, absolute=False): schema_path = get_schema_path(schema_file, absolute) schema_uri = 'file://{}'.format(schema_path) - return jsonref.load(open(schema_path), base_uri=schema_uri) + with open(schema_path) as f: + return jsonref.load(f, base_uri=schema_uri) + base_schema = read_schema(DEFINITIONS_FILE)