diff --git a/.travis.yml b/.travis.yml index 2bbff8d04..2840c434d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,9 @@ matrix: - env: variant=test_debug sim=1 crypto=openssl toolset=gcc-sanitizer - env: variant=test_release coverage=1 tests=1 toolset=gcc-coverage python=1 - env: autotools=1 toolset=gcc - - os: osx + - env: variant=test_debug crypto=openssl docs=1 tests=1 examples=1 python=1 toolset=darwin ios=1 + os: osx osx_image: xcode9.2 - env: variant=test_release docs=1 tests=1 toolset=darwin - - os: osx - osx_image: xcode9.2 - env: variant=test_debug crypto=openssl tests=1 toolset=darwin ios=1 - - os: osx - osx_image: xcode9.2 - env: variant=test_barebones tools=1 examples=1 toolset=darwin python=1 - env: arch=arm toolset=gcc-arm notifications: @@ -118,7 +112,6 @@ install: fi;' - 'echo "using darwin : : ccache clang++ : -std=c++11 ;" >> ~/user-config.jam' - 'echo "using darwin : ios_sim : ccache clang++ : -std=c11 -std=c++11 -Wno-deprecated-declarations - -std=c++11 \"-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk\" -mios-simulator-version-min=7 -fobjc-abi-version=2 @@ -126,7 +119,6 @@ install: -mios-simulator-version-min=7 -fobjc-abi-version=2 ;" >>~/user-config.jam' - 'echo "using darwin : ios : ccache clang++ : -std=c11 -std=c++11 -Wno-deprecated-declarations - -std=c++11 \"-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk\" -mios-version-min=7 \"-arch armv7\" @@ -211,7 +203,7 @@ script: - cd .. - if [[ $ios == "1" ]]; then - bjam darwin-ios darwin-ios_sim -j2 link=static; + bjam -q darwin-ios darwin-ios_sim -j2 link=static; fi # a binary built with sanitizer does not interact well with python diff --git a/bindings/python/src/converters.cpp b/bindings/python/src/converters.cpp index cb0d322f4..0ce7154fa 100644 --- a/bindings/python/src/converters.cpp +++ b/bindings/python/src/converters.cpp @@ -400,6 +400,11 @@ void bind_converters() to_python_converter>, map_to_dict>>>(); to_python_converter, map_to_dict>>(); +#ifndef TORRENT_NO_DEPRECATE + to_python_converter>, vector_to_list>>>(); + list_to_vector>>(); +#endif + // python -> C++ conversions tuple_to_pair(); tuple_to_pair(); diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp index fab382824..dd35ed077 100644 --- a/bindings/python/src/session.cpp +++ b/bindings/python/src/session.cpp @@ -770,7 +770,7 @@ void bind_session() #ifndef TORRENT_NO_DEPRECATE .def_readwrite("url", &add_torrent_params::url) .def_readwrite("uuid", &add_torrent_params::uuid) - .def_readwrite("resume_data", &add_torrent_params::resume_data) + .add_property("resume_data", PROP(&add_torrent_params::resume_data)) #endif ;