Skip to content

Commit dd1d92c

Browse files
committed
Add clean
1 parent befe18d commit dd1d92c

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Dockerfile.testing

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ WORKDIR /tsfresh
6262
# Requires adding safe.directory so that tsfresh can build when the
6363
# repo is mounted.
6464
# Note cannot do this at build time as no git directory exists
65-
ENTRYPOINT ["/bin/bash", "-c", "git config --global --add safe.directory /tsfresh && tox -r -p auto"]
65+
ENTRYPOINT ["/bin/bash", "-c", "git config --global --add safe.directory /tsfresh]
6666
CMD ["tox", "-r", "-p", "auto"]

Makefile

+9-5
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,29 @@ build-testenv:
1414

1515
# Tests `PYTHON_VERSIONS`, provided they are also
1616
# specified in setup.cfg `envlist`
17-
test-all-testenv: build-testenv
17+
test-all-testenv: clean build-testenv
1818
docker run --rm \
1919
--name $(TEST_CONTAINER) \
2020
-v .:$(WORKDIR) \
21+
# To ensure build artifacts dont conflict with local
22+
-v build_artifacts:$(WORKDIR)/build
2123
$(TEST_IMAGE)
2224

2325
# Tests the python binaries installed
2426
# on local machine, provided they are also
2527
# specified in setup.cfg `envlist`
26-
test-all-local:
27-
tox -r
28+
test-all-local: clean
29+
tox -r -p auto
2830

2931
# Tests for python version on local machine in
3032
# current context (e.g. global or local version of
3133
# python set by pyenv, or the python version in
3234
# the active virtualenv).
33-
test-local:
35+
test-local: clean
3436
pip install .[testing]
3537
pytest
3638

3739
clean:
38-
rm -rf .tox
40+
rm -rf .tox build/ dist/ *.egg-info
41+
42+
.PHONY: clean test-all-local test-local test-all-testenv

0 commit comments

Comments
 (0)