diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-06 11:39:55 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-06 11:39:55 +0000 |
| commit | b0b74e1f17508cb8cef8afd698558db1bd8999cc (patch) | |
| tree | 2947d5d387c8447d234b382849ab7c6f9e82286e /tests | |
| parent | f17783e706ab9c7b3a2b69cf48e4f0ba40664f54 (diff) | |
| parent | ddf90699631db53c981b6a5a63d31c08e0eaeec7 (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Require Python >= 3.5 to build QEMU
Python 2 EOL is 11 days away, we will stop supporting
it in QEMU 5.0.
# gpg: Signature made Fri 20 Dec 2019 16:49:02 GMT
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
configure: Require Python >= 3.5
travis: Replace Python 3.4 build with 3.5
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 31b86674e5..9146e1bdee 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1157,7 +1157,6 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results AVOCADO_SHOW=app AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter %-softmmu,$(TARGET_DIRS))) -ifneq ($(PYTHON2),y) $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) $(call quiet-command, \ $(PYTHON) -m venv --system-site-packages $@, \ @@ -1166,10 +1165,6 @@ $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) $(TESTS_VENV_DIR)/bin/python -m pip -q install -r $(TESTS_VENV_REQ), \ PIP, $(TESTS_VENV_REQ)) $(call quiet-command, touch $@) -else -$(TESTS_VENV_DIR): - $(error "venv directory for tests requires Python 3") -endif $(TESTS_RESULTS_DIR): $(call quiet-command, mkdir -p $@, \ |