forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated setup.py to resolve issue with bpylist2 on python < 3.8

Browse Source
This commit is contained in:
Rhet Turnbull
2020-04-20 21:21:47 -07:00
parent a337e79e13
commit 8e4b88ad1f
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

@@ -1,3 +1,3 @@
""" version info """ """ version info """
__version__ = "0.28.2" __version__ = "0.28.3"

30
setup.py
View File

@@ -3,7 +3,7 @@
# #
# setup.py script for osxphotos # setup.py script for osxphotos
# #
# Copyright (c) 2019 Rhet Turnbull, rturnbull+git@gmail.com # Copyright (c) 2019, 2020 Rhet Turnbull, rturnbull+git@gmail.com
# All rights reserved. # All rights reserved.
# #
# Permission is hereby granted, free of charge, to any person # Permission is hereby granted, free of charge, to any person
@@ -27,23 +27,43 @@
# SOFTWARE. # SOFTWARE.
import os import os
import platform
from setuptools import find_packages, setup from setuptools import find_packages, setup
this_directory = os.path.abspath(os.path.dirname(__file__)) # python version as 2-digit float (e.g. 3.6)
with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f: py_ver = float(".".join(platform.python_version_tuple()[:2]))
long_description = f.read()
# holds config info read from disk
about = {} about = {}
this_directory = os.path.abspath(os.path.dirname(__file__))
# get version info from _version
with open( with open(
os.path.join(this_directory, "osxphotos", "_version.py"), mode="r", encoding="utf-8" os.path.join(this_directory, "osxphotos", "_version.py"), mode="r", encoding="utf-8"
) as f: ) as f:
exec(f.read(), about) exec(f.read(), about)
# read README.md into long_description
with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
about["long_description"] = f.read()
# ugly hack to install custom version of bpylist2 needed for Python < 3.8
# the stock version of bylist2==2.0.3 causes an error related to
# "pkg_resources.ContextualVersionConflict: (pycodestyle 2.3.1..."
# PEP 508 no help here as URL-based lookups not allowed in PyPI packages
# if you know a better way, PRs welcome!
# once I go to 3.8+ required, this won't be necessary as bpylist2 3.0+ solves this issue
if py_ver < 3.8:
os.system(
"python3 -m pip install git+git://github.com/RhetTbull/bpylist2.git#egg=bpylist2"
)
setup( setup(
name="osxphotos", name="osxphotos",
version=about["__version__"], version=about["__version__"],
description="Manipulate (read-only) Apple's Photos app library on Mac OS X", description="Manipulate (read-only) Apple's Photos app library on Mac OS X",
long_description=long_description, long_description=about["long_description"],
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
author="Rhet Turnbull", author="Rhet Turnbull",
author_email="rturnbull+git@gmail.com", author_email="rturnbull+git@gmail.com",