pyopensky 2.8__tar.gz → 2.10__tar.gz

pyopensky-2.10/.gitignore

@@ -0,0 +1,34 @@
+.vscode/
+.DS_Store
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+.pytest_cache/
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+

{pyopensky-2.8 → pyopensky-2.10}/PKG-INFO

@@ -1,28 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pyopensky
-Version: 2.8
+Version: 2.10
 Summary: A Python interface for OpenSky database
-Home-page: https://github.com/open-aviation/pyopensky/
-License: MIT
-Author: Xavier Olive
-Author-email: git@xoolive.org
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: appdirs (>=1.4.4)
-Requires-Dist: httpx (>=0.27.0,<0.28.0)
-Requires-Dist: minio (>=7.1)
-Requires-Dist: pandas (>=1.5)
-Requires-Dist: pyarrow (>=11.0.0)
-Requires-Dist: pyjwt (>=2.7.0)
-Requires-Dist: tqdm (>=4.65.0)
-Requires-Dist: trino[sqlalchemy] (>=0.322)
-Requires-Dist: typing-extensions (>=4.5.0)
 Project-URL: Repository, https://github.com/open-aviation/pyopensky/
+Author-email: Xavier Olive <git@xoolive.org>, Junzi Sun <j.sun-1@tudelft.nl>
+License-Expression: MIT
+Requires-Python: >=3.9
+Requires-Dist: appdirs>=1.4.4
+Requires-Dist: httpx>=0.27.2
+Requires-Dist: minio>=7.2.8
+Requires-Dist: pandas>=2.2.2
+Requires-Dist: pyarrow>=17.0.0
+Requires-Dist: pyjwt>=2.9.0
+Requires-Dist: tqdm>=4.66.5
+Requires-Dist: trino[sqlalchemy]>=0.329.0
+Requires-Dist: typing-extensions>=4.12.2
+Provides-Extra: cartes
+Requires-Dist: cartes>=0.8.1; extra == 'cartes'
+Provides-Extra: decoding
+Requires-Dist: pymodes>=2.18; extra == 'decoding'
+Requires-Dist: rs1090>=0.3.8; extra == 'decoding'
 Description-Content-Type: text/markdown
 
 # pyopensky
@@ -43,12 +40,12 @@ The library is also available on conda-forge:
 conda install -c conda-forge pyopensky
 ```
 
-Development mode (with poetry):
+Development mode (with uv):
 
 ```sh
-git clone https://github.com/open-aviation/pyopensky
-cd pyopensky
-poetry install
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Linux and MacOS
+irm https://astral.sh/uv/install.ps1 | iex  # Windows
+uv sync --dev
 ```
 
 ## Credentials
@@ -86,4 +83,3 @@ See details in the [documentation](https://open-aviation.github.io/pyopensky/cre
   trino.history(start, stop, *, callsign, icao24, bounds)
   trino.rawdata(start, stop, *, callsign, icao24, bounds)
   ```
-

pyopensky-2.10/pyproject.toml

@@ -0,0 +1,80 @@
+[project]
+name = "pyopensky"
+version = "2.10"
+description = "A Python interface for OpenSky database"
+authors = [
+  { name = "Xavier Olive", email = "git@xoolive.org" },
+  { name = "Junzi Sun", email = "j.sun-1@tudelft.nl" },
+]
+license = "MIT"
+readme = "readme.md"
+requires-python = ">=3.9"
+dependencies = [
+  "appdirs >= 1.4.4",
+  "httpx >= 0.27.2",
+  "minio >= 7.2.8",
+  "pandas >= 2.2.2",
+  "pyarrow >= 17.0.0",
+  "pyjwt >= 2.9.0",
+  "tqdm >= 4.66.5",
+  "trino[sqlalchemy] >= 0.329.0",
+  "typing-extensions >= 4.12.2",
+]
+
+[project.urls]
+Repository = "https://github.com/open-aviation/pyopensky/"
+
+[project.optional-dependencies]
+cartes = ["cartes>=0.8.1"]
+decoding = ["pymodes>=2.18", "rs1090>=0.3.8"]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.sdist]
+include = ["license.txt", "py.typed"]
+
+[tool.uv]
+dev-dependencies = [
+  "pre-commit >= 3.8.0",
+  "mypy >= 1.11.2",
+  "ruff >= 0.6.3",
+  "pytest >= 8.3.2",
+  "ipykernel >= 6.29.5",
+  "sphinx >= 7.4.7; python_version>'3.11'",
+  "sphinx-design >= 0.6.1; python_version>'3.11'",
+  "sphinx-rtd-theme >= 2.0.0; python_version>'3.11'",
+  "sphinx-autodoc-typehints >= 2.3.0; python_version>'3.11'",
+]
+
+[tool.ruff]
+lint.select = [
+  "E",
+  "W",   # pycodestyle
+  "F",   # pyflakes
+  "I",   # isort
+  "NPY", # numpy
+  # "PD",  # pandas
+  "DTZ", # flake8-datetimez
+  "RUF",
+]
+line-length = 80
+target-version = "py39"
+
+[tool.ruff.lint.isort]
+known-first-party = ["numpy", "pandas"]
+
+[tool.mypy]
+python_version = "3.9"
+platform = "posix"
+color_output = true
+pretty = true
+show_column_numbers = true
+strict = true
+check_untyped_defs = true
+ignore_missing_imports = true
+warn_no_return = true
+warn_redundant_casts = true
+warn_unused_configs = true
+warn_unused_ignores = true

{pyopensky-2.8 → pyopensky-2.10}/readme.md

@@ -16,12 +16,12 @@ The library is also available on conda-forge:
 conda install -c conda-forge pyopensky
 ```
 
-Development mode (with poetry):
+Development mode (with uv):
 
 ```sh
-git clone https://github.com/open-aviation/pyopensky
-cd pyopensky
-poetry install
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Linux and MacOS
+irm https://astral.sh/uv/install.ps1 | iex  # Windows
+uv sync --dev
 ```
 
 ## Credentials

pyopensky-2.8/pyproject.toml

@@ -1,78 +0,0 @@
-[tool.poetry]
-name = "pyopensky"
-version = "2.8"
-description = "A Python interface for OpenSky database"
-repository = "https://github.com/open-aviation/pyopensky/"
-authors = [
-  "Xavier Olive <git@xoolive.org>",
-  "Junzi Sun <j.sun-1@tudelft.nl>"
-]
-license = "MIT"
-readme = "readme.md"
-include = [
-    "license.txt",
-    "py.typed",
-]
-
-[tool.poetry.dependencies]
-python = "^3.9"
-pandas = ">=1.5"
-trino = { version = ">=0.322", extras = ['sqlalchemy'] }
-minio = ">=7.1"
-appdirs = ">=1.4.4"
-tqdm = ">=4.65.0"
-pyarrow = ">=11.0.0"
-typing-extensions = ">=4.5.0"
-pyjwt = ">=2.7.0"
-httpx = "^0.27.0"
-
-[tool.poetry.group.dev.dependencies]
-pre-commit = ">=3.1.1"
-mypy = ">=1.0.1"
-ruff = ">=0.0.253"
-pytest = ">=7.2.1"
-ipykernel = ">=6.21.2"
-Sphinx = ">=5.1"
-sphinx-design = ">=0.4.1"
-sphinx-rtd-theme = ">=0.5.2"
-sphinx-autodoc-typehints = ">=1.17,!=1.21.4"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.black]
-line-length = 80
-target_version = ['py38', 'py39', 'py310', 'py311']
-include = '\.pyi?$'
-
-[tool.ruff]
-lint.select = [
-  "E", "W",  # pycodestyle
-  "F",  # pyflakes
-  "I",  # isort
-  "NPY",  # numpy
-  # "PD",  # pandas
-  "DTZ", # flake8-datetimez
-  "RUF"
-]
-line-length = 80
-target-version = "py38"
-
-[tool.ruff.lint.isort]
-known-first-party = ["numpy", "pandas"]
-
-[tool.mypy]
-python_version = 3.8
-platform = "posix"
-
-color_output = true
-pretty = true
-show_column_numbers = true
-strict = true
-check_untyped_defs = true
-ignore_missing_imports = true
-warn_no_return = true
-warn_redundant_casts = true
-warn_unused_configs = true
-warn_unused_ignores = true

pyopensky-2.8/src/pyopensky/__init__.py

@@ -1,3 +0,0 @@
-from importlib.metadata import version
-
-__version__ = version("pyopensky")

pyopensky-2.8/src/pyopensky/api.py

@@ -1,76 +0,0 @@
-from __future__ import annotations
-
-from typing import Any, Callable, Iterable, TypeVar
-
-from typing_extensions import Protocol
-
-import pandas as pd
-
-from .time import timelike
-
-T = TypeVar("T")
-ProgressbarType = Callable[[Iterable[T]], Iterable[T]]
-
-
-class HasBounds(Protocol):
-    @property
-    def bounds(self) -> tuple[float, float, float, float]: ...
-
-
-class OpenSkyDBAPI(Protocol):
-    def flightlist(
-        self,
-        start: timelike,
-        stop: None | timelike = None,
-        *args: Any,  # more reasonable to be explicit about arguments
-        departure_airport: None | str | list[str] = None,
-        arrival_airport: None | str | list[str] = None,
-        airport: None | str | list[str] = None,
-        callsign: None | str | list[str] = None,
-        icao24: None | str | list[str] = None,
-        cached: bool = True,
-        compress: bool = False,
-        limit: None | int = None,
-        **kwargs: Any,
-    ) -> None | pd.DataFrame: ...
-
-    def history(
-        self,
-        start: timelike,
-        stop: None | timelike = None,
-        *args: Any,
-        # date_delta: timedelta = timedelta(hours=1),
-        callsign: None | str | list[str] = None,
-        icao24: None | str | list[str] = None,
-        serials: None | int | Iterable[int] = None,
-        bounds: None
-        | str
-        | HasBounds
-        | tuple[float, float, float, float] = None,
-        departure_airport: None | str = None,
-        arrival_airport: None | str = None,
-        airport: None | str = None,
-        time_buffer: None | str | pd.Timedelta = None,
-        cached: bool = True,
-        compress: bool = False,
-        limit: None | int = None,
-        **kwargs: Any,
-    ) -> None | pd.DataFrame: ...
-
-    def rawdata(
-        self,
-        start: timelike,
-        stop: None | timelike = None,
-        *args: Any,  # more reasonable to be explicit about arguments
-        icao24: None | str | list[str] = None,
-        serials: None | int | Iterable[int] = None,
-        bounds: None | HasBounds | tuple[float, float, float, float] = None,
-        callsign: None | str | list[str] = None,
-        departure_airport: None | str = None,
-        arrival_airport: None | str = None,
-        airport: None | str = None,
-        cached: bool = True,
-        compress: bool = False,
-        limit: None | int = None,
-        **kwargs: Any,
-    ) -> None | pd.DataFrame: ...

pyopensky-2.8/src/pyopensky/config.py

@@ -1,210 +0,0 @@
-from __future__ import annotations
-
-import configparser
-import logging
-import os
-from pathlib import Path
-from typing import TypedDict
-
-from appdirs import user_cache_dir, user_config_dir
-
-import pandas as pd
-
-_log = logging.getLogger(__name__)
-
-
-DEFAULT_CONFIG = """
-[default]
-username =
-password =
-
-# Uncomment the following if you have access to the s3 server
-# secret_key =
-# access_key =
-
-# If you need a different account on Trino, uncomment the following
-# [trino]
-# username =
-# password =
-
-[cache]
-## You may set a different cache folder here if you have a preferred space
-## for storing possibly large files.
-## Default settings:
-## - $HOME/.cache/opensky (Linux)
-## - $HOME/Library/Caches/opensky (MacOS)
-## - C:\\Users\\<username>\\AppData\\Local\\opensky\\Cache (Windows)
-##
-# path =
-
-## The purge parameter refers to the cache folder containing data from the
-## Opensky databases. Cache files tend to take space so you may want to let
-## the library delete older files.
-## Files are removed when the library is imported.
-purge = 90 days
-"""
-
-opensky_config_dir = Path(user_config_dir("pyopensky"))
-opensky_config = configparser.ConfigParser()
-
-if (opensky_config_file := opensky_config_dir / "settings.conf").exists():
-    opensky_config.read(opensky_config_file.as_posix())
-elif (previous_config_file := opensky_config_dir / "secret.conf").exists():
-    previous_config_file.rename(opensky_config_file)
-    opensky_config.read(opensky_config_file.as_posix())
-else:
-    if not opensky_config_dir.exists():
-        opensky_config_dir.mkdir(parents=True)
-    opensky_config_file.write_text(DEFAULT_CONFIG)
-
-traffic_config_dir = Path(user_config_dir("traffic"))
-traffic_config = configparser.ConfigParser()
-
-if (traffic_config_file := traffic_config_dir / "traffic.conf").exists():
-    traffic_config.read(traffic_config_file.as_posix())
-
-
-def purge_cache(cache_path: Path) -> None:
-    cache_no_expire = False
-    cache_no_expire |= bool(os.environ.get("TRAFFIC_CACHE_NO_EXPIRE"))
-    cache_no_expire |= bool(os.environ.get("OPENSKY_CACHE_NO_EXPIRE"))
-
-    cache_purge = "90 days"
-    if purge := traffic_config.get("cache", "purge", fallback=None):
-        if purge.strip() != "":
-            cache_purge = purge
-    if purge := opensky_config.get("cache", "purge", fallback=None):
-        if purge.strip() != "":
-            cache_purge = purge
-
-    if not cache_no_expire:  # coverage: ignore
-        expiration = pd.Timestamp("now") - pd.Timedelta(cache_purge)
-
-        for cache_file in cache_path.glob("*"):
-            ctime = cache_file.stat().st_ctime
-            if ctime < expiration.timestamp():
-                _log.warn(f"Removing {cache_file} created on {ctime}")
-                cache_file.unlink()
-
-
-class Resolution(TypedDict, total=False):
-    opensky_category: str
-    opensky_name: str
-    traffic_category: str
-    traffic_name: str
-    environment_variable: str
-
-
-NAME_RESOLUTION: dict[str, Resolution] = {
-    # Cache configuration
-    "cache_dir": dict(
-        environment_variable="OPENSKY_CACHE",
-        opensky_category="cache",
-        opensky_name="path",
-        traffic_category="cache",
-        traffic_name="path",
-    ),
-    # Network configuration
-    "http_proxy": dict(
-        environment_variable="http_proxy",
-        opensky_category="default",
-        opensky_name="http_proxy",
-        traffic_category="network",
-        traffic_name="http_proxy",
-    ),
-    # Credentials configuration
-    "access_key": dict(
-        opensky_category="s3",
-        opensky_name="access_key",
-        traffic_category="opensky",
-        traffic_name="access_key",
-    ),
-    "secret_key": dict(
-        opensky_category="s3",
-        opensky_name="secret_key",
-        traffic_category="opensky",
-        traffic_name="secret_key",
-    ),
-    "username": dict(
-        environment_variable="OPENSKY_USERNAME",
-        opensky_category="default",
-        opensky_name="username",
-        traffic_category="opensky",
-        traffic_name="username",
-    ),
-    "password": dict(
-        environment_variable="OPENSKY_PASSWORD",
-        opensky_category="default",
-        opensky_name="password",
-        traffic_category="opensky",
-        traffic_name="password",
-    ),
-    "trino_username": dict(
-        environment_variable="OPENSKY_TRINO_USERNAME",
-        opensky_category="trino",
-        opensky_name="username",
-    ),
-    "trino_password": dict(
-        environment_variable="OPENSKY_TRINO_PASSWORD",
-        opensky_category="trino",
-        opensky_name="password",
-    ),
-}
-
-__all__ = list(NAME_RESOLUTION.keys())
-
-
-def get_config(
-    opensky_category: str,
-    opensky_name: str,
-    traffic_category: None | str = None,
-    traffic_name: None | str = None,
-    environment_variable: None | str = None,
-) -> None | str:
-    if opensky_value := opensky_config.get(
-        opensky_category, opensky_name, fallback=None
-    ):
-        return opensky_value
-
-    if traffic_category is not None and traffic_name is not None:
-        if traffic_value := traffic_config.get(
-            traffic_category, traffic_name, fallback=None
-        ):
-            return traffic_value
-
-    if environment_variable is not None:
-        return os.environ.get(environment_variable)
-
-    return None
-
-
-cache_dir = get_config(**NAME_RESOLUTION["cache_dir"])
-if cache_dir is None:
-    cache_dir = user_cache_dir("opensky")
-cache_path = Path(cache_dir)
-if not cache_path.exists():
-    cache_path.mkdir(parents=True)
-
-purge_cache(cache_path)
-
-
-def __getattr__(name: str) -> None | str:
-    # Pick in order:
-    # 1. pyopensky -> settings.conf
-    # 2. traffic -> traffic.conf
-    # 3. environment variables
-
-    if name == "trino_username":
-        if value := get_config(**NAME_RESOLUTION[name]):
-            return value
-        return get_config(**NAME_RESOLUTION["username"])
-
-    if name == "trino_password":
-        if value := get_config(**NAME_RESOLUTION[name]):
-            return value
-        return get_config(**NAME_RESOLUTION["password"])
-
-    if name in __all__:
-        return get_config(**NAME_RESOLUTION[name])
-
-    raise AttributeError