update wstest deps (#961)

wstest/Makefile

@@ -6,10 +6,12 @@ default:
 
 clean:
 	-rm -rf ./reports
-	#-rm -rf ./downloads
 	-rm -rf ./venv*
 	-rm -rf ./wstest
 
+dist_clean: clean
+	-rm -rf ./downloads
+
 clean_reports:
 	-rm -rf ./reports
 
@@ -21,48 +23,52 @@ upload_reports:
 downloads:
 	mkdir -p downloads
 	wget -P downloads https://bootstrap.pypa.io/get-pip.py
-	wget -P downloads https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2
-	wget -P downloads https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-linux64.tar.bz2
-	wget -P downloads https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz
-	wget -P downloads https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz
+	wget -P downloads https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2
+	wget -P downloads https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-linux64.tar.bz2
+	wget -P downloads https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz
+	wget -P downloads https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz
 
 
 build_wstest:
 	mkdir -p ./wstest
-	tar xvf ./downloads/pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./wstest
+	tar xvf ./downloads/pypy2-v5.10.0-linux64.tar.bz2 --strip-components=1 -C ./wstest
 	./wstest/bin/pypy ./downloads/get-pip.py
 	./wstest/bin/pip install autobahntestsuite
 	./wstest/bin/pip install awscli
 
 
 build_pypy2:
+	rm -rf ./pypy2
 	mkdir -p ./pypy2
-	tar xvf ./downloads/pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./pypy2
-	#cd ./pypy2/bin && ln -s pypy python && cd ../..
+	tar xvf ./downloads/pypy2-v5.10.0-linux64.tar.bz2 --strip-components=1 -C ./pypy2
+	cd ./pypy2/bin && ln -s pypy python && cd ../..
 	./pypy2/bin/python ./downloads/get-pip.py
 	./pypy2/bin/pip install virtualenv
 	./pypy2/bin/python -V
 
 build_pypy3:
+	rm -rf ./pypy3
 	mkdir -p ./pypy3
-	tar xvf ./downloads/pypy3-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./pypy3
-	#cd ./pypy3/bin && ln -s pypy3 python && cd ../..
+	tar xvf ./downloads/pypy3-v5.10.1-linux64.tar.bz2 --strip-components=1 -C ./pypy3
+	cd ./pypy3/bin && ln -s pypy3 python && cd ../..
 	./pypy3/bin/python ./downloads/get-pip.py
 	./pypy3/bin/pip install virtualenv
 	./pypy3/bin/python -V
 
 build_cpy2:
+	rm -rf ./cpy2_build
 	mkdir -p ./cpy2_build
-	tar xvf ./downloads/Python-2.7.13.tar.xz --strip-components=1 -C ./cpy2_build
+	tar xvf ./downloads/Python-2.7.14.tar.xz --strip-components=1 -C ./cpy2_build
 	cd ./cpy2_build && ./configure --prefix=${CURDIR}/cpy2 && make && make install
 	rm -rf ./cpy2_build
 	./cpy2/bin/python ./downloads/get-pip.py
 	./cpy2/bin/pip install virtualenv
 	./cpy2/bin/python -V
 
 build_cpy3:
+	rm -rf ./cpy3_build
 	mkdir -p ./cpy3_build
-	tar xvf ./downloads/Python-3.6.0.tar.xz --strip-components=1 -C ./cpy3_build
+	tar xvf ./downloads/Python-3.6.4.tar.xz --strip-components=1 -C ./cpy3_build
 	cd ./cpy3_build && ./configure --prefix=${CURDIR}/cpy3 && make && make install
 	cd ./cpy3/bin && ln -s python3 python && cd ../..
 	cd ./cpy3/bin && ln -s pip3 pip && cd ../..