From bf16c9a4bb325f29d3aa5db73d6093e737a78644 Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Sat, 6 Oct 2018 17:19:50 +0200
Subject: [PATCH] Rollback check in Makefile and associated various travis
 hacks.

---
 .travis.yml | 4 ++--
 Makefile    | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 832281e5..1b04ce83 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Makefile b/Makefile
index ea3a30c1..f32de604 100644
--- a/Makefile
+++ b/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