107 lines
2.9 KiB
Diff
107 lines
2.9 KiB
Diff
From 669cbdb3fb1d5155ea9163269c0dcf1c2b5621ea Mon Sep 17 00:00:00 2001
|
|
From: George Rawlinson <george@rawlinson.net.nz>
|
|
Date: Tue, 27 Sep 2022 14:48:58 +1300
|
|
Subject: [PATCH 1/4] fix version info detection
|
|
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 209d5b6..6633dfd 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -3,7 +3,7 @@
|
|
from distutils.core import setup
|
|
import sys
|
|
|
|
-if sys.version_info != (3, ):
|
|
+if sys.version_info <= (3, ):
|
|
print("rawdog requires Python 3.")
|
|
sys.exit(1)
|
|
|
|
|
|
From e7a3ce41abcdb524b965f61cfdd061c94cfe0173 Mon Sep 17 00:00:00 2001
|
|
From: George Rawlinson <george@rawlinson.net.nz>
|
|
Date: Tue, 27 Sep 2022 14:49:17 +1300
|
|
Subject: [PATCH 2/4] fix missing comma
|
|
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 6633dfd..9114305 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -12,7 +12,7 @@
|
|
description="RSS Aggregator Without Delusions Of Grandeur - python3 port",
|
|
author="echarlie",
|
|
author_email="echarlie@vtluug.org",
|
|
- url="https://github.com/echarlie/rawdog-py3"
|
|
+ url="https://github.com/echarlie/rawdog-py3",
|
|
scripts=['rawdog'],
|
|
data_files=[('share/man/man1', ['rawdog.1'])],
|
|
packages=['rawdoglib'],
|
|
|
|
From 02d4c1b1dfc8fc7b3b382ae6e5f0930c9006a350 Mon Sep 17 00:00:00 2001
|
|
From: George Rawlinson <george@rawlinson.net.nz>
|
|
Date: Tue, 27 Sep 2022 20:07:05 +1300
|
|
Subject: [PATCH 3/4] fix: python version detection
|
|
|
|
Rather than using sys.version_info to detect Python version,
|
|
upstream Python recommends using python_requires, as found here:
|
|
|
|
https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/#python-requires
|
|
---
|
|
setup.py | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 9114305..5988b4f 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -1,11 +1,6 @@
|
|
#!/usr/bin/env python3
|
|
|
|
from distutils.core import setup
|
|
-import sys
|
|
-
|
|
-if sys.version_info <= (3, ):
|
|
- print("rawdog requires Python 3.")
|
|
- sys.exit(1)
|
|
|
|
setup(name="rawdog",
|
|
version="3.0",
|
|
@@ -15,6 +10,7 @@
|
|
url="https://github.com/echarlie/rawdog-py3",
|
|
scripts=['rawdog'],
|
|
data_files=[('share/man/man1', ['rawdog.1'])],
|
|
+ python_requires='>=3',
|
|
packages=['rawdoglib'],
|
|
classifiers=[
|
|
"Development Status :: 5 - Production/Stable",
|
|
|
|
From afbb8cda6b8b2e8a558c62cb0e20754ac6eb09e8 Mon Sep 17 00:00:00 2001
|
|
From: George Rawlinson <george@rawlinson.net.nz>
|
|
Date: Tue, 27 Sep 2022 20:09:18 +1300
|
|
Subject: [PATCH 4/4] use consistent whitespace (space to tab)
|
|
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 5988b4f..cafe463 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -10,7 +10,7 @@
|
|
url="https://github.com/echarlie/rawdog-py3",
|
|
scripts=['rawdog'],
|
|
data_files=[('share/man/man1', ['rawdog.1'])],
|
|
- python_requires='>=3',
|
|
+ python_requires='>=3',
|
|
packages=['rawdoglib'],
|
|
classifiers=[
|
|
"Development Status :: 5 - Production/Stable",
|