Rollback check in Makefile and associated various travis hacks.

Author: JulienPalard

.travis.yml

@@ -2,10 +2,10 @@ language: python
 python: 3.6
 before_install:
   - 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:
   - pip install pospell
   - pospell --version
 script:
   - pospell -p dict -l fr **/*.po
-  - deactivate; make CPYTHON_CLONE=/tmp/cpython/ BRANCH=3.7
+  - make CPYTHON_CLONE=/tmp/cpython/ BRANCH=3.7

Makefile

@@ -39,16 +39,10 @@ $(SPHINX_CONF):
 
 .PHONY: 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
 
 
 $(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