From a90039bd0e557ab308fc0f7d1b4e45a678d5b7d4 Mon Sep 17 00:00:00 2001 From: Andrey Nikiforov Date: Sun, 16 Jun 2024 19:05:37 +0000 Subject: [PATCH] bump v1.20.0 --- CHANGELOG.md | 2 ++ CONTRIBUTING.md | 8 ++++---- EXPERIMENTAL.md | 6 +++--- FAQ.md | 10 +++++----- README.md | 2 +- binary_dist/pyproject.toml | 2 +- docs/conf.py | 4 ++-- docs/install.md | 2 +- pyproject.toml | 2 +- scripts/publish_pypi | 2 +- src/icloudpd/base.py | 2 +- 11 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a58ad1156..8e6def1a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 1.20.0 (2024-06-16) + - feature: customize choice and the order of checking for password with `--password-provider` parameter - feature: support multiple file naming and de-deplication policies with `--file-match-policy` parameter. Rel to [#346](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/346) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3fd57223b..533aa13e7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -121,21 +121,21 @@ scripts/build Building platform executables: ``` sh -scripts/build_bin_linux 1.19.1 amd64 +scripts/build_bin_linux 1.20.0 amd64 ``` Note: that command is for Linux, including devcontainers. Windows & MacOS scripts must be executed on respective platforms. Building Python wheels (with single executables; platform-specific): ``` sh -scripts/build_binary_dist_linux 1.19.1 +scripts/build_binary_dist_linux 1.20.0 ``` Note: that the step expects executables to be already prepared by previous step Building NPM packages (with single executables; platform-specific): ``` sh -scripts/build_npm 1.19.1 +scripts/build_npm 1.20.0 ``` Note: that the step expects executables to be already prepared by previous steps @@ -188,4 +188,4 @@ We have github actions taking care for building, testing, and releasing software - Update CHANGELOG.md with release changes if they were not added with commits - Update CHANGELOG.md with date of the release - Commit & push changes (either directly or through pull requests) -- Add version tag to head (`git tag v1.19.1`) and push it to master (`git push origin v1.19.1` ) -- there seems to be no way to do that in UI +- Add version tag to head (`git tag v1.20.0`) and push it to master (`git push origin v1.20.0` ) -- there seems to be no way to do that in UI diff --git a/EXPERIMENTAL.md b/EXPERIMENTAL.md index 9d2d5bf4f..12524409a 100644 --- a/EXPERIMENTAL.md +++ b/EXPERIMENTAL.md @@ -34,17 +34,17 @@ Legacy command (compatible with prior versions): `docker run -it --rm icloudpd:icloudpd icloud --help` -`icloudpd-1.19.1-windows-amd64 --help` +`icloudpd-1.20.0-windows-amd64 --help` Help: `docker run -it --rm icloudpd:icloudpd` -`icloudpd-ex-1.19.1-windows-amd64 --help` +`icloudpd-ex-1.20.0-windows-amd64 --help` Example: `docker run -it --rm icloudpd:icloudpd copy my@email.address /path/to/{album}/{date_created:%Y/%Y-%m}` -`icloudpd-ex-1.19.1-windows-amd64 copy my@email.address /path/to/{album}/{date_created:%Y/%Y-%m}` +`icloudpd-ex-1.20.0-windows-amd64 copy my@email.address /path/to/{album}/{date_created:%Y/%Y-%m}` diff --git a/FAQ.md b/FAQ.md index e0832b464..d7474d83e 100644 --- a/FAQ.md +++ b/FAQ.md @@ -68,13 +68,13 @@ Access to iCloud.com is blocked from mainland China. `icloudpd` can be used with Here are the steps to make it working: - download binary from Github [Releases](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases) into desired local folder -- add executable flag by running `chmod +x icloudpd-1.19.1-macos-amd64` -- start it from the terminal: `icloudpd-1.19.1-macos-amd64` +- add executable flag by running `chmod +x icloudpd-1.20.0-macos-amd64` +- start it from the terminal: `icloudpd-1.20.0-macos-amd64` - Apple will tell you that it cannot check for malicous software and refuse to run the app; click "Ok" -- Open "System Settings"/"Privacy & Security" and find `icloudpd-1.19.1-macos-amd64` as blocked app; Click "Allow" -- Start `icloudpd-1.19.1-macos-amd64` from the terminal again +- Open "System Settings"/"Privacy & Security" and find `icloudpd-1.20.0-macos-amd64` as blocked app; Click "Allow" +- Start `icloudpd-1.20.0-macos-amd64` from the terminal again - Apple will show another warning; click "Open" -- After that you can run `icloudpd-1.19.1-macos-amd64 --help` or any other supported command/option +- After that you can run `icloudpd-1.20.0-macos-amd64 --help` or any other supported command/option ## Running on Synology NAS diff --git a/README.md b/README.md index 8d27d337e..e52d2ff40 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ We aim to release new versions once a week (Friday), if there is something worth ## Install and Run There are three ways to run `icloudpd`: -1. Download executable for your platform from the Github [Release](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases/tag/v1.19.1) and run it +1. Download executable for your platform from the Github [Release](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases/tag/v1.20.0) and run it 1. Use package manager to install, update, and, in some cases, run ([Docker](https://icloud-photos-downloader.github.io/icloud_photos_downloader/install.html#docker), [PyPI](https://icloud-photos-downloader.github.io/icloud_photos_downloader/install.html#pypi), [AUR](https://icloud-photos-downloader.github.io/icloud_photos_downloader/install.html#aur), [Npm](https://icloud-photos-downloader.github.io/icloud_photos_downloader/install.html#npm)) 1. Build and run from the source diff --git a/binary_dist/pyproject.toml b/binary_dist/pyproject.toml index ba824e083..cd1389906 100644 --- a/binary_dist/pyproject.toml +++ b/binary_dist/pyproject.toml @@ -6,7 +6,7 @@ requires = [ build-backend = "setuptools.build_meta" [project] -version="1.19.1" +version="1.20.0" name = "icloudpd" description = "icloudpd is a command-line tool to download photos and videos from iCloud." readme = "README_PYPI.md" diff --git a/docs/conf.py b/docs/conf.py index c374cded5..22177289c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -9,7 +9,7 @@ project = 'icloudpd' copyright = '2024, Contributors' author = 'Contributors' -release = '1.19.1' +release = '1.20.0' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration @@ -19,7 +19,7 @@ templates_path = ['_templates'] exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] -html_title = "icloudpd 1.19.1" +html_title = "icloudpd 1.20.0" language = "en" # language = 'Python' diff --git a/docs/install.md b/docs/install.md index d637587e2..01fc28419 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,7 +1,7 @@ # Install and Run There are three ways to run `icloudpd`: -1. Download executable for your platform from the Github [Release](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases/tag/v1.19.1) and run it +1. Download executable for your platform from the Github [Release](https://github.com/icloud-photos-downloader/icloud_photos_downloader/releases/tag/v1.20.0) and run it 1. Use package manager to install, update, and, in some cases, run ([Docker](#docker), [PyPI](#pypi), [AUR](#aur), [Npm](#npm)) 1. Build and run from the source diff --git a/pyproject.toml b/pyproject.toml index 40508a2b4..ff16b8091 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ requires = [ build-backend = "setuptools.build_meta" [project] -version="1.19.1" +version="1.20.0" name = "icloudpd" description = "icloudpd is a command-line tool to download photos and videos from iCloud." readme = "README_PYPI.md" diff --git a/scripts/publish_pypi b/scripts/publish_pypi index 05852a399..860dff606 100755 --- a/scripts/publish_pypi +++ b/scripts/publish_pypi @@ -11,4 +11,4 @@ set -euo pipefail # cleint use: pip install --index http://192.168.1.20:4880 --trusted-host 192.168.1.20 icloudpd # linux -twine upload --repository-url $1 --non-interactive -u bogus -p bogus dist/icloudpd-1.19.1-py2.py3-none-manylinux*.whl dist/icloudpd-1.19.1-py2.py3-none-macos*.whl dist/icloudpd-1.19.1-py2.py3-none-win*.whl dist/icloudpd-1.19.1-py3-none-any.whl +twine upload --repository-url $1 --non-interactive -u bogus -p bogus dist/icloudpd-1.20.0-py2.py3-none-manylinux*.whl dist/icloudpd-1.20.0-py2.py3-none-macos*.whl dist/icloudpd-1.20.0-py2.py3-none-win*.whl dist/icloudpd-1.20.0-py3-none-any.whl diff --git a/src/icloudpd/base.py b/src/icloudpd/base.py index 84f3efc58..b98775204 100644 --- a/src/icloudpd/base.py +++ b/src/icloudpd/base.py @@ -398,7 +398,7 @@ def file_match_policy_generator(_ctx: click.Context, _param: click.Parameter, po ) # a hacky way to get proper version because automatic detection does not # work for some reason -@click.version_option(version="1.19.1") +@click.version_option(version="1.20.0") # pylint: disable-msg=too-many-arguments,too-many-statements # pylint: disable-msg=too-many-branches,too-many-locals def main(