update setup.py

- add Python version check
- add classifiers
- simplify sys.exit() usage
pull/133/head
Mike Fährmann 6 years ago
parent fd8ed35591
commit a36259d8f1
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -16,9 +16,8 @@ __email__ = "mike_faehrmann@web.de"
import sys import sys
if sys.hexversion < 0x3030000: if sys.hexversion < 0x3040000:
print("Python 3.4+ required", file=sys.stderr) sys.exit("Python 3.4+ required")
sys.exit(1)
import json import json
import logging import logging

@ -6,4 +6,4 @@
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation. # published by the Free Software Foundation.
__version__ = "1.5.4-dev" __version__ = "1.6.0-dev"

@ -1,9 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals, print_function
import sys import sys
import os.path import os.path
if sys.hexversion < 0x3040000:
sys.exit("Python 3.4+ required")
try: try:
from setuptools import setup from setuptools import setup
@ -14,7 +18,9 @@ except ImportError:
def read(fname): def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname), encoding='utf-8').read() path = os.path.join(os.path.dirname(__file__), fname)
with open(path, encoding="utf-8") as file:
return file.read()
# get version without importing the package # get version without importing the package
@ -28,8 +34,7 @@ if "py2exe" in sys.argv:
try: try:
import py2exe import py2exe
except ImportError: except ImportError:
print("Error importing 'py2exe'", file=sys.stderr) sys.exit("Error importing 'py2exe'")
exit(1)
params = { params = {
"console": [{ "console": [{
"script": "./gallery_dl/__main__.py", "script": "./gallery_dl/__main__.py",
@ -93,12 +98,15 @@ setup(
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Operating System :: Microsoft :: Windows", "Operating System :: Microsoft :: Windows",
"Operating System :: POSIX", "Operating System :: POSIX",
"Operating System :: MacOS",
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3 :: Only",
"Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP",
"Topic :: Multimedia :: Graphics", "Topic :: Multimedia :: Graphics",
"Topic :: Utilities",
], ],
test_suite="test", test_suite="test",
**params **params

Loading…
Cancel
Save