From cda5f446933ea2272409d1f153e2a7811626ada6 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Sat, 21 Mar 2020 12:51:27 -0700
Subject: [PATCH] Fixed requirements.txt for bplist2

---
 requirements.txt | 6 +++---
 setup.py         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a68d9c48..1ae99c53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,9 +5,9 @@ astroid==2.2.5
 atomicwrites==1.3.0
 attrs==19.1.0
 better-exceptions-fork==0.2.1.post6
-black==19.10b0
-bpylist2==2.0.3
-pycodestyle<2.6.0,>=2.5.0
+# bpylist2==2.0.3;python_version<"3.8"
+https://files.pythonhosted.org/packages/cd/fd/d8a51e68398ca8ddb00511e9e0436ab5273ba896f18ee9c4be8de08cf892/bpylist2-2.0.3-cp37-cp37m-macosx_10_13_x86_64.whl#egg=bpylist2;python_version<"3.8"
+bpylist2==3.0.0;python_version>="3.8"
 certifi==2019.3.9
 Click==7.0
 colorama==0.4.1
diff --git a/setup.py b/setup.py
index 16f9becb..c9ad0eb8 100755
--- a/setup.py
+++ b/setup.py
@@ -62,12 +62,12 @@ setup(
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     install_requires=[
-        "pycodestyle<2.6.0,>=2.5.0'",  # needed by bpylist==2.0.3
         "pyobjc>=6.0.1",
         "Click>=7",
         "PyYAML>=5.1.2",
         "Mako>=1.1.1",
-        "bpylist2==2.0.3",
+        "bpylist2==2.0.3;python_version<'3.8'",
+        "bpylist2==3.0.0;python_version>='3.8'",
     ],
     entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
     include_package_data=True,