Merge pull request #27 from Terradue/develop

Develop

Author: sim13pods

.github/workflows/dump_stations.yaml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Run aeronet-client dump
         run: |
-          aeronet-client dump-stations --verbose --output-file=./stations.parquet
+          aeronet-client dump-stations --verbose --timeout 60 --output-file=./stations.parquet
 
       - name: Configure git author
         run: |

.github/workflows/package.yaml

@@ -12,65 +12,86 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: publish-to-pypi
+name: package
 
 on:
   push:
     branches:
+    - feature
+    - feature/**
     - develop
     - main
-    paths:
-    - src/**
-    - .github/workflows/package.yaml
-    - README.md
-  release:
-    types:
-    - published
+    tags:
+    - v*.*.*
   pull_request:
     branches:
+    - feature
+    - feature/**
     - develop
     - main
-    paths:
-    - src/**
 
 permissions:
   contents: read
-  packages: write
 
 jobs:
+  ci:
+    if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/')
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.12'
+        cache: pip
+
+    - name: Install tooling
+      run: pip install hatch ruff
+
+    - name: Ruff Check
+      run: ruff check src tests
+
+    - name: Ruff Lint
+      run: ruff format --check src tests
 
-  deploy:
+    - name: Run tests
+      run: hatch run dev:test --verbose
+
+  publish:
+    if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     environment: release
     permissions:
-      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      id-token: write
+      contents: read
     steps:
     - uses: actions/checkout@v6
+
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         cache: pip
-    - name: Install dependencies
+
+    - name: Install Hatch
+      run: pip install hatch
+
+    - name: Verify tag matches project version
       run: |
-        # python -m pip install --upgrade pip
-        # python -m pip install --upgrade pip
-        pip install hatch
+        TAG_VERSION="${GITHUB_REF_NAME#v}"
+        PROJECT_VERSION="$(hatch version)"
+
+        echo "Tag version: ${TAG_VERSION}"
+        echo "Project version: ${PROJECT_VERSION}"
+
+        if [ "${TAG_VERSION}" != "${PROJECT_VERSION}" ]; then
+          echo "Tag ${GITHUB_REF_NAME} does not match project version ${PROJECT_VERSION}"
+          exit 1
+        fi
+
     - name: Build package
-      run: "hatch build \n"
-    - name: Test package
-      run: |
-        # hatch test
-        pip install nose2
-        pip install -e .
-        nose2
-    - name: Publish package distributions to PyPI (main)
-      if: github.ref == 'refs/heads/main'
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        repository-url: https://upload.pypi.org/legacy/
-    - name: Publish package distributions to PyPI (develop)
-      if: github.ref != 'refs/heads/main'
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        repository-url: https://test.pypi.org/legacy/
+      run: hatch build
+
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@v1.14.0

.gitignore

@@ -187,3 +187,5 @@ cython_debug/
 .pypirc
 
 .codex
+.task
+uv.lock

Taskfile.yml

@@ -14,72 +14,40 @@
 
 version: '3'
 
-tasks:
-  install_ruff:
-    internal: true
-    cmds:
-    - pip install ruff pre-commit
-
-  base_ruff:
-    deps:
-    - install_ruff
-    cmds:
-    - ruff --version
-
-  ruff_check:
-    deps:
-    - install_ruff
-    cmds:
-    #ruff check --fix-only
-    - ruff check --output-format=gitlab > code-quality-report.json
-
-  ruff_format:
-    deps:
-    - install_ruff
-    cmds:
-    - ruff format --diff
-
-  install_hatch:
-    internal: true
-    cmds:
-    - pip install hatch
-
-  package:
-    deps:
-    - install_hatch
-    cmds:
-    - hatch build
-    - hatch -e default run nose2 tests
+includes:
+  openapi: https://raw.githubusercontent.com/Terradue/taskfile-utils/refs/heads/main/openapi.yaml
+  quality: https://raw.githubusercontent.com/Terradue/taskfile-utils/refs/heads/main/quality.yaml
 
-  install_mkdocs:
-    internal: true
-    cmds:
-    - pip install mkdocs-material mkdocs-mermaid2-plugin jupytext ipykernel bash_kernel mkdocs-jupyter legacy-cgi pdocs mkdocs-build-plantuml-plugin folium "numpy<2.0.0" 
+tasks:
 
   serve-docs:
-    deps:
-    - install_mkdocs
     cmds:
-    - mkdocs serve
+    - |
+      uv run \
+      --with mkdocs-material \
+      --with mkdocs-mermaid2-plugin \
+      --with jupytext \
+      --with ipykernel \
+      --with bash_kernel \
+      --with mkdocs-jupyter \
+      --with legacy-cgi \
+      --with pdocs \
+      --with mkdocs-build-plantuml-plugin \
+      --with folium \
+      --with numpy \
+      mkdocs serve
 
   run-clt: 
     cmds:
-    - cwltool cwl-clt/aeronet-client.cwl docs/cwl/inputs.yaml 
-
-  install_openapi_prerequisites:
-    internal: true
-    cmds:
-    - npm i -g @redocly/cli@latest
-    - pip install openapi-python-client
+    - cwltool cwl-clt/aeronet-client.cwl docs/cwl/inputs.yaml
 
   generate_openapi:
-    deps:
-    - install_openapi_prerequisites
     cmds:
-    - redocly build-docs ./schemas/aeronet_openapi.yaml --output=./docs/aeronet_openapi.html
-    - |
-      openapi-python-client generate \
-      --meta none \
-      --path ./schemas/aeronet_openapi.yaml \
-      --output-path ./src/pygeofilter_aeronet/aeronet_client \
-      --overwrite
+    - task: openapi:generate_docs
+      vars:
+        API: './schemas/aeronet_openapi.yaml'
+        OUTPUT: './docs/aeronet_openapi.html'
+    - task: openapi:generate_client
+      vars:
+        API: './schemas/aeronet_openapi.yaml'
+        OUTPUT: './src/pygeofilter_aeronet/aeronet_client'

pyproject.toml

@@ -7,7 +7,7 @@ name = "pygeofilter-aeronet"
 dynamic = ["version"]
 description = ''
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 license = "Apache-2.0"
 keywords = []
 authors = [
@@ -17,10 +17,11 @@ authors = [
 classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
@@ -54,6 +55,15 @@ Source = "https://github.com/Terradue/pygeofilter-aeronet"
 [tool.hatch.envs.prod]
 path = "/app/envs/aeronet-client"
 
+[tool.hatch.envs.dev]
+extra-dependencies = [
+  "pytest==9.0.2",
+  "ruff==0.15.6",
+]
+[tool.hatch.envs.dev.scripts]
+lint = "ruff format src tests"
+check = "ruff check --fix src tests"
+
 [project.scripts]
 aeronet-client = "pygeofilter_aeronet.cli:main"
 
@@ -86,6 +96,25 @@ exclude_lines = [
   "if TYPE_CHECKING:",
 ]
 
+[tool.pytest.ini_options]
+python_files = [
+  "test_*.py",
+  "tests_*.py",
+]
 
 [tool.hatch.envs.default.scripts]
 test = "hatch run nose2"
+
+[tool.hatch.envs.test]
+description = "Test environment"
+skip-install = false
+dependencies = ["pytest==9.0.2", "pytest-cov==7.0.0"]
+
+[tool.hatch.envs.test.scripts]
+test = "pytest"
+test-q = "pytest -q"
+test-cov = "pytest --cov=transpiler_mate"
+test-show-setup = "pytest --setup-show"
+
+[[tool.hatch.envs.test.matrix]]
+python = ["3.10", "3.11", "3.12", "3.13", "3.14"]