Skip to content

Commit

Permalink
Release files for 0_67_2 (#1372)
Browse files Browse the repository at this point in the history
  • Loading branch information
RhetTbull committed Jan 1, 2024
1 parent bc37ff4 commit 3614b3d
Show file tree
Hide file tree
Showing 32 changed files with 88 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.67.1
current_version = 0.67.2
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
serialize = {major}.{minor}.{patch}

Expand Down
2 changes: 1 addition & 1 deletion API_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2556,7 +2556,7 @@ cog.out("\n"+get_template_field_table()+"\n")
|{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.67.1'|
|{osxphotos_version}|The osxphotos version, e.g. '0.67.2'|
|{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|
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2278,7 +2278,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.67.1'
{osxphotos_version} The osxphotos version, e.g. '0.67.2'
{osxphotos_cmd_line} The full command line used to run osxphotos
The following substitutions may result in multiple values. Thus if specified
Expand Down Expand Up @@ -2769,7 +2769,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.67.1'|
|{osxphotos_version}|The osxphotos version, e.g. '0.67.2'|
|{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|
Expand Down
2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -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: 1898d9f2cca98ca1142f83451bbed953
config: 35b54151c07bdcdcc9e0bef666c0f9ef
tags: 645f666f9bcd5a90fca523b33c5a78b7
10 changes: 5 additions & 5 deletions docs/API_README.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Python Reference" href="reference.html" /><link rel="prev" title="OSXPhotos Python Package Overview" href="package_overview.html" />

<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
<title>OSXPhotos Python API - osxphotos 0.67.1 documentation</title>
<title>OSXPhotos Python API - osxphotos 0.67.2 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=a746c00c" />
<link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=135e06be" />
<link rel="stylesheet" type="text/css" href="_static/copybutton.css?v=76b2166b" />
Expand Down Expand Up @@ -124,7 +124,7 @@
</label>
</div>
<div class="header-center">
<a href="index.html"><div class="brand">osxphotos 0.67.1 documentation</div></a>
<a href="index.html"><div class="brand">osxphotos 0.67.2 documentation</div></a>
</div>
<div class="header-right">
<div class="theme-toggle-container theme-toggle-header">
Expand All @@ -147,7 +147,7 @@
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">


<span class="sidebar-brand-text">osxphotos 0.67.1 documentation</span>
<span class="sidebar-brand-text">osxphotos 0.67.2 documentation</span>

</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
Expand Down Expand Up @@ -2812,7 +2812,7 @@ <h3>Template System<a class="headerlink" href="#id166" title="Link to this headi
</td>
</tr>
<tr class="row-odd"><td><p>{osxphotos_version}</p></td>
<td><p>The osxphotos version, e.g. ‘0.67.1</p></td>
<td><p>The osxphotos version, e.g. ‘0.67.2</p></td>
</tr>
<tr class="row-even"><td><p>{osxphotos_cmd_line}</p></td>
<td><p>The full command line used to run osxphotos</p></td>
Expand Down Expand Up @@ -3583,7 +3583,7 @@ <h2>Additional Examples<a class="headerlink" href="#id174" title="Link to this h

</aside>
</div>
</div><script src="_static/documentation_options.js?v=d417e4d2"></script>
</div><script src="_static/documentation_options.js?v=e3ef6eb8"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="_static/scripts/furo.js?v=32e29ea5"></script>
Expand Down
8 changes: 4 additions & 4 deletions docs/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" />

<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
<title>Overview: module code - osxphotos 0.67.1 documentation</title>
<title>Overview: module code - osxphotos 0.67.2 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?v=135e06be" />
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css?v=76b2166b" />
Expand Down Expand Up @@ -123,7 +123,7 @@
</label>
</div>
<div class="header-center">
<a href="../index.html"><div class="brand">osxphotos 0.67.1 documentation</div></a>
<a href="../index.html"><div class="brand">osxphotos 0.67.2 documentation</div></a>
</div>
<div class="header-right">
<div class="theme-toggle-container theme-toggle-header">
Expand All @@ -146,7 +146,7 @@
<div class="sidebar-sticky"><a class="sidebar-brand" href="../index.html">


<span class="sidebar-brand-text">osxphotos 0.67.1 documentation</span>
<span class="sidebar-brand-text">osxphotos 0.67.2 documentation</span>

</a><form class="sidebar-search-container" method="get" action="../search.html" role="search">
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
Expand Down Expand Up @@ -251,7 +251,7 @@ <h1>All modules for which code is available</h1>

</aside>
</div>
</div><script src="../_static/documentation_options.js?v=d417e4d2"></script>
</div><script src="../_static/documentation_options.js?v=e3ef6eb8"></script>
<script src="../_static/doctools.js?v=888ff710"></script>
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="../_static/scripts/furo.js?v=32e29ea5"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/API_README.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3021,7 +3021,7 @@ The following template field substitutions are availabe for use the templating s
* - {tab}
- :A tab: '\t'
* - {osxphotos_version}
- The osxphotos version, e.g. '0.67.1'
- The osxphotos version, e.g. '0.67.2'
* - {osxphotos_cmd_line}
- The full command line used to run osxphotos
* - {album}
Expand Down
2 changes: 1 addition & 1 deletion docs/_sources/template_help.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ Template Substitutions
* - {tab}
- :A tab: '\t'
* - {osxphotos_version}
- The osxphotos version, e.g. '0.67.1'
- The osxphotos version, e.g. '0.67.2'
* - {osxphotos_cmd_line}
- The full command line used to run osxphotos
* - {album}
Expand Down
2 changes: 1 addition & 1 deletion docs/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const DOCUMENTATION_OPTIONS = {
VERSION: '0.67.1',
VERSION: '0.67.2',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
20 changes: 10 additions & 10 deletions docs/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="OSXPhotos Template System" href="template_help.html" /><link rel="prev" title="OSXPhotos Tutorial" href="tutorial.html" />

<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
<title>OSXPhotos Command Line Interface (CLI) - osxphotos 0.67.1 documentation</title>
<title>OSXPhotos Command Line Interface (CLI) - osxphotos 0.67.2 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=a746c00c" />
<link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=135e06be" />
<link rel="stylesheet" type="text/css" href="_static/copybutton.css?v=76b2166b" />
Expand Down Expand Up @@ -124,7 +124,7 @@
</label>
</div>
<div class="header-center">
<a href="index.html"><div class="brand">osxphotos 0.67.1 documentation</div></a>
<a href="index.html"><div class="brand">osxphotos 0.67.2 documentation</div></a>
</div>
<div class="header-right">
<div class="theme-toggle-container theme-toggle-header">
Expand All @@ -147,7 +147,7 @@
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">


<span class="sidebar-brand-text">osxphotos 0.67.1 documentation</span>
<span class="sidebar-brand-text">osxphotos 0.67.2 documentation</span>

</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
Expand Down Expand Up @@ -2522,7 +2522,7 @@ <h3>import<a class="headerlink" href="#osxphotos-import" title="Link to this hea
<dl class="std option">
<dt class="sig sig-object std" id="cmdoption-osxphotos-import-m">
<span id="cmdoption-osxphotos-import-merge-keywords"></span><span class="sig-name descname"><span class="pre">-m</span></span><span class="sig-prename descclassname"></span><span class="sig-prename descclassname"><span class="pre">,</span> </span><span class="sig-name descname"><span class="pre">--merge-keywords</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-osxphotos-import-m" title="Link to this definition">#</a></dt>
<dd><p>Merge keywords created by –exiftool, –sidecar, –sidecar-template, or –keyword with any keywords already associated with the photo. Without –merge-keywords, existing keywords will be overwritten.</p>
<dd><p>Merge keywords created by –exiftool, –sidecar, –sidecar-filename, or –keyword with any keywords already associated with the photo. Without –merge-keywords, existing keywords will be overwritten.</p>
</dd></dl>

<dl class="std option">
Expand Down Expand Up @@ -2558,7 +2558,7 @@ <h3>import<a class="headerlink" href="#osxphotos-import" title="Link to this hea
<dl class="std option">
<dt class="sig sig-object std" id="cmdoption-osxphotos-import-e">
<span id="cmdoption-osxphotos-import-exiftool"></span><span class="sig-name descname"><span class="pre">-e</span></span><span class="sig-prename descclassname"></span><span class="sig-prename descclassname"><span class="pre">,</span> </span><span class="sig-name descname"><span class="pre">--exiftool</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-osxphotos-import-e" title="Link to this definition">#</a></dt>
<dd><p>Use third party tool exiftool (<a class="reference external" href="https://exiftool.org/">https://exiftool.org/</a>) to automatically update metadata (title, description, keywords, location) in imported photos from the imported file’s metadata. See also –sidecar, –sidecar-template. Note: importing keywords from video files is not currently supported.</p>
<dd><p>Use third party tool exiftool (<a class="reference external" href="https://exiftool.org/">https://exiftool.org/</a>) to automatically update metadata (title, description, keywords, location) in imported photos from the imported file’s metadata. See also –sidecar, –sidecar-filename. Note: importing keywords from video files is not currently supported.</p>
</dd></dl>

<dl class="std option">
Expand All @@ -2570,19 +2570,19 @@ <h3>import<a class="headerlink" href="#osxphotos-import" title="Link to this hea
<dl class="std option">
<dt class="sig sig-object std" id="cmdoption-osxphotos-import-s">
<span id="cmdoption-osxphotos-import-sidecar"></span><span class="sig-name descname"><span class="pre">-s</span></span><span class="sig-prename descclassname"></span><span class="sig-prename descclassname"><span class="pre">,</span> </span><span class="sig-name descname"><span class="pre">--sidecar</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-osxphotos-import-s" title="Link to this definition">#</a></dt>
<dd><p>Use sidecar files to import metadata (title, description, keywords, location). Sidecar files must be in the same directory as the imported file and have the same name. For example, if image is named img_1234.jpg, sidecar must be named one of: img_1234.xmp, img_1234.json, img_1234.jpg.xmp, img_1234.jpg.json. Supported sidecar formats are XMP and JSON (as generated by exiftool). If both JSON and XMP sidecars are found, the JSON sidecar will be used. If sidecar format is XMP, exiftool must be installed as it is used to read the XMP files. See also –sidecar-template if you need control over the sidecar name. See also –sidecar-ignore-date. Note: –sidecar and –sidecar-template are mutually exclusive.</p>
<dd><p>Use sidecar files to import metadata (title, description, keywords, location). Sidecar files must be in the same directory as the imported file and have the same name. For example, if image is named img_1234.jpg, sidecar must be named one of: img_1234.xmp, img_1234.json, img_1234.jpg.xmp, img_1234.jpg.json. Supported sidecar formats are XMP and JSON (as generated by exiftool). If both JSON and XMP sidecars are found, the JSON sidecar will be used. If sidecar format is XMP, exiftool must be installed as it is used to read the XMP files. See also –sidecar-filename if you need control over the sidecar name. See also –sidecar-ignore-date. Note: –sidecar and –sidecar-filename are mutually exclusive.</p>
</dd></dl>

<dl class="std option">
<dt class="sig sig-object std" id="cmdoption-osxphotos-import-T">
<span id="cmdoption-osxphotos-import-sidecar-template"></span><span class="sig-name descname"><span class="pre">-T</span></span><span class="sig-prename descclassname"></span><span class="sig-prename descclassname"><span class="pre">,</span> </span><span class="sig-name descname"><span class="pre">--sidecar-template</span></span><span class="sig-prename descclassname"> <span class="pre">&lt;TEMPLATE&gt;</span></span><a class="headerlink" href="#cmdoption-osxphotos-import-T" title="Link to this definition">#</a></dt>
<dd><p>Use sidecar files to import metadata (title, description, keywords, location). The TEMPLATE is an osxphotos template string that is rendered to produce the sidecar filename. The path to the current file is available as {filepath}. Thus if file is named ‘IMG_1234.jpg’ and sidecar is named ‘IMG_1234.xmp’, you would use the template ‘{filepath.parent}/{filepath.stem}.xmp’. If the sidecar name was ‘IMG_1234.jpg.xmp’, you would use the template ‘{filepath}.xmp’. If the sidecar format is XMP, exiftool must be installed as it is used to read the XMP files. See Template System in help for additional information. See also –sidecar-ignore-date. Note: –sidecar and –sidecar-template are mutually exclusive.</p>
<span id="cmdoption-osxphotos-import-sidecar-filename"></span><span class="sig-name descname"><span class="pre">-T</span></span><span class="sig-prename descclassname"></span><span class="sig-prename descclassname"><span class="pre">,</span> </span><span class="sig-name descname"><span class="pre">--sidecar-filename</span></span><span class="sig-prename descclassname"> <span class="pre">&lt;TEMPLATE&gt;</span></span><a class="headerlink" href="#cmdoption-osxphotos-import-T" title="Link to this definition">#</a></dt>
<dd><p>Use sidecar files to import metadata (title, description, keywords, location). The TEMPLATE is an osxphotos template string that is rendered to produce the sidecar filename. The path to the current file is available as {filepath}. Thus if file is named ‘IMG_1234.jpg’ and sidecar is named ‘IMG_1234.xmp’, you would use the template ‘{filepath.parent}/{filepath.stem}.xmp’. If the sidecar name was ‘IMG_1234.jpg.xmp’, you would use the template ‘{filepath}.xmp’. If the sidecar format is XMP, exiftool must be installed as it is used to read the XMP files. See Template System in help for additional information. See also –sidecar-ignore-date. Note: –sidecar and –sidecar-filename are mutually exclusive.</p>
</dd></dl>

<dl class="std option">
<dt class="sig sig-object std" id="cmdoption-osxphotos-import-i">
<span id="cmdoption-osxphotos-import-sidecar-ignore-date"></span><span class="sig-name descname"><span class="pre">-i</span></span><span class="sig-prename descclassname"></span><span class="sig-prename descclassname"><span class="pre">,</span> </span><span class="sig-name descname"><span class="pre">--sidecar-ignore-date</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-osxphotos-import-i" title="Link to this definition">#</a></dt>
<dd><p>Do not use date in sidecar to set photo date/time. Setting the timezone from sidecar files is not currently supported so when using –sidecar or –sidecar-template, the date/time found in the sidecar will be converted to the local timezone and that value will be used to set the photo date/time. If your photos have correct timezone information in the embedded metadata you can use –sidecar-ignore-date to ignore the date/time in the sidecar and use the date/time from the file (which will be read by Photos on import).</p>
<dd><p>Do not use date in sidecar to set photo date/time. Setting the timezone from sidecar files is not currently supported so when using –sidecar or –sidecar-filename, the date/time found in the sidecar will be converted to the local timezone and that value will be used to set the photo date/time. If your photos have correct timezone information in the embedded metadata you can use –sidecar-ignore-date to ignore the date/time in the sidecar and use the date/time from the file (which will be read by Photos on import).</p>
</dd></dl>

<dl class="std option">
Expand Down Expand Up @@ -5988,7 +5988,7 @@ <h3>version<a class="headerlink" href="#osxphotos-version" title="Link to this h

</aside>
</div>
</div><script src="_static/documentation_options.js?v=d417e4d2"></script>
</div><script src="_static/documentation_options.js?v=e3ef6eb8"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="_static/scripts/furo.js?v=32e29ea5"></script>
Expand Down
Loading

0 comments on commit 3614b3d

Please sign in to comment.