speedtest-cli-ng 0.2.0__tar.gz → 1.0.0__tar.gz

speedtest_cli_ng-1.0.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.2.0 → speedtest_cli_ng-1.0.0}/NOTICE

@@ -2,5 +2,5 @@ speedtest-cli
 Copyright (c) 2026 Michał Korczak
 Copyright (c) 2012-2026 Matt Martz
 
-This product includes software originally developed by Matt Martz 
+This product includes software originally developed by Matt Martz
 (https://github.com/sivel/speedtest-cli).

{speedtest_cli_ng-0.2.0/speedtest_cli_ng.egg-info → speedtest_cli_ng-1.0.0}/PKG-INFO

@@ -1,28 +1,30 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: speedtest-cli-ng
-Version: 0.2.0
+Version: 1.0.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
-Classifier: Development Status :: 4 - Beta
+Author: Michał Korczak
+License-Expression: Apache-2.0
+License-File: LICENSE
+License-File: NOTICE
+Keywords: bandwidth,cli,internet,speedtest,speedtest.net
+Classifier: Development Status :: 5 - Production/Stable
 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.12.0
+Requires-Dist: rich<16,>=15.0.0
 Description-Content-Type: text/markdown
-License-File: LICENSE
-License-File: NOTICE
-Dynamic: license-file
 
 # speedtest-cli
 
@@ -34,8 +36,6 @@ Dynamic: license-file
 
 Next generation CLI for testing internet bandwidth using speedtest.net
 
-Rebuilt for modern Python 3.12+
-
 ## Getting started
 
 ### Installation
@@ -110,12 +110,22 @@ Miscellaneous Options:
 
 ### Requirements
 
-- Python 3.12+
-- uv 0.11+
+- Python 3.14+
+- uv 0.13+
+- prek 0.5+
 
-### Setup project
+### Setup pre-commit hooks
 
-This will install project's dependencies. Keep in mind that there are no runtime dependencies in production.
+You can install hooks to automatically run the validation checks:
+
+```shell
+uv tool install prek
+prek install
+```
+
+### Install dependencies
+
+This will install project's dependencies
 
 ```bash
 uv sync
@@ -124,6 +134,12 @@ uv sync
 ### Basic workflow
 
 ```bash
+# Run pre-commit checks for changed files
+prek
+
+# Run all pre-commit checks
+prek --all-files
+
 # Run format
 uv run ruff format --check .
 
@@ -131,7 +147,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,7 +169,7 @@ This project is a heavily refactored and modernized fork of the original [speedt
 
 ## 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.2.0 → speedtest_cli_ng-1.0.0}/README.md

@@ -8,8 +8,6 @@
 
 Next generation CLI for testing internet bandwidth using speedtest.net
 
-Rebuilt for modern Python 3.12+
-
 ## Getting started
 
 ### Installation
@@ -84,12 +82,22 @@ Miscellaneous Options:
 
 ### Requirements
 
-- Python 3.12+
-- uv 0.11+
+- Python 3.14+
+- uv 0.13+
+- prek 0.5+
+
+### Setup pre-commit hooks
 
-### Setup project
+You can install hooks to automatically run the validation checks:
+
+```shell
+uv tool install prek
+prek install
+```
 
-This will install project's dependencies. Keep in mind that there are no runtime dependencies in production.
+### Install dependencies
+
+This will install project's dependencies
 
 ```bash
 uv sync
@@ -98,6 +106,12 @@ uv sync
 ### Basic workflow
 
 ```bash
+# Run pre-commit checks for changed files
+prek
+
+# Run all pre-commit checks
+prek --all-files
+
 # Run format
 uv run ruff format --check .
 
@@ -105,7 +119,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,7 +141,7 @@ This project is a heavily refactored and modernized fork of the original [speedt
 
 ## 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-1.0.0/prek.toml

@@ -0,0 +1,69 @@
+minimum_prek_version = "0.5.10"
+
+[update]
+cooldown_days = 7
+freeze = true
+include_tags = "v*"
+exclude_tags = ["*-{alpha,beta,rc}*"]
+repos = {
+  "https://github.com/python-jsonschema/check-jsonschema" = { include_tags = "*" },
+  "https://github.com/astral-sh/uv-pre-commit" = { include_tags = "*" }
+}
+
+[[repos]]
+repo = "builtin"
+hooks = [
+  { id = "check-merge-conflict" },
+  { id = "trailing-whitespace" },
+  { id = "end-of-file-fixer" },
+  { id = "mixed-line-ending" },
+  { id = "check-json" },
+  { id = "check-json5" },
+  { id = "check-toml" },
+  { id = "check-yaml" },
+]
+
+[[repos]]
+repo = "https://github.com/abravalheri/validate-pyproject"
+rev = "82d21874c3242e4dc27bb47641c996902ef64eef"  # frozen: v0.27
+hooks = [
+  { id = "validate-pyproject" },
+]
+
+[[repos]]
+repo = "https://github.com/python-jsonschema/check-jsonschema"
+rev = "a76b92851fc9eede9f9bc4073eb55202f34eb0df"  # frozen: 0.39.0
+hooks = [
+  { id = "check-github-workflows" },
+  { id = "check-renovate", additional_dependencies = ['json5'] },
+]
+
+# zizmor detects security vulnerabilities in GitHub Actions workflows
+[[repos]]
+repo = "https://github.com/zizmorcore/zizmor-pre-commit"
+rev = "c92afdf2c6ca336aaa8f39e2bd8d48f62dbd8e1f"  # frozen: v1.31.1
+hooks = [
+  { id = "zizmor", args = ["--no-progress", "--fix"] },
+]
+
+[[repos]]
+repo = "https://github.com/astral-sh/uv-pre-commit"
+rev = "46787482b9fb2003c56e0f7592e312ef381829d9"  # frozen: 0.13.6
+hooks = [
+  { id = "uv-lock" },
+]
+
+[[repos]]
+repo = "https://github.com/astral-sh/ruff-pre-commit"
+rev = "25bcf95026b96e2dd3c0aec3090c3d6ef6ca2e6c"  # frozen: v0.17.3
+hooks = [
+  { id = "ruff-check", args = ["--fix", "--exit-non-zero-on-fix"] },
+  { id = "ruff-format", types_or = ["python", "pyi", "jupyter", "markdown"] },
+]
+
+[[repos]]
+repo = "https://github.com/astral-sh/ty-pre-commit"
+rev = "18b2b8bb1b9b90d2d21283756e89b07fc9c747bf"  # frozen: v0.0.95
+hooks = [
+  { id = "ty" },
+]

{speedtest_cli_ng-0.2.0 → speedtest_cli_ng-1.0.0}/pyproject.toml

@@ -1,33 +1,34 @@
 [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.2.0"
-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 = "1.0.0"
+requires-python = ">=3.14"
+authors = [{ name = "Michał Korczak" }]
 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",
+    "Development Status :: 5 - Production/Stable",
     "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.12.0,<3",
+    "rich>=15.0.0,<16",
+]
 
 [project.urls]
 Homepage = "https://github.com/Omikorin/speedtest-cli"
@@ -37,16 +38,31 @@ 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.*"]
+[dependency-groups]
+dev = [
+    # Tests
+    "pytest>=9.1.1,<10",
+    "pytest-cov>=7.1.0,<8",
+    # Linting
+    "ruff>=0.16.4,<1",
+    "ty>=0.0.73,<1",
+]
+
+[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"
+required-version = ">=0.13.0"
+exclude-newer = "7 days"
 
 [[tool.uv.index]]
 name = "testpypi"
@@ -55,42 +71,36 @@ 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 = [
+extend-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-branch", "--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-1.0.0/src/speedtest/__init__.py

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

{speedtest_cli_ng-0.2.0 → speedtest_cli_ng-1.0.0/src}/speedtest/__main__.py

@@ -4,25 +4,22 @@ 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):
@@ -31,10 +28,10 @@ def main() -> int:
 
         return int(code)
 
-    except Exception as e:
-        logger.exception("An unexpected error occurred.", e)
+    except OSError, RuntimeError, ValueError:
+        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-1.0.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-1.0.0/src/speedtest/cli/__init__.py

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