pyopensky 2.12__tar.gz → 2.14__tar.gz

{pyopensky-2.12 → pyopensky-2.14}/.github/workflows/run_tests.yml

@@ -36,31 +36,19 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up uv
-        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' }}
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
-
-      - name: Set up uv
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: irm https://astral.sh/uv/install.ps1 | iex
-        shell: powershell
-
-      - name: Cache folder for uv
-        uses: actions/cache@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
-          path: /tmp/.uv-cache
-          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-          restore-keys: |
-            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-            uv-${{ runner.os }}
+          enable-cache: true
 
       - name: Cache folder for data
         uses: actions/cache@v4
         id: cache-folder
         with:
           path: |
-            ${{ github.workspace }}/cache_opensky
-          key: opensky-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+            cache_opensky
+          enableCrossOsArchive: true
+          key: opensky-${{ hashFiles('uv.lock') }}
 
       - name: Install the project
         run: uv sync --all-extras --dev --python ${{ matrix.python-version }}
@@ -71,7 +59,7 @@ jobs:
           uv run ruff format --check
 
       - name: Run tests
-        if: ${{ matrix.python-version == '3.12' || steps.cache-folder.outputs.cache-hit == 'true' }}
+        if: ${{ (matrix.python-version == '3.12' && matrix.os == 'ubuntu-latest') || steps.cache-folder.outputs.cache-hit == 'true' }}
         env:
           OPENSKY_USERNAME: ${{ secrets.OPENSKY_USERNAME }}
           OPENSKY_PASSWORD: ${{ secrets.OPENSKY_PASSWORD }}

{pyopensky-2.12 → pyopensky-2.14}/.gitignore

@@ -25,6 +25,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+.idea/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

{pyopensky-2.12 → pyopensky-2.14}/PKG-INFO

@@ -1,9 +1,10 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyopensky
-Version: 2.12
+Version: 2.14
 Summary: A Python interface for OpenSky database
 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
@@ -11,6 +12,7 @@ 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: python-dotenv>=1.0.1
 Requires-Dist: tqdm>=4.66.5
 Requires-Dist: trino[sqlalchemy]>=0.329.0
 Requires-Dist: typing-extensions>=4.12.2

{pyopensky-2.12 → pyopensky-2.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyopensky"
-version = "2.12"
+version = "2.14"
 description = "A Python interface for OpenSky database"
 authors = [
   { name = "Xavier Olive", email = "git@xoolive.org" },
@@ -16,6 +16,7 @@ dependencies = [
   "pandas >= 2.2.2",
   "pyarrow >= 17.0.0",
   "pyjwt >= 2.9.0",
+  "python-dotenv>=1.0.1",
   "tqdm >= 4.66.5",
   "trino[sqlalchemy] >= 0.329.0",
   "typing-extensions >= 4.12.2",

{pyopensky-2.12 → pyopensky-2.14}/src/pyopensky/config.py

@@ -6,11 +6,13 @@ import os
 from pathlib import Path
 from typing import TypedDict
 
+import dotenv
 from appdirs import user_cache_dir, user_config_dir
 
 import pandas as pd
 
 _log = logging.getLogger(__name__)
+dotenv.load_dotenv()
 
 
 DEFAULT_CONFIG = """
@@ -32,7 +34,7 @@ password =
 ## for storing possibly large files.
 ## Default settings:
 ## - $HOME/.cache/opensky (Linux)
-## - $HOME/Library/Caches/opensky (MacOS)
+## - $HOME/Library/Caches/opensky (MacOS) (unless XDG_CONFIG_HOME is set)
 ## - C:\\Users\\<username>\\AppData\\Local\\opensky\\Cache (Windows)
 ##
 # path =
@@ -44,7 +46,10 @@ password =
 purge = 90 days
 """
 
-opensky_config_dir = Path(user_config_dir("pyopensky"))
+if (xdg_config := os.environ.get("XDG_CONFIG_HOME")) is not None:
+    opensky_config_dir = Path(xdg_config) / "pyopensky"
+else:
+    opensky_config_dir = Path(user_config_dir("pyopensky"))
 opensky_config = configparser.ConfigParser()
 
 if (opensky_config_file := opensky_config_dir / "settings.conf").exists():
@@ -57,7 +62,10 @@ else:
         opensky_config_dir.mkdir(parents=True)
     opensky_config_file.write_text(DEFAULT_CONFIG)
 
-traffic_config_dir = Path(user_config_dir("traffic"))
+if xdg_config is not None:
+    traffic_config_dir = Path(xdg_config) / "traffic"
+else:
+    traffic_config_dir = Path(user_config_dir("traffic"))
 traffic_config = configparser.ConfigParser()
 
 if (traffic_config_file := traffic_config_dir / "traffic.conf").exists():

{pyopensky-2.12 → pyopensky-2.14}/src/pyopensky/tzdata.py

@@ -12,6 +12,8 @@ from pathlib import Path
 
 import httpx
 
+rk = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"
+
 
 def download_tzdata_windows(
     year: int = 2022,
@@ -19,9 +21,24 @@ def download_tzdata_windows(
     name: str = "tzdata",
     base_dir: None | Path = None,
 ) -> None:
-    folder = (
-        base_dir if base_dir else Path(os.path.expanduser("~")) / "Downloads"
-    )
+    # This module only exists in Windows
+    from winreg import HKEY_CURRENT_USER, OpenKey, QueryValueEx  # type: ignore
+
+    if base_dir is None:
+        conda_env_path = os.getenv("CONDA_PREFIX", None)
+        if conda_env_path:
+            base_dir = Path(conda_env_path) / "Lib" / "site-packages" / "tzdata"
+        else:
+            # This \o/ line finds the Downloads directory for the current user
+            with OpenKey(HKEY_CURRENT_USER, rk) as key:
+                download_path, _ = QueryValueEx(
+                    key,
+                    # don't ask what this uuid stands for...
+                    "{374DE290-123F-4565-9164-39C4925E467B}",
+                )
+                base_dir = Path(download_path)
+
+    folder = base_dir
 
     if (folder / name).is_dir():
         return