Skip to content
This repository was archived by the owner on Apr 9, 2022. It is now read-only.

Commit c8b606f

Browse files
committed
use pipenv
1 parent d21881b commit c8b606f

File tree

7 files changed

+209
-26
lines changed

7 files changed

+209
-26
lines changed

Makefile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
clean:
2-
find . -name \*.pyc -o -name -delete
3-
find . -name \*.pyo -o -name -delete
4-
find . -name __pycache__ -o -name -delete
5-
find . -path "./server/server/api/migrations/*.py" -not -name "__init__.py" -o -name -delete
6-
rm -f server/db.sqlite3
1+
PYTHON_BIN = $(shell cd server && pipenv --venv)/bin/python
2+
3+
python_bin:
4+
pushd server; pipenv install --dev; popd;
75

8-
database:
9-
./server/manage.py makemigrations api --noinput
10-
./server/manage.py migrate --noinput
6+
database: python_bin
7+
$(PYTHON_BIN) ./server/manage.py makemigrations api --noinput
8+
$(PYTHON_BIN) ./server/manage.py migrate --noinput
119

12-
fixtures:
13-
./server/manage.py createsuperuser --username=root --email=root@example.com --noinput
14-
./server/manage.py create_fixtures
10+
fixtures: python_bin
11+
$(PYTHON_BIN) ./server/manage.py createsuperuser --username=root --email=root@example.com --noinput
12+
$(PYTHON_BIN) ./server/manage.py create_fixtures
13+
14+
server-dev: python_bin
15+
$(PYTHON_BIN) ./server/manage.py runserver --settings=server.settings
1516

1617
client/node_modules:
1718
npm --prefix=./client install
1819

1920
client-dist: client/node_modules
2021
npm --prefix=./client run build
2122

22-
server-dev:
23-
./server/manage.py runserver --settings=server.settings
23+
clean:
24+
find . -name \*.pyc -o -name -delete
25+
find . -name \*.pyo -o -name -delete
26+
find . -name __pycache__ -o -name -delete
27+
find . -path "./server/server/api/migrations/*.py" -not -name "__init__.py" -o -name -delete
28+
rm -f server/db.sqlite3
2429

2530
all: clean database fixtures client-dist server-dev

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ An example [Vue.js](https://github.com/vuejs/vue) project featuring an unstyled
66
* [server](server)
77

88
#### Dependencies
9-
- python 3.5+
10-
- pip
9+
- python 3.6
10+
- pipenv 11.10.0
1111
- node 8.9.0
1212
- npm 5.6.0

server/Pipfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
django-rest-auth = "==0.9.2"
8+
djangorestframework = ">=3.7.0"
9+
django-allauth = ">=0.24.1"
10+
six = "==1.9.0"
11+
Django = ">=1.9.0"
12+
13+
[dev-packages]
14+
factory-boy = "*"
15+
faker = "*"
16+
17+
[requires]
18+
python_version = "3.6"

server/Pipfile.lock

Lines changed: 168 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
``` bash
44
# install dependencies
5-
pip install -r requirements-dev.txt
5+
pipenv install --dev
66

77
# setup development database
88
./manage.py makemigrations api --noinput
@@ -16,4 +16,4 @@ pip install -r requirements-dev.txt
1616
./manage.py runserver --settings=server.settings
1717
```
1818

19-
**Note:** You should setup and activate a [virtualenv](https://virtualenv.pypa.io/en/stable/) before installing any python dependencies.
19+
**Note:** You should install [pipenv](https://docs.pipenv.org/) before installing any python dependencies.

server/requirements-dev.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

server/requirements.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)