TildeClub/ttrv
1
0
Fork 0
mirror of https://github.com/tildeclub/ttrv.git synced 2026-06-27 06:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modernize Python packaging/deprecation cleanup

Browse Source
This commit is contained in:
deepend-tildeclub
2026-06-18 11:41:33 -06:00
parent 3a99a87755
commit e1f3766512
4 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
setup.py
View File

@@ -1,8 +1,6 @@
import sys
import codecs
import setuptools import setuptools
from version import __version__ as version from ttrv.__version__ import __version__ as version
install_requires = [ install_requires = [
@@ -15,7 +13,7 @@ install_requires = [
tests_require = [ tests_require = [
'coveralls', 'coveralls',
'pytest>=3.1.0', # Pinned for the ``pytest.param`` method 'pytest>=8.3.0',
'coverage', 'coverage',
'mock', 'mock',
'pylint', 'pylint',
@@ -26,20 +24,8 @@ extras_require = {
'test': tests_require 'test': tests_require
} }
# https://hynek.me/articles/conditional-python-dependencies/
if int(setuptools.__version__.split(".", 1)[0]) < 18:
assert "bdist_wheel" not in sys.argv
if sys.version_info[0:2] < (3, 6):
install_requires.append("mailcap-fix")
else:
# Building the bdist_wheel with conditional environment dependencies
# requires setuptools version > 18. For older setuptools versions this
# will raise an error.
extras_require.update({":python_version<'3.6'": ["mailcap-fix"]})
def long_description(): def long_description():
with codecs.open('README.md', encoding='utf8') as f: with open('README.md', encoding='utf8') as f:
return f.read() return f.read()
@@ -65,8 +51,8 @@ setuptools.setup(
}, },
data_files=[("share/man/man1", ["ttrv.1"])], data_files=[("share/man/man1", ["ttrv.1"])],
install_requires=install_requires, install_requires=install_requires,
tests_require=tests_require,
extras_require=extras_require, extras_require=extras_require,
python_requires='>=3.9',
entry_points={'console_scripts': ['ttrv=ttrv.__main__:main']}, entry_points={'console_scripts': ['ttrv=ttrv.__main__:main']},
classifiers=[ classifiers=[
'Intended Audience :: End Users/Desktop', 'Intended Audience :: End Users/Desktop',
@@ -74,11 +60,13 @@ setuptools.setup(
'Operating System :: MacOS :: MacOS X', 'Operating System :: MacOS :: MacOS X',
'Operating System :: POSIX', 'Operating System :: POSIX',
'Natural Language :: English', 'Natural Language :: English',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: 3.14',
'Topic :: Terminals', 'Topic :: Terminals',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: News/Diary',

2
ttrv/config.py
View File

@@ -253,7 +253,7 @@ class Config(object):
config = configparser.ConfigParser() config = configparser.ConfigParser()
if os.path.exists(filename): if os.path.exists(filename):
with codecs.open(filename, encoding='utf-8') as fp: with codecs.open(filename, encoding='utf-8') as fp:
config.readfp(fp) config.read_file(fp)
return cls._parse_ttrv_file(config) return cls._parse_ttrv_file(config)

2
ttrv/packages/praw/decorators.py
View File

@@ -38,7 +38,7 @@ from warnings import filterwarnings, warn
# Enable deprecation warnings from this module # Enable deprecation warnings from this module
filterwarnings('default', category=DeprecationWarning, filterwarnings('default', category=DeprecationWarning,
module='^praw\.decorators$') module=r'^praw\.decorators$')
def alias_function(function, class_name): def alias_function(function, class_name):

2
ttrv/theme.py
View File

@@ -399,7 +399,7 @@ class Theme(object):
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.optionxform = six.text_type # Preserve case config.optionxform = six.text_type # Preserve case
with codecs.open(filename, encoding='utf-8') as fp: with codecs.open(filename, encoding='utf-8') as fp:
config.readfp(fp) config.read_file(fp)
except configparser.ParsingError as e: except configparser.ParsingError as e:
raise ConfigError(e.message) raise ConfigError(e.message)