Rollback check in Makefile and associated various travis hacks.

This commit is contained in:
Julien Palard 2018-10-06 17:19:50 +02:00
parent 7761dda58f
commit bf16c9a4bb
2 changed files with 2 additions and 8 deletions

View File

@ -2,10 +2,10 @@ language: python
python: 3.6 python: 3.6
before_install: before_install:
- sudo apt-get update - sudo apt-get update
- sudo apt-get install -y hunspell hunspell-fr-comprehensive python3-venv - sudo apt-get install -y hunspell hunspell-fr-comprehensive
install: install:
- pip install pospell - pip install pospell
- pospell --version - pospell --version
script: script:
- pospell -p dict -l fr **/*.po - pospell -p dict -l fr **/*.po
- deactivate; make CPYTHON_CLONE=/tmp/cpython/ BRANCH=3.7 - make CPYTHON_CLONE=/tmp/cpython/ BRANCH=3.7

View File

@ -39,16 +39,10 @@ $(SPHINX_CONF):
.PHONY: upgrade_venv .PHONY: upgrade_venv
upgrade_venv: upgrade_venv:
ifdef VIRTUAL_ENV
$(error "Trying to create a venv while being in a venv. Please deactivate from your venv first.")
endif
$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv $(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv
$(VENV)/bin/activate: $(VENV)/bin/activate:
ifdef VIRTUAL_ENV
$(error "Trying to create a venv while being in a venv. Please deactivate from your venv first.")
endif
$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv $(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv