diff --git a/.travis.yml b/.travis.yml index 160cdde..5bb5826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ services: docker script: - docker build -f ./python36/Dockerfile . | tee build_log.txt - - export IMAGE_ID=`grep "Successfully built" build_log.txt | grep -v "msgpack" | cut -f 3 -d " "` + - export IMAGE_ID=`grep "Successfully built" build_log.txt | grep -v "lmdb" | cut -f 3 -d " "` - docker run --rm $IMAGE_ID python -c "import msgpack; print(msgpack)" - docker run --rm $IMAGE_ID python -c "import tornado; print(tornado)" - docker run --rm $IMAGE_ID python -c "import psycopg2; print(psycopg2)" @@ -11,7 +11,7 @@ script: - docker run --rm $IMAGE_ID python -m pip freeze - python test/rewrite_dockerfile.py - docker build -f test/Dockerfile ./test | tee test_build_log.txt - - export TEST_IMAGE_ID=`grep "Successfully built" test_build_log.txt | grep -v "msgpack" | cut -f 3 -d " "` + - export TEST_IMAGE_ID=`grep "Successfully built" test_build_log.txt | grep -v "lmdb" | cut -f 3 -d " "` - echo "Running tests from ${TEST_IMAGE_ID}" - docker-compose -f ./test/docker-compose.yml up -d - docker run --rm --network host -e "SYN_TEST_PG_DB=postgres:hehe@localhost:5432/syn_test" ${TEST_IMAGE_ID} 2>&1 diff --git a/requirements.txt b/requirements.txt index 1b4a865..670a406 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # Required packages for synapse tornado==4.5.3 pyOpenSSL==17.5.0 -msgpack-python==0.4.8 +msgpack==0.5.0 xxhash==1.0.1 lmdb==0.93 regex==2017.12.12 @@ -19,3 +19,5 @@ pytest-cov==2.5.1 pytest-xdist==1.21.0 # Legacy test packages - nose is included but no longer used by Synapse. nose==1.3.7 +# Support packages for other users +wheel==0.30.0 \ No newline at end of file