balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 08:12:27 +00:00
Code Issues Releases Wiki Activity

Better makefile

Browse Source
This commit is contained in:
J. Fernando Sánchez 2016-12-14 14:38:58 +01:00
parent 2e7530d9bc
commit 4dee623ef9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -26,8 +26,15 @@ testall: $(addprefix test-,$(PYVERSIONS))
test-%: build-% 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" ; 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-%: dist/$(NAME)-$(VERSION).tar.gz:
docker run --rm -ti python:$* pip install senpy ; 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-% upload-%: test-%
docker push '$(REPO)/$(NAME):$(VERSION)-python$(PYMAIN)' docker push '$(REPO)/$(NAME):$(VERSION)-python$(PYMAIN)'

4
senpy/models.py
View File

@ -32,7 +32,9 @@ def get_schema_path(schema_file, absolute=False):
def read_schema(schema_file, absolute=False): def read_schema(schema_file, absolute=False):
schema_path = get_schema_path(schema_file, absolute) schema_path = get_schema_path(schema_file, absolute)
schema_uri = 'file://{}'.format(schema_path) 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) base_schema = read_schema(DEFINITIONS_FILE)