Skip to content

Commit

Permalink
Merge 42ea204 into dd81e0b
Browse files Browse the repository at this point in the history
  • Loading branch information
kedder committed Sep 10, 2020
2 parents dd81e0b + 42ea204 commit 266fc0d
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -6,8 +6,8 @@ python:
- "3.7"
- "3.8"
install:
- pip install -e .[test]
- pip install coveralls
- pip install pipenv coveralls[yaml]
- pipenv install --dev
script:
- pytest --cov src/ofxstatement
after_success:
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Expand Up @@ -7,7 +7,7 @@ Changes

- Drop support for Python 3.4, add support for Python 3.8
- Fixed naive end balance validation (#106)

- Modernize development environment (use pipenv)

0.6.5 (2020-06-09)
==================
Expand Down
28 changes: 3 additions & 25 deletions Makefile
@@ -1,29 +1,7 @@
VENV=$(abspath .venv)
PIP=$(VENV)/bin/pip

all: bin/ofxstatement bin/pytest

$(VENV):
python3 -m venv $(VENV)

bin:
mkdir $@

bin/ofxstatement: $(VENV)/bin/ofxstatement | bin
ln -sf $(VENV)/bin/ofxstatement $@
touch $@

bin/pytest: $(VENV)/bin/ofxstatement | bin
ln -sf $(VENV)/bin/pytest $@
touch $@

$(VENV)/bin/ofxstatement: $(VENV) setup.py
$(PIP) install --editable .[test]

PHONY: test
test: bin/pytest
bin/pytest
test:
pytest

PHONY: coverage
coverage: bin/pytest
./bin/pytest --cov src/ofxstatement
pytest --cov src/ofxstatement
12 changes: 12 additions & 0 deletions Pipfile
@@ -0,0 +1,12 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
pytest = "*"
pytest-cov = "*"
mock = "*"

[packages]
ofxstatement = {editable = true,path = "."}
159 changes: 159 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions pytest.ini
Expand Up @@ -9,15 +9,8 @@ addopts =
--cov ofxstatement
--cov-report term-missing
--no-cov-on-fail
# --doctest-modules
# --pep8
# --flakes
--ignore setup.py

pep8ignore =
*.py W391
test*.py E501

log_cli = 1
log_cli_level = INFO
log_cli_format = %(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)
Expand Down

0 comments on commit 266fc0d

Please sign in to comment.