Merge from timewarp_merge

Author: RhetTbull

.all-contributorsrc

@@ -819,6 +819,53 @@
       "contributions": [
         "data"
       ]
+    },
+    {
+      "login": "danVnest",
+      "name": "Daniel Vogelnest",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4771860?v=4",
+      "profile": "http://daniel-vogelnest.tk",
+      "contributions": [
+        "bug",
+        "data"
+      ]
+    },
+    {
+      "login": "alban73",
+      "name": "alban73",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74853805?v=4",
+      "profile": "https://github.com/alban73",
+      "contributions": [
+        "bug",
+        "data"
+      ]
+    },
+    {
+      "login": "justaLoli",
+      "name": "justaLoli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92238102?v=4",
+      "profile": "https://github.com/justaLoli",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "arthurward",
+      "name": "arthurward",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8432358?v=4",
+      "profile": "https://github.com/arthurward",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "svet-b",
+      "name": "svet-b",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12831860?v=4",
+      "profile": "https://github.com/svet-b",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.68.4
+current_version = 0.68.6
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = {major}.{minor}.{patch}
 

.github/workflows/tests.yml

@@ -9,8 +9,11 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        os: [macos-14, ubuntu-latest]
-        # os: [macos-14]
+        # remove ubuntu runner for now because pip is broken on ubuntu
+        # with error pip._vendor.packaging.version.InvalidVersion: Invalid version: '6.5.0-1025-azure'
+        # and I don't have time to try to fix this
+        # os: [macos-14, ubuntu-latest]
+        os: [macos-14]
         python-version: ['3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v4

API_README.md

@@ -2571,7 +2571,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.68.4'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.68.6'|
 |{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|

CHANGELOG.md

@@ -2,7 +2,75 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v0.68.3](se.mdhttps://github.com/RhetTbull/osxphotos/compare/v0.68.2...v0.68.3)
+## [v0.68.6](https://github.com/RhetTbull/osxphotos/compare/v0.68.5...v0.68.6)
+
+Various bug fixes for macOS 15 Sequoia.
+
+### v0.68.6 (2024-09-18)
+
+#### Added
+
+#### Changed
+
+- Check for AAE files for video files on import (#1653, thanks to @oPromessa)
+
+#### Removed
+
+#### Fixed
+
+- Fix for error running on macOS 10.15 (#1680)
+- Fix for `osxphotos import --auto-live` for some video files (#1670)
+- Fix for edited photos on macOS 15 Sequoia (#1687)
+
+#### Contributors
+
+- @RhetTbull [@RhetTbull](https://github.com/RhetTbull) for code.
+- @oPromessa [@oPromessa](https://github.com/oPromessa) for code.
+
+## [v0.68.5](https://github.com/RhetTbull/osxphotos/compare/v0.68.4...v0.68.5)
+
+Hot fix for unknown UTI type during export. Also incorporates changes to the `sync` command
+to allow syncing of location data.
+
+#### Added
+
+- Added support for syncing location data in `sync` command thanks to @oPromessa.
+
+#### Changed
+
+#### Removed
+
+#### Fixed
+
+- Fixed unknown UTI type during export (#1643).
+
+#### Contributors
+
+- @RhetTbull [@RhetTbull](https://github.com/RhetTbull) for code.
+- @oPromessa [@oPromessa](https://github.com/oPromessa) for code.
+
+## [v0.68.4](https://github.com/RhetTbull/osxphotos/compare/v0.68.3...v0.68.4)
+
+Hot fix for macOS 14.6 and 15.0/15.1. This release updates the Photos library database schema to support
+macOS 14.6 and 15.0/15.1. It also fixes an issue with the `sync` command when the photo could not be found.
+
+#### Added
+
+#### Changed
+
+- Updated Photos library database schema for macOS 14.6 and 15.0/15.1.
+
+#### Removed
+
+#### Fixed
+
+- Fixed error when using `sync` command and photo could not be found via AppleScript (#1623).
+
+#### Contributors
+
+- @RhetTbull [@RhetTbull](https://github.com/RhetTbull) for code.
+
+## [v0.68.3](https://github.com/RhetTbull/osxphotos/compare/v0.68.2...v0.68.3)
 
 This release fixes errors when running on macOS 14.6 and 15.0 beta due to Photos database schema changes.
 It also adds support for Screen Recording media type and fixes bugs with the `sync` command and changes