Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
senpy
senpy
Commits
4dee623e
Commit
4dee623e
authored
Dec 14, 2016
by
J. Fernando Sánchez
Browse files
Better makefile
parent
2e7530d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
4dee623e
...
...
@@ -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)
'
...
...
senpy/models.py
View file @
4dee623e
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment