Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Rename msgpack #25

Merged
merged 3 commits into from
Jan 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ 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)"
- docker run --rm $IMAGE_ID python -c "import paramiko; print(paramiko)"
- 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
Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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