Skip to content

Commit 1f86096

Browse files
authored
Use Tox to manage testing (#194)
* Use Tox to manage testing * Add Coveralls repo token * Update coverage command * Coverage plx * Update README and Makefile to support new dev workflow
1 parent 6ad2259 commit 1f86096

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+122
-359
lines changed

.circleci/config.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,16 @@ jobs:
1313
- restore_cache:
1414
key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
1515
- run:
16-
name: Install Pipenv
16+
name: Install Tox
1717
command: |
18-
sudo pip install pipenv
19-
pipenv install
18+
sudo pip install tox
2019
- save_cache:
2120
key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
2221
paths:
2322
- ".venv"
2423
- "/usr/local/bin"
2524
- "/usr/local/lib/python3.6/site-packages"
2625
- run:
27-
name: Run Type Checks
26+
name: Run Tox
2827
command: |
29-
make typecheck
30-
- run:
31-
name: Run Linter
32-
command: |
33-
make lint
34-
- run:
35-
name: Run Tests with Coverage
36-
command: |
37-
make test-with-coverage
28+
tox -v --recreate -e ALL

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include README.md LICENSE
2-
recursive-include basilisp *.lpy
2+
graft src

Makefile

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
1-
.PHONY: format
2-
format:
1+
.PHONY: setup-dev
2+
setup-dev:
33
@pipenv install --dev
4-
@pipenv run yapf --recursive --in-place ./basilisp/* --exclude *.lpy
5-
6-
7-
.PHONY: lint
8-
lint:
9-
@pipenv install --dev
10-
@pipenv run python -m prospector > lintout.txt
11-
4+
@pipenv install -e .
125

136
.PHONY: repl
147
repl:
15-
@pipenv install
16-
@pipenv run python -m basilisp.cli repl
17-
18-
19-
.PHONY: coverage
20-
coverage:
21-
@pipenv install --dev
22-
@pipenv run python -m pytest --cov=basilisp --cov-report html
23-
24-
25-
.PHONY: test-with-coverage
26-
test-with-coverage: coverage
27-
@pipenv run coveralls
8+
@pipenv run basilisp repl
289

2910

3011
.PHONY: test
3112
test:
32-
@pipenv install --dev
33-
@pipenv run python -m pytest --disable-warnings
34-
35-
36-
.PHONY: typecheck
37-
typecheck:
38-
@pipenv install --dev
39-
@pipenv run mypy --ignore-missing-imports --follow-imports=skip basilisp
13+
@pipenv run tox

Pipfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ verify_ssl = true
44
name = "pypi"
55

66
[dev-packages]
7-
coveralls = "*"
8-
mypy = "*"
9-
prospector = "*"
10-
pytest = "*"
11-
pytest-cov = "*"
127
twine = "*"
13-
yapf = "*"
8+
tox = "*"
9+
tox-pyenv = "*"
1410

1511
[packages]
1612
astor = "*"
@@ -19,6 +15,7 @@ click = "*"
1915
pyfunctional = "*"
2016
pyrsistent = "*"
2117
python-dateutil = "*"
18+
basilisp = {editable = true, path = "."}
2219

2320
[requires]
2421
python_version = "3.6"

0 commit comments

Comments
 (0)