From 7121eeae8be1fb69744a9a78d304b8a48f241116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 17 Mar 2018 15:35:38 +0100 Subject: [PATCH] check supportedsites.rst in release script --- CHANGELOG.md | 4 +++- gallery_dl/version.py | 2 +- scripts/build_supportedsites.py | 1 + scripts/release.sh | 30 +++++++++++++++++++++++++----- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 488fd96d..0557e408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog +## Unreleased + ## 1.3.1 - 2018-03-16 - Added support for: - `mangadex` - https://mangadex.org/ - `artstation` - https://www.artstation.com/ -- Added CloudFlare DDoS protection bypass to `komikcast` extractors +- Added Cloudflare DDoS protection bypass to `komikcast` extractors - Changed archive ID formats for `deviantart` folders and collections - Improved error handling for `deviantart` API calls - Removed `imgchili` and various smaller image hosts diff --git a/gallery_dl/version.py b/gallery_dl/version.py index a93ed3cf..0356b612 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.3.1" +__version__ = "1.3.2-dev" diff --git a/scripts/build_supportedsites.py b/scripts/build_supportedsites.py index 02505edd..1b2234ae 100755 --- a/scripts/build_supportedsites.py +++ b/scripts/build_supportedsites.py @@ -12,6 +12,7 @@ CATEGORY_MAP = { "2chan" : "Futaba Channel", "archivedmoe" : "Archived.Moe", "archiveofsins" : "Archive of Sins", + "artstation" : "ArtStation", "b4k" : "arch.b4k.co", "deviantart" : "DeviantArt", "dokireader" : "Doki Reader", diff --git a/scripts/release.sh b/scripts/release.sh index 4fa3a80e..689ab62a 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -15,6 +15,7 @@ prompt() { cleanup() { cd "${ROOTDIR}" echo Removing old build directory + if [ -d ./build ]; then rm -rf ./build fi @@ -23,12 +24,14 @@ cleanup() { update() { cd "${ROOTDIR}" echo Updating version to ${NEWVERSION} + sed -i "s#\"${PYVERSION}\"#\"${NEWVERSION}\"#" "gallery_dl/version.py" sed -i "s#v${OLDVERSION}#v${NEWVERSION}#" "${README}" } update-dev() { cd "${ROOTDIR}" + IFS="." read MAJOR MINOR BUILD <<< "${NEWVERSION}" BUILD=$((BUILD+1)) # update version to -dev @@ -41,15 +44,16 @@ update-dev() { build() { cd "${ROOTDIR}" - - # build wheel and source distributions echo Building bdist_wheel and sdist + python setup.py bdist_wheel sdist } -build_windows() { - # build windows exe in vm +build-windows() { + cd "${ROOTDIR}" echo Building Windows executable + + # build windows exe in vm ln -fs "${ROOTDIR}" /tmp/ vmstart "Windows 7" & disown @@ -72,6 +76,7 @@ build_windows() { sign() { cd "${ROOTDIR}/dist" echo Signing files + gpg --detach-sign --armor gallery_dl-${NEWVERSION}-py3-none-any.whl gpg --detach-sign --armor gallery_dl-${NEWVERSION}.tar.gz gpg --detach-sign gallery-dl.exe @@ -89,9 +94,21 @@ changelog() { "${CHANGELOG}" } +supportedsites() { + cd "${ROOTDIR}" + echo Checking if "${SUPPORTEDSITES}" is up to date + + ./scripts/build_supportedsites.py + if ! git diff --quiet "${SUPPORTEDSITES}"; then + echo "updated ${SUPPORTEDSITES} contains changes" + exit 4 + fi +} + git-upload() { cd "${ROOTDIR}" echo Pushing changes to github + git add "gallery_dl/version.py" "${README}" "${CHANGELOG}" git commit -S -m "release version ${NEWVERSION}" git tag -s -m "version ${NEWVERSION}" "v${NEWVERSION}" @@ -102,6 +119,7 @@ git-upload() { pypi-upload() { cd "${ROOTDIR}/dist" echo Uploading to PyPI + twine upload gallery_dl-${NEWVERSION}* } @@ -109,6 +127,7 @@ pypi-upload() { ROOTDIR="$(realpath "$(dirname "$0")/..")/" README="README.rst" CHANGELOG="CHANGELOG.md" +SUPPORTEDSITES="./docs/supportedsites.rst" LASTTAG="$(git describe --abbrev=0 --tags)" OLDVERSION="${LASTTAG#v}" @@ -127,10 +146,11 @@ fi prompt +supportedsites cleanup update build -build_windows +build-windows sign changelog git-upload