diff --git a/README.md b/README.md index f5b3e4d..4b102f2 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ The latest versions of the portable zips can be downloaded here: - [streamlink-portable-latest-win32.zip](https://dl.bintray.com/beardypig/streamlink-portable/streamlink-portable-latest-win32.zip) - [streamlink-portable-latest-amd64.zip](https://dl.bintray.com/beardypig/streamlink-portable/streamlink-portable-latest-amd64.zip) -A stable version is also available, based on the `0.6.0` tag of streamlink: -- [streamlink-portable-0.6.0-py3.5.2-win32.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.6.0/streamlink-portable-0.6.0-py3.5.2-win32.zip) -- [streamlink-portable-0.6.0-py3.5.2-amd64.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.6.0/streamlink-portable-0.6.0-py3.5.2-amd64.zip) +A stable version is also available, based on the `0.7.0` tag of streamlink: +- [streamlink-portable-0.7.0-py3.5.2-win32.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.7.0/streamlink-portable-0.7.0-py3.5.2-win32.zip) +- [streamlink-portable-0.7.0-py3.5.2-amd64.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.7.0/streamlink-portable-0.7.0-py3.5.2-amd64.zip) To install simply unzip the zip file. @@ -26,6 +26,11 @@ NB. `sed` must be `gnu-sed` ## Changelog +### 2017-07-05 + + * Release stable `0.7.0`. + * Resolved issue with missing `urllib3` module. + ### 2017-05-11 * Release stable `0.6.0`. diff --git a/scripts/makeportable.sh b/scripts/makeportable.sh index a74e0bb..369c158 100755 --- a/scripts/makeportable.sh +++ b/scripts/makeportable.sh @@ -37,8 +37,8 @@ pushd "${streamlink_clone_dir}" > /dev/null commit=$(git rev-parse --short HEAD) echo "Downloading Python dependencies..." -pip download --only-binary ":all:" --platform "${PYTHON_PLATFORM}" --python-version "35" --abi "cp35m" -d "${temp_dir}" "pycryptodome==3.4.3" "requests>=1.0,!=2.12.0,!=2.12.1,<3.0" > /dev/null -pip install --upgrade -t "${packages_dir}" "iso-639" "iso3166" "setuptools" > /dev/null +pip download --only-binary ":all:" --platform "${PYTHON_PLATFORM}" --python-version "35" --abi "cp35m" -d "${temp_dir}" "pycryptodome==3.4.3" > /dev/null +pip install --upgrade -t "${packages_dir}" "iso-639" "iso3166" "setuptools" "requests>=1.0,>=2.18.0,<3.0" > /dev/null # Work out the streamlink version # For travis nightly builds generate a version number with commit hash @@ -64,8 +64,8 @@ unzip -o "${temp_dir}/python-${STREAMLINK_PYTHON_VERSION}-embed-${STREAMLINK_PYT # include the Windows 10 Universal Runtime unzip -o "${root_dir}/resources/msvcrt_${PYTHON_PLATFORM}.zip" -d "${python_dir}" > /dev/null -unzip -o "${temp_dir}/pycryptodome*.whl" -d "${packages_dir}" > /dev/null -unzip -o "${temp_dir}/requests*.whl" -d "${packages_dir}" > /dev/null +unzip -o "${temp_dir}/*.whl" -d "${packages_dir}" > /dev/null +#unzip -o "${temp_dir}/requests*.whl" -d "${packages_dir}" > /dev/null cp -r "${streamlink_clone_dir}/src/"* "${bundle_dir}/packages" cp "${root_dir}/resources/streamlink-script.py" "${bundle_dir}/streamlink-script.py"