Skip to content

Commit 05e6e9e

Browse files
authored
Merge pull request #1625 from ccnmtl/update-django.mk
Update django.mk
2 parents 795232d + 9ab4240 commit 05e6e9e

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

django.mk

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
# VERSION=1.9.0
1+
# VERSION=1.10.0
22

33
# CHANGES:
4-
# 1.9.0 - Use coverage tool directly to generate coverage
5-
# reports.
6-
# - wheel and pip updates
7-
# - Use pre-compiled binary wheel for cryptography
8-
# - Remove Travis references
9-
# 1.8.0 - 2019-10-21 - Don't run flake8 on local_settings.py
10-
# 1.7.0 - 2018-05-31 - Now using python 3 by default
11-
# - Removed virtualenv.py in favor of python 3's
12-
# builtin venv capability.
13-
# 1.6.0 - 2017-09-05 - add bandit secure analysis configuration
14-
# 1.5.0 - 2017-08-24 - remove jshint/jscs in favor of eslint
15-
# 1.4.0 - 2017-06-06 - backout the switch to eslint. that's not really ready yet.
16-
# 1.3.0 - 2017-06-05 - pypi location is not needed anymore
17-
# 1.2.0 - 2016-12-15 - bump wheel version to 0.29
18-
# 1.1.0 - 2016-11-08 - run flake8 tests before unit tests
19-
# 1.0.1 - 2016-05-02 - Remove deprecated syncdb command from make install
4+
# 1.10.0 - 2025-10-16 - Removed coverage, updated dependencies.
5+
# 1.9.0 - Use coverage tool directly to generate coverage
6+
# reports.
7+
# - wheel and pip updates
8+
# - Use pre-compiled binary wheel for cryptography
9+
# - Remove Travis references
10+
# 1.8.0 - 2019-10-21 - Don't run flake8 on local_settings.py
11+
# 1.7.0 - 2018-05-31 - Now using python 3 by default
12+
# - Removed virtualenv.py in favor of python 3's
13+
# builtin venv capability.
14+
# 1.6.0 - 2017-09-05 - add bandit secure analysis configuration
15+
# 1.5.0 - 2017-08-24 - remove jshint/jscs in favor of eslint
16+
# 1.4.0 - 2017-06-06 - backout the switch to eslint. that's not really ready yet.
17+
# 1.3.0 - 2017-06-05 - pypi location is not needed anymore
18+
# 1.2.0 - 2016-12-15 - bump wheel version to 0.29
19+
# 1.1.0 - 2016-11-08 - run flake8 tests before unit tests
20+
# 1.0.1 - 2016-05-02 - Remove deprecated syncdb command from make install
2021

2122
VE ?= ./ve
2223
MANAGE ?= ./manage.py
2324
REQUIREMENTS ?= requirements.txt
2425
SYS_PYTHON ?= python3
2526
PY_SENTINAL ?= $(VE)/sentinal
2627
WHEEL_VERSION ?= 0.45.1
27-
PIP_VERSION ?= 25.1.1
28-
SETUPTOOLS_VERSION ?= 80.7.1
28+
PIP_VERSION ?= 25.2
29+
SETUPTOOLS_VERSION ?= 80.9.0
2930
MAX_COMPLEXITY ?= 10
3031
INTERFACE ?= localhost
3132
RUNSERVER_PORT ?= 8000
3233
PY_DIRS ?= $(APP)
3334
BANDIT ?= $(VE)/bin/bandit
3435
FLAKE8 ?= $(VE)/bin/flake8
3536
PIP ?= $(VE)/bin/pip
36-
COVERAGE ?= $(VE)/bin/coverage
3737

38-
jenkins: check flake8 test
38+
jenkins: check flake8 test bandit
3939

4040
$(PY_SENTINAL): $(REQUIREMENTS)
4141
rm -rf $(VE)
@@ -47,8 +47,7 @@ $(PY_SENTINAL): $(REQUIREMENTS)
4747
touch $@
4848

4949
test: $(PY_SENTINAL)
50-
$(COVERAGE) run --source='.' --omit=$(VE)/* $(MANAGE) test $(PY_DIRS)
51-
$(COVERAGE) xml -o reports/coverage.xml
50+
$(MANAGE) test $(PY_DIRS)
5251

5352
parallel-tests: $(PY_SENTINAL)
5453
$(MANAGE) test --parallel
@@ -76,7 +75,6 @@ clean:
7675
rm -rf media/CACHE
7776
rm -rf reports
7877
rm -f celerybeat-schedule
79-
rm -f .coverage
8078
rm -rf node_modules
8179
find . -name '*.pyc' -exec rm {} \;
8280

0 commit comments

Comments
 (0)