Skip to content

Commit ec42011

Browse files
authored
🔧 Improve Makefile: use .venv, install all deps
Additionally, prevent Makefile from pushing git tags. PR #293
1 parent 53c8d41 commit ec42011

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ celerybeat-schedule
8282
.env
8383

8484
# virtualenv
85-
venv/
86-
ENV/
85+
.venv/
8786

8887
# Spyder project settings
8988
.spyderproject

Makefile

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

33
# DIU => Django Improved User
44
# DIU_VENV is the name of directory to store the virtual environment
5-
DIU_VENV ?= venv
5+
DIU_VENV ?= .venv
66
ROOT_PYTHON ?= python3
77
DIU_PYTHON ?= $(DIU_VENV)/bin/python3
88
DIU_COV ?= $(DIU_VENV)/bin/coverage
@@ -14,6 +14,7 @@ $(DIU_VENV)/bin/activate:
1414
$(ROOT_PYTHON) -m venv $(DIU_VENV)
1515
$(DIU_PYTHON) -m pip install --upgrade pip setuptools wheel
1616
$(DIU_PYTHON) -m pip install -r requirements.txt
17+
$(DIU_PYTHON) -m pip install -r doc-requirements.txt
1718
$(DIU_PYTHON) -m flit install --symlink
1819

1920
.PHONY: build ## Build artifacts meant for distribution
@@ -23,8 +24,7 @@ build: $(DIU_VENV)/bin/activate
2324
.PHONY: release ## Upload build artifacts to PyPI
2425
release: $(DIU_VENV)/bin/activate
2526
git tag v`$(DIU_PYTHON) -m bumpversion --dry-run --list --new-version 0.0.0 patch | grep current | cut -d'=' -f 2`
26-
$(DIU_PYTHON) -m flit publish
27-
git push --tags
27+
@echo "Verify new tag has been created. If the tag looks correct, push to git with: git push --tags ."
2828

2929
.PHONY: test ## Run test suite for current environment
3030
test: $(DIU_VENV)/bin/activate
@@ -53,6 +53,7 @@ clean:
5353

5454
.PHONY: purge ## Clean + remove virtual environment
5555
purge: clean
56+
rm -rf .tox
5657
rm -rf $(DIU_VENV)
5758

5859
.PHONY: help ## List make targets with description

0 commit comments

Comments
 (0)