Skip to content

Commit

Permalink
bump v1.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreyNikiforov committed Jun 16, 2024
1 parent bef943f commit a90039b
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 20 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions EXPERIMENTAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] /path/to/{album}/{date_created:%Y/%Y-%m}`

`icloudpd-ex-1.19.1-windows-amd64 copy [email protected] /path/to/{album}/{date_created:%Y/%Y-%m}`
`icloudpd-ex-1.20.0-windows-amd64 copy [email protected] /path/to/{album}/{date_created:%Y/%Y-%m}`

10 changes: 5 additions & 5 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion binary_dist/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish_pypi
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/icloudpd/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit a90039b

Please sign in to comment.