speedtest-cli-ng 0.1.1__tar.gz → 0.3.0__tar.gz

speedtest_cli_ng-0.3.0/.gitignore

@@ -0,0 +1,220 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[codz]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#   Usually these files are written by an python script from a template
+#   before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py.cover
+*.lcov
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+# Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+# uv.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+# poetry.lock
+# poetry.toml
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#   pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
+#   https://pdm-project.org/en/latest/usage/project/#working-with-version-control
+# pdm.lock
+# pdm.toml
+.pdm-python
+.pdm-build/
+
+# pixi
+#   Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
+# pixi.lock
+#   Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
+#   in the .venv directory. It is recommended not to include this directory in version control.
+.pixi/*
+!.pixi/config.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule*
+celerybeat.pid
+
+# Redis
+*.rdb
+*.aof
+*.pid
+
+# RabbitMQ
+mnesia/
+rabbitmq/
+rabbitmq-data/
+
+# ActiveMQ
+activemq-data/
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.envrc
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#   JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#   be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#   and can be added to the global gitignore or merged into this file.  For a more nuclear
+#   option (not recommended) you can uncomment the following to ignore the entire idea folder.
+# .idea/
+
+# Abstra
+#   Abstra is an AI-powered process automation framework.
+#   Ignore directories containing user credentials, local state, and settings.
+#   Learn more at https://abstra.io/docs
+.abstra/
+
+# Visual Studio Code
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
+#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
+#   you could uncomment the following to ignore the entire vscode folder
+# .vscode/
+# Temporary file for partial code execution
+tempCodeRunnerFile.py
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# Marimo
+marimo/_static/
+marimo/_lsp/
+__marimo__/
+
+# Streamlit
+.streamlit/secrets.toml

{speedtest_cli_ng-0.1.1/speedtest_cli_ng.egg-info → speedtest_cli_ng-0.3.0}/PKG-INFO

@@ -1,40 +1,44 @@
 Metadata-Version: 2.4
 Name: speedtest-cli-ng
-Version: 0.1.1
+Version: 0.3.0
 Summary: Next generation CLI for testing internet bandwidth using speedtest.net
-Author-email: Michał Korczak <git@omikor.in>
-License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/Omikorin/speedtest-cli
 Project-URL: Source, https://github.com/Omikorin/speedtest-cli
 Project-URL: Issues, https://github.com/Omikorin/speedtest-cli/issues
-Keywords: speedtest,speedtest.net,bandwidth,internet,cli
+Author-email: Michał Korczak <git@omikor.in>
+License-Expression: Apache-2.0
+License-File: LICENSE
+License-File: NOTICE
+Keywords: bandwidth,cli,internet,speedtest,speedtest.net
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: Terminals
 Classifier: Topic :: Utilities
-Requires-Python: >=3.12
+Requires-Python: >=3.14
+Requires-Dist: httpx2<3,>=2.5.0
+Requires-Dist: rich<16,>=15.0.0
 Description-Content-Type: text/markdown
-License-File: LICENSE
-License-File: NOTICE
-Dynamic: license-file
 
 # speedtest-cli
 
 [![PyPI version](https://img.shields.io/pypi/v/speedtest-cli-ng.svg)](https://github.com/Omikorin/speedtest-cli)
 [![PyPI license](https://img.shields.io/pypi/l/speedtest-cli-ng.svg)](https://github.com/Omikorin/speedtest-cli)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/speedtest-cli-ng.svg)](https://github.com/Omikorin/speedtest-cli)
-<!-- [![GitHub  License](https://img.shields.io/github/license/Omikorin/speedtest-cli)](https://github.com/Omikorin/speedtest-cli/blob/main/LICENSE) -->
-<!-- TODO: SonarQube, GitHub Actions? -->
+[![CI](https://github.com/Omikorin/speedtest-cli/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Omikorin/speedtest-cli/actions/workflows/ci.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Omikorin_speedtest-cli&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Omikorin_speedtest-cli)
+
+---
 
 Next generation CLI for testing internet bandwidth using speedtest.net
 
-Rebuilt for modern Python 3.12+
+Rebuilt for modern Python 3.14+
 
 ## Getting started
 
@@ -75,15 +79,14 @@ speedtest-cli --help
 ```
 
 ```text
-usage: speedtest-cli [-h] [-l] [-s SERVER] [--no-download] [--no-upload] [-t THREADS | --single]
-                     [--share] [--bytes] [--csv | --json] [--csv-delimiter CSV_DELIMITER]
-                     [--csv-header] [--source SOURCE] [--timeout TIMEOUT] [--debug] [--version]
+usage: speedtest-cli [-h] [-l] [-s SERVER] [--no-download] [--no-upload]
+                     [-t THREADS | --single] [--share] [--bytes] [--json]
+                     [--debug] [--version]
 
 Next generation CLI for testing internet bandwidth using speedtest.net.
 
 options:
   -h, --help            show this help message and exit
-  --version             show program's version number and exit
 
 Core Options:
   -l, --list            Show available speedtest.net servers sorted by distance. (default: False)
@@ -99,24 +102,19 @@ Transfer Modifiers:
 
 Output Options:
   --share               Generate and provide a URL to the speedtest.net share results image. (default: False)
-  --bytes               Display values in bytes instead of bits. Does not affect image generation or JSON/CSV output. (default: ('bit', 1))
-  --csv                 Suppress verbose output, only show basic information in CSV format. Speeds listed in bit/s. (default: False)
+  --bytes               Display values in bytes instead of bits. Does not affect image generation or JSON output. (default: ('bit', 1))
   --json                Suppress verbose output, only show basic information in JSON format. Speeds listed in bit/s. (default: False)
-  --csv-delimiter CSV_DELIMITER
-                        Single character delimiter to use in CSV output. (default: ,)
-  --csv-header          Print CSV headers and exit. (default: False)
 
-Connection Options:
-  --source SOURCE       Bind a source IP address to use for connections. (default: None)
-  --timeout TIMEOUT     HTTP timeout in seconds. (default: 10.0)
+Miscellaneous Options:
   --debug               Show verbose debugging output. (default: False)
+  --version             show program's version number and exit
 ```
 
 ## Development
 
 ### Requirements
 
-- Python 3.12+
+- Python 3.14+
 - uv 0.11+
 
 ### Setup project
@@ -137,7 +135,7 @@ uv run ruff format --check .
 uv run ruff check .
 
 # Run typecheck
-uv run pyright
+uv run ty check
 
 # Run tests
 uv run pytest
@@ -153,14 +151,13 @@ uv run build
 
 The output will be in the `dist/` directory.
 
-
 ## Acknowledgments
 
 This project is a heavily refactored and modernized fork of the original [speedtest-cli](https://github.com/sivel/speedtest-cli) created by Matt Martz. While the codebase has been completely rewritten to support modern Python standards, concurrent thread pools, and memory-safe streaming, it was built upon the foundational concepts of the original tool.
 
 ## License
 
-This project is licensed undeer the [Apache License 2.0](https://github.com/Omikorin/speedtest-cli/blob/main/LICENSE).
+This project is licensed under the terms of the [Apache License 2.0](https://github.com/Omikorin/speedtest-cli/blob/main/LICENSE).
 
 ---
 

{speedtest_cli_ng-0.1.1 → speedtest_cli_ng-0.3.0}/README.md

@@ -3,12 +3,14 @@
 [![PyPI version](https://img.shields.io/pypi/v/speedtest-cli-ng.svg)](https://github.com/Omikorin/speedtest-cli)
 [![PyPI license](https://img.shields.io/pypi/l/speedtest-cli-ng.svg)](https://github.com/Omikorin/speedtest-cli)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/speedtest-cli-ng.svg)](https://github.com/Omikorin/speedtest-cli)
-<!-- [![GitHub  License](https://img.shields.io/github/license/Omikorin/speedtest-cli)](https://github.com/Omikorin/speedtest-cli/blob/main/LICENSE) -->
-<!-- TODO: SonarQube, GitHub Actions? -->
+[![CI](https://github.com/Omikorin/speedtest-cli/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Omikorin/speedtest-cli/actions/workflows/ci.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Omikorin_speedtest-cli&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Omikorin_speedtest-cli)
+
+---
 
 Next generation CLI for testing internet bandwidth using speedtest.net
 
-Rebuilt for modern Python 3.12+
+Rebuilt for modern Python 3.14+
 
 ## Getting started
 
@@ -49,15 +51,14 @@ speedtest-cli --help
 ```
 
 ```text
-usage: speedtest-cli [-h] [-l] [-s SERVER] [--no-download] [--no-upload] [-t THREADS | --single]
-                     [--share] [--bytes] [--csv | --json] [--csv-delimiter CSV_DELIMITER]
-                     [--csv-header] [--source SOURCE] [--timeout TIMEOUT] [--debug] [--version]
+usage: speedtest-cli [-h] [-l] [-s SERVER] [--no-download] [--no-upload]
+                     [-t THREADS | --single] [--share] [--bytes] [--json]
+                     [--debug] [--version]
 
 Next generation CLI for testing internet bandwidth using speedtest.net.
 
 options:
   -h, --help            show this help message and exit
-  --version             show program's version number and exit
 
 Core Options:
   -l, --list            Show available speedtest.net servers sorted by distance. (default: False)
@@ -73,24 +74,19 @@ Transfer Modifiers:
 
 Output Options:
   --share               Generate and provide a URL to the speedtest.net share results image. (default: False)
-  --bytes               Display values in bytes instead of bits. Does not affect image generation or JSON/CSV output. (default: ('bit', 1))
-  --csv                 Suppress verbose output, only show basic information in CSV format. Speeds listed in bit/s. (default: False)
+  --bytes               Display values in bytes instead of bits. Does not affect image generation or JSON output. (default: ('bit', 1))
   --json                Suppress verbose output, only show basic information in JSON format. Speeds listed in bit/s. (default: False)
-  --csv-delimiter CSV_DELIMITER
-                        Single character delimiter to use in CSV output. (default: ,)
-  --csv-header          Print CSV headers and exit. (default: False)
 
-Connection Options:
-  --source SOURCE       Bind a source IP address to use for connections. (default: None)
-  --timeout TIMEOUT     HTTP timeout in seconds. (default: 10.0)
+Miscellaneous Options:
   --debug               Show verbose debugging output. (default: False)
+  --version             show program's version number and exit
 ```
 
 ## Development
 
 ### Requirements
 
-- Python 3.12+
+- Python 3.14+
 - uv 0.11+
 
 ### Setup project
@@ -111,7 +107,7 @@ uv run ruff format --check .
 uv run ruff check .
 
 # Run typecheck
-uv run pyright
+uv run ty check
 
 # Run tests
 uv run pytest
@@ -127,14 +123,13 @@ uv run build
 
 The output will be in the `dist/` directory.
 
-
 ## Acknowledgments
 
 This project is a heavily refactored and modernized fork of the original [speedtest-cli](https://github.com/sivel/speedtest-cli) created by Matt Martz. While the codebase has been completely rewritten to support modern Python standards, concurrent thread pools, and memory-safe streaming, it was built upon the foundational concepts of the original tool.
 
 ## License
 
-This project is licensed undeer the [Apache License 2.0](https://github.com/Omikorin/speedtest-cli/blob/main/LICENSE).
+This project is licensed under the terms of the [Apache License 2.0](https://github.com/Omikorin/speedtest-cli/blob/main/LICENSE).
 
 ---
 

{speedtest_cli_ng-0.1.1 → speedtest_cli_ng-0.3.0}/pyproject.toml

@@ -1,33 +1,44 @@
 [build-system]
-requires = ["setuptools>=80.0.0", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "speedtest-cli-ng"
-version = "0.1.1"
-authors = [
-    {name = "Michał Korczak", email = "git@omikor.in"}
-    # TODO: I'm not sure whether I should put the old author because of possible spam for him unknowingly etc
-    # {name = "Matt Martz", email = "matt@sivel.net"}
-]
+description = "Next generation CLI for testing internet bandwidth using speedtest.net"
+keywords = ["speedtest", "speedtest.net", "bandwidth", "internet", "cli"]
 license = "Apache-2.0"
+version = "0.3.0"
+requires-python = ">=3.14"
+authors = [{ name = "Michał Korczak", email = "git@omikor.in" }]
 license-files = ["LICENSE", "NOTICE"]
-description = "Next generation CLI for testing internet bandwidth using speedtest.net"
 readme = "README.md"
-requires-python = ">=3.12"
-keywords = ["speedtest", "speedtest.net", "bandwidth", "internet", "cli"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
     "Intended Audience :: Developers",
     "Intended Audience :: System Administrators",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: System :: Networking",
     "Topic :: Terminals",
     "Topic :: Utilities",
 ]
+dependencies = [
+    "httpx2>=2.5.0,<3",
+    "rich>=15.0.0,<16",
+]
+
+[dependency-groups]
+dev = [
+    # Tests
+    "pytest>=9.0.0,<10",
+    "pytest-cov>=7.0.0,<8",
+    # Linting
+    "ruff>=0.15.0,<1",
+    "ty>=0.0.55,<1",
+]
 
 [project.urls]
 Homepage = "https://github.com/Omikorin/speedtest-cli"
@@ -37,16 +48,21 @@ Issues = "https://github.com/Omikorin/speedtest-cli/issues"
 [project.scripts]
 speedtest = "speedtest.__main__:main"
 speedtest-cli = "speedtest.__main__:main"
+speedtest-cli-ng = "speedtest.__main__:main"
 
-# Tool-specific configurations
-[tool.setuptools.packages.find]
-include = ["speedtest", "speedtest.*"]
+[tool.hatch.build.targets.sdist]
+exclude = [
+    ".github",
+    ".python-version",
+    "renovate.json5",
+]
 
-[tool.setuptools.data-files]
-"share/man/man1" = ["extras/man/speedtest-cli.1"]
+[tool.hatch.build.targets.wheel]
+packages = ["src/speedtest"]
 
 [tool.uv]
 required-version = ">=0.11.0"
+exclude-newer = "7 days"
 
 [[tool.uv.index]]
 name = "testpypi"
@@ -55,42 +71,37 @@ publish-url = "https://test.pypi.org/legacy/"
 explicit = true
 
 [tool.ruff]
-target-version = "py312"
-line-length = 100
+line-length = 120
 src = ["speedtest", "tests"]
 
 [tool.ruff.lint]
 select = [
+    "ANN", # flake8 annotations
+    "B",   # flake8 bugbear
+    "PYI", # flake8 pyi
     "E",   # pycodestyle errors
     "W",   # pycodestyle warnings
     "F",   # pyflakes
-    "I",   # isort (automatically sorts imports)
-    "UP",  # pyupgrade (automatically upgrades syntax to modern Python 3.12 standards)
+    "I",   # isort
+    "N",   # pep8 naming
+    "UP",  # pyupgrade
     "RUF", # ruff-specific rules
 ]
+preview = true
 ignore = []
+unfixable = ["B"]
 
 [tool.ruff.format]
 quote-style = "double"
 indent-style = "space"
 
-[tool.pyright]
-include = ["speedtest", "tests"]
-pythonVersion = "3.12"
-typeCheckingMode = "standard" # Can be bumped to "strict" once codebase is fully annotated
-useLibraryCodeForTypes = true
-reportMissingImports = true
+[tool.ty.rules]
+missing-type-argument = "error"
+possibly-unresolved-reference = "warn"
 
 [tool.pytest]
 minversion = "9.0"
 # Automatically show extra test info, fail if coverage drops, and output a terminal coverage report
-addopts = "-v --cov=speedtest --cov-report=term-missing"
+addopts = ["-v", "--cov=speedtest", "--cov-report=term-missing"]
 testpaths = ["tests"]
 
-[dependency-groups]
-dev = [
-    "pyright>=1.1.400",
-    "pytest>=9.0.0",
-    "pytest-cov>=7.0.0",
-    "ruff>=0.15.0",
-]

speedtest_cli_ng-0.3.0/src/speedtest/__init__.py

@@ -0,0 +1,3 @@
+from .__version__ import __description__, __title__, __version__
+
+__all__ = ["__description__", "__title__", "__version__"]

{speedtest_cli_ng-0.1.1 → speedtest_cli_ng-0.3.0/src}/speedtest/__main__.py

@@ -4,37 +4,34 @@ The main entry point. Invoke as `speedtest-cli` or `python -m speedtest`.
 
 import sys
 
-from speedtest.cli.main import shell
-from speedtest.exceptions import SpeedtestException
-from speedtest.utils.logger import logger
-from speedtest.utils.status import ExitStatus
+from speedtest.cli import shell
+from speedtest.exceptions import SpeedtestError
+from speedtest.utils import ExitStatus, logger
 
 
 def main() -> int:
     """Execute the CLI and return an integer exit status."""
 
     try:
-        exit_status = shell()
-
-        return int(exit_status)
+        return shell()
 
     except KeyboardInterrupt:
         logger.error("Stopped by user")
         return ExitStatus.ERROR_CTRL_C.value
 
-    except SpeedtestException as e:
+    except SpeedtestError as e:
         code = getattr(e, "code", ExitStatus.ERROR.value)
 
         if code not in (ExitStatus.SUCCESS.value, ExitStatus.ERROR_CTRL_C.value):
             msg = str(e) or repr(e)
-            logger.error(f"ERROR: {msg}")
+            logger.error(msg)
 
         return int(code)
 
-    except Exception as e:
-        logger.exception("An unexpected error occurred.", e)
+    except Exception:
+        logger.exception("An unexpected error occurred.")
         return ExitStatus.ERROR.value
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     sys.exit(main())

speedtest_cli_ng-0.3.0/src/speedtest/__version__.py

@@ -0,0 +1,5 @@
+from importlib.metadata import version
+
+__title__ = "speedtest-cli-ng"
+__description__ = "Next generation CLI for testing internet bandwidth using speedtest.net"
+__version__ = version("speedtest-cli-ng")

speedtest_cli_ng-0.3.0/src/speedtest/cli/__init__.py

@@ -0,0 +1,7 @@
+"""
+Command-line interface module.
+"""
+
+from .runner import shell
+
+__all__ = ["shell"]