Update Makefile

Signed-off-by: Mark Hymers <mark.hymers@ynic.york.ac.uk>

.gitlab-ci.yml

@@ -6,12 +6,12 @@ build_test:
   script:
     - apt update
     - apt upgrade -y
-    - apt install -y python-numpy python3-numpy python-h5py python3-h5py python-sphinx python3-sphinx python-sphinx-rtd-theme python3-sphinx-rtd-theme ipython ipython3 flake8 python-setuptools python3-setuptools python-nose python3-nose
+    - apt install -y python-numpy python3-numpy python-h5py python3-h5py python-sphinx python3-sphinx python-sphinx-rtd-theme python3-sphinx-rtd-theme ipython ipython3 flake8 python-setuptools python3-setuptools python-nose python3-nose python-wheel python3-wheel
     - flake8
     - python setup.py build
     - make testv2
     - python3 setup.py build
-    - make testv
+    - make testv3
     - make doc-html
     - python3 setup.py sdist bdist_wheel
     - python setup.py bdist_wheel

Makefile

@@ -27,10 +27,10 @@ clean:
 	rm -fr build
 	rm -fr doc/build
 
-test: all
+test3: all
 	cd build && PYTHONPATH=lib$(PYTHONARCH3)/:$${PYTHONPATH} nosetests3 -c ../nose.cfg lib$(PYTHONARCH3)/anamnesis
 
-testv: all
+testv3: all
 	cd build && PYTHONPATH=lib$(PYTHONARCH3)/:$${PYTHONPATH} nosetests3 --with-coverage --cover-package=anamnesis -c ../nose.cfg -s -v lib$(PYTHONARCH3)/anamnesis
 
 test2: all2
@@ -44,4 +44,4 @@ install:
 	mkdir -p $(DESTDIR)/usr/share/doc/anam
 	cp -a doc/build/html $(DESTDIR)/usr/share/doc/anam
 
-.PHONY: clean doc doc-html all all2 test testv test2 testv4 pythonarch
+.PHONY: clean doc doc-html all all2 test3 testv3 test2 testv2 pythonarch