Updated requirements

Author: Axel Dahlberg

.travis.yml

@@ -17,10 +17,8 @@ matrix:
     os: osx
     osx_image: xcode10.2
     language: shell
-before_install:
-- make build
 install:
-- pip3 install dist/*.whl
+- make install
 script:
 - make lint
 - make tests

Makefile

@@ -13,7 +13,10 @@ lint:
 	@${PYTHON} -m flake8 ${CQC_DIR} ${EXAMPLES} ${TESTS}
 
 python-deps:
-	@cat requirements.txt | xargs -n 1 -L 1 $(PIP) install
+	@${PIP} install -r requirements.txt
+
+test-deps:
+	@${PIP} install -r test_requirements.txt
 
 _verified:
 	@echo "CQC-Python is verified!"
@@ -23,6 +26,9 @@ tests:
 
 verify: clean python-deps lint tests _verified
 
+install: test-deps build
+	@${PIP} install dist/*whl
+
 _remove_build:
 	@rm -f -r build
 

requirements.txt

@@ -1,5 +1,4 @@
-numpy>=1.14.0
-bitstring>=3.1.5
-flake8>=3.6.0
-twisted>=18.7.0
+numpy>=1.14.0,<1.18.0
+bitstring>=3.1.5,<4.0.0
+twisted>=19.7.0,<20.0.0
 anytree>=2.7.2,<3.0.0

test_requirements.txt

@@ -0,0 +1,2 @@
+flake8>=3.6.0,<4.0.0
+pytest>=5.2.1,<6.0.0