diff --git a/Makefile b/Makefile index 665a81b..180df2d 100644 --- a/Makefile +++ b/Makefile @@ -40,14 +40,14 @@ test: dev: ( \ - pip install -U pip pip-tools; \ + pip install -U pip==18.1 pip-tools; \ pip-sync requirements/dev.txt; \ ) # to pass optional parameters use as: make pip p='-P requests' pip: ( \ - pip install -U pip pip-tools; \ + pip install -U pip==18.1 pip-tools; \ pip-compile $(p) --output-file requirements/common.txt requirements/common.ini; \ pip-compile $(p) --output-file requirements/dev.txt requirements/dev.ini; \ pip-compile $(p) --output-file requirements/prod.txt requirements/prod.ini; \ diff --git a/README.md b/README.md index cf0e8f6..57a3a38 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ To use this template you need the latest Django and Invoke version installed. To start a new project with this template: ```shell -({{project_name}}) $ django-admin.py startproject --template https://github.com/20tab/django-uwsgi-template/zipball/master -e cfg,ini,md,py,yaml,template -n Makefile {{project_name}} +({{project_name}}) $ django-admin.py startproject --template https://www.20tab.com/template/ -e cfg,ini,md,py,yaml,template -n Makefile {{project_name}} ``` ## Configuration @@ -78,8 +78,8 @@ To start a new project with this template: To execute only if you want reset all data: ```shell -({{project_name}}) $ inv drop_db -({{project_name}}) $ inv create_db +({{project_name}}) $ inv dropdb +({{project_name}}) $ inv createdb ({{project_name}}) $ python manage.py migrate ``` diff --git a/requirements/common.ini b/requirements/common.ini index 3505264..0682809 100644 --- a/requirements/common.ini +++ b/requirements/common.ini @@ -1,4 +1,4 @@ # pip-compile --output-file common.txt common.ini django==2.1.5 pillow==5.4.1 # via django -psycopg2==2.7.6.1 # http://initd.org/psycopg/docs/install.html#binary-install-from-pypi +psycopg2==2.7.7 # http://initd.org/psycopg/docs/install.html#binary-install-from-pypi diff --git a/requirements/dev.ini b/requirements/dev.ini index cb170f3..fb71609 100644 --- a/requirements/dev.ini +++ b/requirements/dev.ini @@ -1,7 +1,7 @@ # pip-compile --output-file dev.txt dev.ini -r tests.ini -ansible==2.7.5 +ansible==2.7.6 django-debug-toolbar==1.11 invoke==1.2.0 ipdb==0.11