0.8.0-rc.7
This commit is contained in:
parent
d08e7f289c
commit
6c0cef0f08
3 changed files with 3 additions and 23 deletions
22
fabfile.py
vendored
22
fabfile.py
vendored
|
@ -138,27 +138,7 @@ def update(action='check'):
|
||||||
updating requirements. Anything else other than ``'check'`` will avoid
|
updating requirements. Anything else other than ``'check'`` will avoid
|
||||||
updating requirements at all.
|
updating requirements at all.
|
||||||
"""
|
"""
|
||||||
with cd(env.project_dir):
|
run_as_umap('pip install git+https://github.com/umap-project/umap')
|
||||||
remote, dest_branch = env.remote_ref.split('/', 1)
|
|
||||||
run_as_umap('git fetch {remote}'.format(remote=remote))
|
|
||||||
with hide('running', 'stdout'):
|
|
||||||
changed_files = run('git diff-index --cached --name-only '
|
|
||||||
'{remote_ref}'.format(**env)).splitlines()
|
|
||||||
if not changed_files and action != 'force':
|
|
||||||
# No changes, we can exit now.
|
|
||||||
return
|
|
||||||
if action == 'check':
|
|
||||||
reqs_changed = env.requirements_file in changed_files
|
|
||||||
else:
|
|
||||||
reqs_changed = False
|
|
||||||
run_as_umap('git merge {remote_ref}'.format(**env))
|
|
||||||
run_as_umap('find -name "*.pyc" -delete')
|
|
||||||
if action == "clean":
|
|
||||||
run_as_umap('git clean -df')
|
|
||||||
if action == 'force' or reqs_changed:
|
|
||||||
# Not using execute() because we don't want to run multiple times for
|
|
||||||
# each role (since this task gets run per role).
|
|
||||||
requirements()
|
|
||||||
|
|
||||||
|
|
||||||
@task
|
@task
|
||||||
|
|
|
@ -4,4 +4,4 @@ Pillow==3.3.1
|
||||||
psycopg2==2.6.2
|
psycopg2==2.6.2
|
||||||
python-social-auth==0.2.21
|
python-social-auth==0.2.21
|
||||||
requests==2.11.1
|
requests==2.11.1
|
||||||
django-leaflet-storage==0.8.0rc6
|
django-leaflet-storage==0.8.0rc7
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
"Create maps with OpenStreetMap layers in a minute and embed them in your site."
|
"Create maps with OpenStreetMap layers in a minute and embed them in your site."
|
||||||
VERSION = (0, 8, 0, 'rc', 6)
|
VERSION = (0, 8, 0, 'rc', 7)
|
||||||
|
|
||||||
__author__ = 'Yohan Boniface'
|
__author__ = 'Yohan Boniface'
|
||||||
__contact__ = "ybon@openstreetmap.fr"
|
__contact__ = "ybon@openstreetmap.fr"
|
||||||
|
|
Loading…
Reference in a new issue