Merge 7906c4bdc3 into 22210ca352
This commit is contained in:
notmarrco
GitHub
commit
8e795b0b8e
88
setup.py
88
setup.py
|
|
@ -15,9 +15,9 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import codecs
|
||||
import os
|
||||
import re
|
||||
import codecs
|
||||
|
||||
from setuptools import setup
|
||||
|
||||
|
|
@ -31,16 +31,15 @@ def find_version(*file_paths):
|
|||
# Open in Latin-1 so that we avoid encoding errors.
|
||||
# Use codecs.open for Python 2 compatibility
|
||||
try:
|
||||
f = codecs.open(os.path.join(here, *file_paths), 'r', 'latin1')
|
||||
f = codecs.open(os.path.join(here, *file_paths), "r", "latin1")
|
||||
version_file = f.read()
|
||||
f.close()
|
||||
except:
|
||||
except Exception:
|
||||
raise RuntimeError("Unable to find version string.")
|
||||
|
||||
# The version line must have the form
|
||||
# __version__ = 'ver'
|
||||
version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
|
||||
version_file, re.M)
|
||||
version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
|
||||
if version_match:
|
||||
return version_match.group(1)
|
||||
raise RuntimeError("Unable to find version string.")
|
||||
|
|
@ -48,52 +47,53 @@ def find_version(*file_paths):
|
|||
|
||||
# Get the long description from the relevant file
|
||||
try:
|
||||
f = codecs.open('README.rst', encoding='utf-8')
|
||||
f = codecs.open("README.rst", encoding="utf-8")
|
||||
long_description = f.read()
|
||||
f.close()
|
||||
except:
|
||||
long_description = ''
|
||||
except Exception:
|
||||
long_description = ""
|
||||
|
||||
|
||||
setup(
|
||||
name='speedtest-cli',
|
||||
version=find_version('speedtest.py'),
|
||||
description=('Command line interface for testing internet bandwidth using '
|
||||
'speedtest.net'),
|
||||
name="speedtest-cli",
|
||||
version=find_version("speedtest.py"),
|
||||
description=(
|
||||
"Command line interface for testing internet bandwidth using " "speedtest.net"
|
||||
),
|
||||
long_description=long_description,
|
||||
keywords='speedtest speedtest.net',
|
||||
author='Matt Martz',
|
||||
author_email='matt@sivel.net',
|
||||
url='https://github.com/sivel/speedtest-cli',
|
||||
license='Apache License, Version 2.0',
|
||||
py_modules=['speedtest'],
|
||||
keywords="speedtest speedtest.net",
|
||||
author="Matt Martz",
|
||||
author_email="matt@sivel.net",
|
||||
url="https://github.com/sivel/speedtest-cli",
|
||||
license="Apache License, Version 2.0",
|
||||
py_modules=["speedtest"],
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'speedtest=speedtest:main',
|
||||
'speedtest-cli=speedtest:main'
|
||||
]
|
||||
"console_scripts": [
|
||||
"speedtest=speedtest:main",
|
||||
"speedtest-cli=speedtest:main",
|
||||
],
|
||||
},
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Programming Language :: Python',
|
||||
'Environment :: Console',
|
||||
'License :: OSI Approved :: Apache Software License',
|
||||
'Operating System :: OS Independent',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.4',
|
||||
'Programming Language :: Python :: 2.5',
|
||||
'Programming Language :: Python :: 2.6',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.1',
|
||||
'Programming Language :: Python :: 3.2',
|
||||
'Programming Language :: Python :: 3.3',
|
||||
'Programming Language :: Python :: 3.4',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: Python :: 3.8',
|
||||
'Programming Language :: Python :: 3.9',
|
||||
'Programming Language :: Python :: 3.10',
|
||||
]
|
||||
"Development Status :: 5 - Production/Stable",
|
||||
"Programming Language :: Python",
|
||||
"Environment :: Console",
|
||||
"License :: OSI Approved :: Apache Software License",
|
||||
"Operating System :: OS Independent",
|
||||
"Programming Language :: Python :: 2",
|
||||
"Programming Language :: Python :: 2.4",
|
||||
"Programming Language :: Python :: 2.5",
|
||||
"Programming Language :: Python :: 2.6",
|
||||
"Programming Language :: Python :: 2.7",
|
||||
"Programming Language :: Python :: 3",
|
||||
"Programming Language :: Python :: 3.1",
|
||||
"Programming Language :: Python :: 3.2",
|
||||
"Programming Language :: Python :: 3.3",
|
||||
"Programming Language :: Python :: 3.4",
|
||||
"Programming Language :: Python :: 3.5",
|
||||
"Programming Language :: Python :: 3.6",
|
||||
"Programming Language :: Python :: 3.7",
|
||||
"Programming Language :: Python :: 3.8",
|
||||
"Programming Language :: Python :: 3.9",
|
||||
"Programming Language :: Python :: 3.10",
|
||||
],
|
||||
)
|
||||
|
|
|
|||
1158
speedtest.py
1158
speedtest.py
File diff suppressed because it is too large
Load Diff
|
|
@ -15,23 +15,19 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
cmd = [sys.executable, 'speedtest.py', '--source', '127.0.0.1']
|
||||
cmd = [sys.executable, "speedtest.py", "--source", "127.0.0.1"]
|
||||
|
||||
p = subprocess.Popen(
|
||||
cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE
|
||||
)
|
||||
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
|
||||
stdout, stderr = p.communicate()
|
||||
|
||||
if p.returncode != 1:
|
||||
raise SystemExit('%s did not fail with exit code 1' % ' '.join(cmd))
|
||||
raise SystemExit(f"{' '.join(cmd)} did not fail with exit code 1")
|
||||
|
||||
if 'Invalid argument'.encode() not in stderr:
|
||||
if "Invalid argument".encode() not in stderr:
|
||||
raise SystemExit(
|
||||
'"Invalid argument" not found in stderr:\n%s' % stderr.decode()
|
||||
f'"Invalid argument" not found in stderr:\n{stderr.decode()}',
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue