Skip to content

Commit 13c31d5

Browse files
authored
Release files for v0_67_10 (#1482)
1 parent 5de4bf5 commit 13c31d5

29 files changed

+102
-93
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.67.9
2+
current_version = 0.67.10
33
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
44
serialize = {major}.{minor}.{patch}
55

API_README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2563,7 +2563,7 @@ cog.out("\n"+get_template_field_table()+"\n")
25632563
|{cr}|A carriage return: '\r'|
25642564
|{crlf}|A carriage return + line feed: '\r\n'|
25652565
|{tab}|:A tab: '\t'|
2566-
|{osxphotos_version}|The osxphotos version, e.g. '0.67.9'|
2566+
|{osxphotos_version}|The osxphotos version, e.g. '0.67.10'|
25672567
|{osxphotos_cmd_line}|The full command line used to run osxphotos|
25682568
|{album}|Album(s) photo is contained in|
25692569
|{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2325,7 +2325,7 @@ Substitution Description
23252325
{cr} A carriage return: '\r'
23262326
{crlf} A carriage return + line feed: '\r\n'
23272327
{tab} :A tab: '\t'
2328-
{osxphotos_version} The osxphotos version, e.g. '0.67.9'
2328+
{osxphotos_version} The osxphotos version, e.g. '0.67.10'
23292329
{osxphotos_cmd_line} The full command line used to run osxphotos
23302330
23312331
The following substitutions may result in multiple values. Thus if specified
@@ -2823,7 +2823,7 @@ The following template field substitutions are availabe for use the templating s
28232823
|{cr}|A carriage return: '\r'|
28242824
|{crlf}|A carriage return + line feed: '\r\n'|
28252825
|{tab}|:A tab: '\t'|
2826-
|{osxphotos_version}|The osxphotos version, e.g. '0.67.9'|
2826+
|{osxphotos_version}|The osxphotos version, e.g. '0.67.10'|
28272827
|{osxphotos_cmd_line}|The full command line used to run osxphotos|
28282828
|{album}|Album(s) photo is contained in|
28292829
|{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|

docs/.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 80a2d5209fadbefbab7b1864eaabfc1b
3+
config: c52e76d5f685ac0a68c97286833574ff
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/API_README.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<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" />
77

88
<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
9-
<title>OSXPhotos Python API - osxphotos 0.67.9 documentation</title>
9+
<title>OSXPhotos Python API - osxphotos 0.67.10 documentation</title>
1010
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=a746c00c" />
1111
<link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=135e06be" />
1212
<link rel="stylesheet" type="text/css" href="_static/copybutton.css?v=76b2166b" />
@@ -124,7 +124,7 @@
124124
</label>
125125
</div>
126126
<div class="header-center">
127-
<a href="index.html"><div class="brand">osxphotos 0.67.9 documentation</div></a>
127+
<a href="index.html"><div class="brand">osxphotos 0.67.10 documentation</div></a>
128128
</div>
129129
<div class="header-right">
130130
<div class="theme-toggle-container theme-toggle-header">
@@ -147,7 +147,7 @@
147147
<div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
148148

149149

150-
<span class="sidebar-brand-text">osxphotos 0.67.9 documentation</span>
150+
<span class="sidebar-brand-text">osxphotos 0.67.10 documentation</span>
151151

152152
</a><form class="sidebar-search-container" method="get" action="search.html" role="search">
153153
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -2821,7 +2821,7 @@ <h3>Template System<a class="headerlink" href="#id166" title="Link to this headi
28212821
</td>
28222822
</tr>
28232823
<tr class="row-odd"><td><p>{osxphotos_version}</p></td>
2824-
<td><p>The osxphotos version, e.g. ‘0.67.9</p></td>
2824+
<td><p>The osxphotos version, e.g. ‘0.67.10</p></td>
28252825
</tr>
28262826
<tr class="row-even"><td><p>{osxphotos_cmd_line}</p></td>
28272827
<td><p>The full command line used to run osxphotos</p></td>
@@ -3657,7 +3657,7 @@ <h2>Additional Examples<a class="headerlink" href="#id174" title="Link to this h
36573657

36583658
</aside>
36593659
</div>
3660-
</div><script src="_static/documentation_options.js?v=f784d7dd"></script>
3660+
</div><script src="_static/documentation_options.js?v=1337ec41"></script>
36613661
<script src="_static/doctools.js?v=888ff710"></script>
36623662
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
36633663
<script src="_static/scripts/furo.js?v=32e29ea5"></script>

docs/_modules/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../genindex.html" /><link rel="search" title="Search" href="../search.html" />
66

77
<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
8-
<title>Overview: module code - osxphotos 0.67.9 documentation</title>
8+
<title>Overview: module code - osxphotos 0.67.10 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../_static/styles/furo.css?v=135e06be" />
1111
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css?v=76b2166b" />
@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="../index.html"><div class="brand">osxphotos 0.67.9 documentation</div></a>
126+
<a href="../index.html"><div class="brand">osxphotos 0.67.10 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="../index.html">
147147

148148

149-
<span class="sidebar-brand-text">osxphotos 0.67.9 documentation</span>
149+
<span class="sidebar-brand-text">osxphotos 0.67.10 documentation</span>
150150

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

252252
</aside>
253253
</div>
254-
</div><script src="../_static/documentation_options.js?v=f784d7dd"></script>
254+
</div><script src="../_static/documentation_options.js?v=1337ec41"></script>
255255
<script src="../_static/doctools.js?v=888ff710"></script>
256256
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
257257
<script src="../_static/scripts/furo.js?v=32e29ea5"></script>

docs/_modules/osxphotos/_constants.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />
66

77
<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
8-
<title>osxphotos._constants - osxphotos 0.67.7 documentation</title>
8+
<title>osxphotos._constants - osxphotos 0.67.10 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?v=135e06be" />
1111
<link rel="stylesheet" type="text/css" href="../../_static/copybutton.css?v=76b2166b" />
@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="../../index.html"><div class="brand">osxphotos 0.67.7 documentation</div></a>
126+
<a href="../../index.html"><div class="brand">osxphotos 0.67.10 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
147147

148148

149-
<span class="sidebar-brand-text">osxphotos 0.67.7 documentation</span>
149+
<span class="sidebar-brand-text">osxphotos 0.67.10 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -760,7 +760,7 @@ <h1>Source code for osxphotos._constants</h1><div class="highlight"><pre>
760760

761761
</aside>
762762
</div>
763-
</div><script src="../../_static/documentation_options.js?v=bbe6f006"></script>
763+
</div><script src="../../_static/documentation_options.js?v=1337ec41"></script>
764764
<script src="../../_static/doctools.js?v=888ff710"></script>
765765
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
766766
<script src="../../_static/scripts/furo.js?v=32e29ea5"></script>

docs/_modules/osxphotos/photoexporter.html

+12-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="../../genindex.html" /><link rel="search" title="Search" href="../../search.html" />
66

77
<!-- Generated with Sphinx 7.2.6 and Furo 2023.09.10 -->
8-
<title>osxphotos.photoexporter - osxphotos 0.67.4 documentation</title>
8+
<title>osxphotos.photoexporter - osxphotos 0.67.10 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../../_static/styles/furo.css?v=135e06be" />
1111
<link rel="stylesheet" type="text/css" href="../../_static/copybutton.css?v=76b2166b" />
@@ -123,7 +123,7 @@
123123
</label>
124124
</div>
125125
<div class="header-center">
126-
<a href="../../index.html"><div class="brand">osxphotos 0.67.4 documentation</div></a>
126+
<a href="../../index.html"><div class="brand">osxphotos 0.67.10 documentation</div></a>
127127
</div>
128128
<div class="header-right">
129129
<div class="theme-toggle-container theme-toggle-header">
@@ -146,7 +146,7 @@
146146
<div class="sidebar-sticky"><a class="sidebar-brand" href="../../index.html">
147147

148148

149-
<span class="sidebar-brand-text">osxphotos 0.67.4 documentation</span>
149+
<span class="sidebar-brand-text">osxphotos 0.67.10 documentation</span>
150150

151151
</a><form class="sidebar-search-container" method="get" action="../../search.html" role="search">
152152
<input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -1009,9 +1009,7 @@ <h1>Source code for osxphotos.photoexporter</h1><div class="highlight"><pre>
10091009
<span class="n">results_attr</span> <span class="o">=</span> <span class="p">(</span>
10101010
<span class="s2">&quot;edited_live&quot;</span>
10111011
<span class="k">if</span> <span class="n">live_photo</span> <span class="ow">and</span> <span class="n">options</span><span class="o">.</span><span class="n">edited</span>
1012-
<span class="k">else</span> <span class="s2">&quot;original_live&quot;</span>
1013-
<span class="k">if</span> <span class="n">live_photo</span>
1014-
<span class="k">else</span> <span class="kc">None</span>
1012+
<span class="k">else</span> <span class="s2">&quot;original_live&quot;</span> <span class="k">if</span> <span class="n">live_photo</span> <span class="k">else</span> <span class="kc">None</span>
10151013
<span class="p">)</span>
10161014
<span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">has_raw</span> <span class="ow">and</span> <span class="n">pathlib</span><span class="o">.</span><span class="n">Path</span><span class="p">(</span>
10171015
<span class="n">exported_file</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span>
@@ -1402,8 +1400,11 @@ <h1>Source code for osxphotos.photoexporter</h1><div class="highlight"><pre>
14021400

14031401
<span class="n">aae_src</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">adjustments_path</span>
14041402
<span class="k">if</span> <span class="n">aae_src</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
1403+
<span class="n">verbose</span><span class="p">(</span>
1404+
<span class="sa">f</span><span class="s2">&quot;Skipping adjustments for </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_filename</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">original_filename</span><span class="p">)</span><span class="si">}</span><span class="s2">: no AAE adjustments file&quot;</span>
1405+
<span class="p">)</span>
14051406
<span class="k">return</span> <span class="n">ExportResults</span><span class="p">()</span>
1406-
<span class="n">aae_dest</span> <span class="o">=</span> <span class="n">dest</span><span class="o">.</span><span class="n">with_suffix</span><span class="p">(</span><span class="s2">&quot;.AAE&quot;</span><span class="p">)</span>
1407+
<span class="n">aae_dest</span> <span class="o">=</span> <span class="n">normalize_fs_path</span><span class="p">(</span><span class="n">dest</span><span class="o">.</span><span class="n">with_suffix</span><span class="p">(</span><span class="s2">&quot;.AAE&quot;</span><span class="p">))</span>
14071408

14081409
<span class="k">if</span> <span class="n">options</span><span class="o">.</span><span class="n">export_as_hardlink</span><span class="p">:</span>
14091410
<span class="k">try</span><span class="p">:</span>
@@ -1424,14 +1425,14 @@ <h1>Source code for osxphotos.photoexporter</h1><div class="highlight"><pre>
14241425
<span class="k">else</span><span class="p">:</span>
14251426
<span class="k">try</span><span class="p">:</span>
14261427
<span class="n">options</span><span class="o">.</span><span class="n">fileutil</span><span class="o">.</span><span class="n">copy</span><span class="p">(</span><span class="n">aae_src</span><span class="p">,</span> <span class="n">aae_dest</span><span class="p">)</span>
1427-
<span class="n">verbose</span><span class="p">(</span>
1428-
<span class="sa">f</span><span class="s2">&quot;Exported adjustments of </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_filename</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">original_filename</span><span class="p">)</span><span class="si">}</span><span class="s2"> to </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_filepath</span><span class="p">(</span><span class="n">normalize_fs_path</span><span class="p">(</span><span class="n">aae_dest</span><span class="p">))</span><span class="si">}</span><span class="s2">&quot;</span>
1429-
<span class="p">)</span>
14301428
<span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
14311429
<span class="k">raise</span> <span class="n">ExportError</span><span class="p">(</span>
14321430
<span class="sa">f</span><span class="s2">&quot;Error copying file </span><span class="si">{</span><span class="n">aae_src</span><span class="si">}</span><span class="s2"> to </span><span class="si">{</span><span class="n">aae_dest</span><span class="si">}</span><span class="s2">: </span><span class="si">{</span><span class="n">e</span><span class="si">}</span><span class="s2"> (</span><span class="si">{</span><span class="n">lineno</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)</span><span class="si">}</span><span class="s2">)&quot;</span>
14331431
<span class="p">)</span> <span class="kn">from</span> <span class="nn">e</span>
14341432

1433+
<span class="n">verbose</span><span class="p">(</span>
1434+
<span class="sa">f</span><span class="s2">&quot;Exported adjustments of </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_filename</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">photo</span><span class="o">.</span><span class="n">original_filename</span><span class="p">)</span><span class="si">}</span><span class="s2"> to </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">_filepath</span><span class="p">(</span><span class="n">aae_dest</span><span class="p">)</span><span class="si">}</span><span class="s2">&quot;</span>
1435+
<span class="p">)</span>
14351436
<span class="k">return</span> <span class="n">ExportResults</span><span class="p">(</span><span class="n">aae_written</span><span class="o">=</span><span class="p">[</span><span class="n">aae_dest</span><span class="p">])</span>
14361437

14371438
<div class="viewcode-block" id="PhotoExporter.write_exiftool_metadata_to_file">
@@ -1607,7 +1608,7 @@ <h1>Source code for osxphotos.photoexporter</h1><div class="highlight"><pre>
16071608

16081609
</aside>
16091610
</div>
1610-
</div><script src="../../_static/documentation_options.js?v=8c1e7a6c"></script>
1611+
</div><script src="../../_static/documentation_options.js?v=1337ec41"></script>
16111612
<script src="../../_static/doctools.js?v=888ff710"></script>
16121613
<script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
16131614
<script src="../../_static/scripts/furo.js?v=32e29ea5"></script>

0 commit comments

Comments
 (0)