Skip to content

Commit

Permalink
Merge pull request #47 from pauloxnet/develop
Browse files Browse the repository at this point in the history
Minor fixes
  • Loading branch information
rafleze authored Jan 23, 2019
2 parents fc99ec0 + 93e22f6 commit f2f3ddf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion requirements/common.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion requirements/dev.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit f2f3ddf

Please sign in to comment.