Skip to content

Commit 3ddad59

Browse files
committed
Responded to PR review
- Remove the python PATCH version from makefile - Move calls to `make clean` to be part of the docker test invokation instead of within local test commands - Removed the one line makefile commands (the docs have enough info on the development process so will not bother using `make` for these. - Updated hyperlink to point to main instead of specific commit sha
1 parent 27f02b9 commit 3ddad59

File tree

2 files changed

+11
-33
lines changed

2 files changed

+11
-33
lines changed

Makefile

+8-30
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@ WORKDIR := /tsfresh
22
TEST_IMAGE := tsfresh-test-image
33
TEST_DOCKERFILE := Dockerfile.testing
44
TEST_CONTAINER := tsfresh-test-container
5-
# >= 3.9.2 ---> https://github.com/dask/distributed/issues/7956
6-
PYTHON_VERSIONS := "3.7.12 3.8.12 3.9.12 3.10.12 3.11.0"
7-
BLACK_VERSION := 22.12.0
8-
# Isort 5.12.0 not supported with python 3.7.12
9-
ISORT_VERSION := 5.12.0
5+
PYTHON_VERSIONS := "3.7 3.8 3.9 3.10 3.11"
106

11-
build-testenv:
7+
# Tests `PYTHON_VERSIONS`, provided they are also
8+
# specified in setup.cfg `envlist`
9+
test-all-testenv: build-docker-testenv run-docker-tests clean
10+
11+
build-docker-testenv:
1212
docker build \
1313
-f $(TEST_DOCKERFILE) \
1414
-t $(TEST_IMAGE) \
1515
--build-arg PYTHON_VERSIONS=$(PYTHON_VERSIONS) \
1616
.
1717

18-
# Tests `PYTHON_VERSIONS`, provided they are also
19-
# specified in setup.cfg `envlist`
20-
test-all-testenv: clean build-testenv
18+
run-docker-tests:
2119
docker run --rm \
2220
--name $(TEST_CONTAINER) \
2321
-v .:$(WORKDIR) \
@@ -26,28 +24,8 @@ test-all-testenv: clean build-testenv
2624
-v egg_artifacts:$(WORKDIR)/tsfresh.egg-info \
2725
$(TEST_IMAGE)
2826

29-
# Tests the python binaries installed
30-
# on local machine, provided they are also
31-
# specified in setup.cfg `envlist`
32-
test-all-local: clean
33-
tox -r -p auto
34-
35-
# Tests for python version on local machine in
36-
# current context (e.g. global or local version of
37-
# python set by pyenv, or the python version in
38-
# the active virtualenv).
39-
test-local: clean
40-
pip install .[testing]
41-
pytest
42-
4327
clean:
4428
rm -rf .tox build/ dist/ *.egg-info
4529

46-
install-formatters:
47-
pip install black==$(BLACK_VERSION) isort==$(ISORT_VERSION)
48-
49-
format: install-formatters
50-
black --extend-exclude \.docs .
51-
isort --profile black --skip-glob="docs" .
5230

53-
.PHONY: clean test-all-local test-local test-all-testenv format install-formatters
31+
.PHONY: build-docker-testenv clean run-docker-tests test-all-testenv

docs/text/how_to_contribute.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ you have to:
6464

6565
.. code::
6666
67-
make test-local
67+
pytest
6868
6969
7070
To test changes across multiple versions of Python, run:
7171

7272

7373
.. code::
7474
75-
make test-all-local
75+
tox -r -p auto
7676
7777
78-
This will execute tests for the Python versions specified in `setup.cfg <https://github.com/blue-yonder/tsfresh/blob/1297c8ca5bd6f8f23b4de50e3f052fb4ec1307f8/setup.cfg>`_ using the `envlist` variable. For example, if `envlist` is set to `py37, py38`, the test suite will run for Python 3.7 and 3.8 on the local development platform, assuming the binaries for those versions are available locally. The exact Python microversions (e.g. `3.7.1` vs `3.7.2`) depend on what is installed on the local development machine.
78+
This will execute tests for the Python versions specified in `setup.cfg <https://github.com/blue-yonder/tsfresh/blob/main/setup.cfg>`_ using the `envlist` variable. For example, if `envlist` is set to `py37, py38`, the test suite will run for Python 3.7 and 3.8 on the local development platform, assuming the binaries for those versions are available locally. The exact Python microversions (e.g. `3.7.1` vs `3.7.2`) depend on what is installed on the local development machine.
7979

8080
A recommended way to manage multiple Python versions when testing locally is with `pyenv`, which enables organized installation and switching between versions.
8181

0 commit comments

Comments
 (0)