diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 85aebc6b..94af65d0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.54.4 +current_version = 0.55.0 parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} diff --git a/API_README.md b/API_README.md index 99679dc7..f0df3a71 100644 --- a/API_README.md +++ b/API_README.md @@ -2012,7 +2012,7 @@ cog.out(get_template_field_table()) |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.54.4'| +|{osxphotos_version}|The osxphotos version, e.g. '0.55.0'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/README.md b/README.md index 63c34c4a..d3a01f96 100644 --- a/README.md +++ b/README.md @@ -2010,7 +2010,7 @@ Substitution Description {cr} A carriage return: '\r' {crlf} A carriage return + line feed: '\r\n' {tab} :A tab: '\t' -{osxphotos_version} The osxphotos version, e.g. '0.54.4' +{osxphotos_version} The osxphotos version, e.g. '0.55.0' {osxphotos_cmd_line} The full command line used to run osxphotos The following substitutions may result in multiple values. Thus if specified @@ -2494,7 +2494,7 @@ The following template field substitutions are availabe for use the templating s |{cr}|A carriage return: '\r'| |{crlf}|A carriage return + line feed: '\r\n'| |{tab}|:A tab: '\t'| -|{osxphotos_version}|The osxphotos version, e.g. '0.54.4'| +|{osxphotos_version}|The osxphotos version, e.g. '0.55.0'| |{osxphotos_cmd_line}|The full command line used to run osxphotos| |{album}|Album(s) photo is contained in| |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder| diff --git a/build.sh b/build.sh index 4f8ac635..07ab50a3 100755 --- a/build.sh +++ b/build.sh @@ -48,6 +48,9 @@ echo "Building CLI executable" # zip up CLI executable echo "Zipping CLI executable" -OSXPHOTOS_VERSION=$(python3 -c "import osxphotos; print(osxphotos.__version__)") -zip dist/osxphotos_MacOS_exe_darwin_x64_v$OSXPHOTOS_VERSION.zip dist/osxphotos +OSXPHOTOSVERSION=$(python3 -c "import osxphotos; print(osxphotos.__version__)") +ARCHSTR=$(uname -m) +ZIPNAME=osxphotos_MacOS_exe_darwin_${ARCHSTR}_v${OSXPHOTOSVERSION}.zip +echo "Zipping CLI executable to $ZIPNAME" +cd dist && zip $ZIPNAME osxphotos && cd .. rm dist/osxphotos \ No newline at end of file diff --git a/docs/.buildinfo b/docs/.buildinfo index be08ad8f..c962ae90 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 45f2dda1d3ddb8cbb89b1f561aef11df +config: 1bada16c2c94e3aac8f67ab377820bdd tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/index.html b/docs/_modules/index.html index 20f0b700..339335a0 100644 --- a/docs/_modules/index.html +++ b/docs/_modules/index.html @@ -5,7 +5,7 @@ - Overview: module code - osxphotos 0.54.4 documentation + Overview: module code - osxphotos 0.55.0 documentation @@ -123,7 +123,7 @@
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@
@@ -147,7 +147,7 @@
@@ -145,7 +145,7 @@
@@ -147,7 +147,7 @@
@@ -147,7 +147,7 @@
@@ -147,7 +147,7 @@
@@ -145,7 +145,7 @@
@@ -147,7 +147,7 @@
@@ -144,7 +144,7 @@
@@ -147,7 +147,7 @@
@@ -147,7 +147,7 @@