Skip to content

Commit 4dd41db

Browse files
committed
adopt pipenv
1 parent 50cc471 commit 4dd41db

File tree

18 files changed

+56
-438
lines changed

18 files changed

+56
-438
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ __pycache__
2323
*.egg-info
2424
*.sqlite
2525
.testmondata
26+
Pipfile.lock

CHANGES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Release 1.5 (dev)
22
-----------------
33
* drop support Django < 1.11
4-
* add support Django 2.0
4+
* add support Django 2.0, 2.1
55
* removed deprecated api `concurrency_check`
6-
6+
* IGNORE_DEFAULT is now False
77

88
Release 1.4 (13 Sep 2016)
99
-------------------------

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ DJANGO?='last'
99
mkdir -p ${BUILDDIR}
1010

1111
develop:
12-
@pip install -U pip setuptools
12+
@pip install pipenv
1313
@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then pip install MySQL-python; fi"
1414
@sh -c "if [ '${DBENGINE}' = 'pg' ]; then pip install -q psycopg2; fi"
15-
@pip install -e .[dev]
1615
$(MAKE) .init-db
16+
@pipenv install -d --skip-lock
1717

1818

1919
.init-db:
@@ -26,10 +26,10 @@ develop:
2626
test:
2727
py.test -v --create-db
2828

29-
qa:
30-
flake8 src/ tests/
31-
isort -rc src/ --check-only
32-
check-manifest
29+
lint:
30+
pipenv run flake8 src/ tests/
31+
pipenv run isort -rc src/ --check-only
32+
pipenv run check-manifest
3333

3434

3535
clean:
@@ -45,7 +45,7 @@ fullclean:
4545

4646
docs: .mkbuilddir
4747
mkdir -p ${BUILDDIR}/docs
48-
sphinx-build -aE docs/ ${BUILDDIR}/docs
48+
pipenv run sphinx-build -aE docs/ ${BUILDDIR}/docs
4949
ifdef BROWSE
5050
firefox ${BUILDDIR}/docs/index.html
5151
endif

Pipfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[[source]]
2+
url = "https://pypi.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
8+
[dev-packages]
9+
django-reversion = "*"
10+
django-webtest = "*"
11+
mock = "*"
12+
pytest = "*"
13+
pytest-cov = "*"
14+
pytest-django = "*"
15+
pytest-echo = "*"
16+
pytest-pythonpath = "*"
17+
tox = "*"
18+
"psycopg2-binary" = "*"
19+
check-manifest = "*"
20+
sphinx = "*"
21+
22+
[requires]
23+
python_version = "3.6"

0 commit comments

Comments
 (0)