mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-05-06 13:01:50 +02:00
Cleanup Makefile.
This commit is contained in:
parent
51fd5f0616
commit
4ac476fbb3
7 changed files with 12 additions and 20 deletions
|
@ -4,6 +4,7 @@ python:
|
||||||
- "3.5"
|
- "3.5"
|
||||||
- "3.6"
|
- "3.6"
|
||||||
- "3.7"
|
- "3.7"
|
||||||
|
- "3.8"
|
||||||
script: tox
|
script: tox
|
||||||
install:
|
install:
|
||||||
- pip install tox-travis
|
- pip install tox-travis
|
||||||
|
|
|
@ -9,7 +9,7 @@ This document describes changes between each past release.
|
||||||
- Add support for espanol latino america (es_419)
|
- Add support for espanol latino america (es_419)
|
||||||
- Use the external debts lib to solve settlements (#476)
|
- Use the external debts lib to solve settlements (#476)
|
||||||
- Remove balance column in statistics view (#323)
|
- Remove balance column in statistics view (#323)
|
||||||
|
- Remove requirements files in favor of setup.cfg pinning (#558)
|
||||||
|
|
||||||
4.1.3 (2019-09-18)
|
4.1.3 (2019-09-18)
|
||||||
==================
|
==================
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
include *.rst
|
include *.rst
|
||||||
recursive-include ihatemoney *.rst *.py *.yaml *.po *.mo *.html *.css *.js *.eot *.svg *.woff *.txt *.png *.ini *.cfg *.j2
|
recursive-include ihatemoney *.rst *.py *.yaml *.po *.mo *.html *.css *.js *.eot *.svg *.woff *.txt *.png *.ini *.cfg *.j2
|
||||||
include LICENSE CONTRIBUTORS CHANGELOG.rst requirements.txt
|
include LICENSE CONTRIBUTORS CHANGELOG.rst
|
||||||
|
|
19
Makefile
19
Makefile
|
@ -11,10 +11,10 @@ ZOPFLIPNG := zopflipng
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: install ## Alias for install
|
all: install ## Alias for install
|
||||||
.PHONY: install
|
.PHONY: install
|
||||||
install: virtualenv $(INSTALL_STAMP) ## Install dependencies
|
install: setup.cfg $(INSTALL_STAMP) ## Install dependencies
|
||||||
$(INSTALL_STAMP):
|
$(INSTALL_STAMP): virtualenv
|
||||||
$(VENV)/bin/pip install -U pip
|
$(VENV)/bin/pip install -U pip
|
||||||
$(VENV)/bin/pip install -r requirements.txt
|
$(VENV)/bin/pip install -e .
|
||||||
touch $(INSTALL_STAMP)
|
touch $(INSTALL_STAMP)
|
||||||
|
|
||||||
.PHONY: virtualenv
|
.PHONY: virtualenv
|
||||||
|
@ -23,9 +23,9 @@ $(PYTHON):
|
||||||
$(VIRTUALENV) $(VENV)
|
$(VIRTUALENV) $(VENV)
|
||||||
|
|
||||||
.PHONY: install-dev
|
.PHONY: install-dev
|
||||||
install-dev: $(INSTALL_STAMP) $(DEV_STAMP) ## Install development dependencies
|
install-dev: setup.cfg $(INSTALL_STAMP) $(DEV_STAMP) ## Install development dependencies
|
||||||
$(DEV_STAMP): $(PYTHON) dev-requirements.txt
|
$(DEV_STAMP): $(PYTHON)
|
||||||
$(VENV)/bin/pip install -Ur dev-requirements.txt
|
$(VENV)/bin/pip install -Ue .[dev]
|
||||||
touch $(DEV_STAMP)
|
touch $(DEV_STAMP)
|
||||||
|
|
||||||
.PHONY: remove-install-stamp
|
.PHONY: remove-install-stamp
|
||||||
|
@ -76,13 +76,6 @@ create-empty-database-revision: ## Create an empty database revision
|
||||||
@read -p "Please enter a message describing this revision: " rev_message; \
|
@read -p "Please enter a message describing this revision: " rev_message; \
|
||||||
$(PYTHON) -m ihatemoney.manage db revision -d ihatemoney/migrations -m "$${rev_message}"
|
$(PYTHON) -m ihatemoney.manage db revision -d ihatemoney/migrations -m "$${rev_message}"
|
||||||
|
|
||||||
.PHONY: build-requirements
|
|
||||||
build-requirements: ## Save currently installed packages to requirements.txt
|
|
||||||
$(VIRTUALENV) $(TEMPDIR)
|
|
||||||
$(TEMPDIR)/bin/pip install -U pip
|
|
||||||
$(TEMPDIR)/bin/pip install -Ue "."
|
|
||||||
$(TEMPDIR)/bin/pip freeze | grep -v -- '-e' > requirements.txt
|
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean: ## Destroy the virtual environment
|
clean: ## Destroy the virtual environment
|
||||||
rm -rf .venv
|
rm -rf .venv
|
||||||
|
|
|
@ -2,7 +2,7 @@ Contributing
|
||||||
############
|
############
|
||||||
|
|
||||||
Set up a dev environment
|
Set up a dev environment
|
||||||
=======================
|
========================
|
||||||
|
|
||||||
You must develop on top of the Git master branch::
|
You must develop on top of the Git master branch::
|
||||||
|
|
||||||
|
@ -23,10 +23,8 @@ install dependencies, and run the test server.
|
||||||
The hard way
|
The hard way
|
||||||
------------
|
------------
|
||||||
|
|
||||||
Alternatively, you can also use the `requirements.txt` file to install the
|
Alternatively, you can use pip to install dependencies yourself. That would be::
|
||||||
dependencies yourself. That would be::
|
|
||||||
|
|
||||||
pip install -r requirements.txt
|
|
||||||
pip install -e .
|
pip install -e .
|
||||||
|
|
||||||
And then run the application::
|
And then run the application::
|
||||||
|
|
|
@ -41,7 +41,6 @@ install_requires =
|
||||||
|
|
||||||
[options.extras_require]
|
[options.extras_require]
|
||||||
dev =
|
dev =
|
||||||
black==19.10b0
|
|
||||||
flake8==3.7.9
|
flake8==3.7.9
|
||||||
Flask-Testing==0.8.0
|
Flask-Testing==0.8.0
|
||||||
pytest==5.4.1
|
pytest==5.4.1
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -22,6 +22,7 @@ changedir = {toxinidir}
|
||||||
|
|
||||||
[testenv:black]
|
[testenv:black]
|
||||||
commands = black --check --target-version=py34 .
|
commands = black --check --target-version=py34 .
|
||||||
|
deps = black
|
||||||
changedir = {toxinidir}
|
changedir = {toxinidir}
|
||||||
|
|
||||||
[testenv:flake8]
|
[testenv:flake8]
|
||||||
|
|
Loading…
Reference in a new issue