Merge remote-tracking branch 'origin/fix_req' into fix_req

# Conflicts:
#	requirements.txt
feature/fix_generate_pass
Andrey 8 years ago
parent 48fec74b8d
commit a808a9f9ba
  1. 4
      Envoy.blade.php

@ -40,7 +40,7 @@ echo '>> Создание симлинков'
echo '>> Подтягиваем зависимости'
@if ($branch)
cd {{ $new_release_dir }}
source /www/servers/python-server/bin/activate && pip install -r requirements.txt
source /env/bin/activate && pip install -r requirements.txt
@endif
@endtask
@ -48,7 +48,7 @@ echo '>> Подтягиваем зависимости'
echo '>> Запускаем миграции тесты'
@if ($branch)
cd {{ $new_release_dir }}
source /www/servers/python-server/bin/activate && python manage.py migrate && python manage.py test
source /env/bin/activate && python manage.py migrate && python manage.py test
@endif
@endtask

Loading…
Cancel
Save