PyPI - mapflpy - Versions diffs - 1.1.1__tar.gz → 1.1.2__tar.gz - Mend

mapflpy 1.1.1tar.gz → 1.1.2tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (97) hide show

mapflpy-1.1.2/.github/workflows/docs.yml ADDED Viewed

@@ -0,0 +1,94 @@
+name: Publish Docs
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+permissions:
+  contents: read
+jobs:
+  build_docs:
+    name: Build docs
+    runs-on: ubuntu-latest
+    steps:
+#      - uses: mamba-org/setup-micromamba@v2
+#        with:
+#          init-shell: bash
+#          cache-downloads: true
+#
+#      - name: Checkout mapflpy
+#        uses: actions/checkout@v4
+#
+#      - name: Setup Python
+#        uses: actions/setup-python@v5
+#        with:
+#          python-version: 3.13
+#
+#      - name: Install build dependencies
+#        run: |
+#          python -m pip install --upgrade pip
+#          pip install nox[pbs]
+#
+#      - name: Set nox conda backend
+#        run: echo "CONDA_EXE=micromamba" >> "$GITHUB_ENV"
+#
+#      - name: Build docs
+#        run: |
+#          nox -s build_docs
+#
+#      - name: Upload docs artifact
+#        if: always()
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: docs
+#          path: .nox/_artifacts/docs/html*/
+#          retention-days: 7
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Create dummy docs
+        run: |
+          mkdir -p .nox/_artifacts/docs/html-test
+          date > .nox/_artifacts/docs/html-test/build-info.txt
+          echo '<html><body><h1>RSYNC TEST OK</h1></body></html>' \
+            > .nox/_artifacts/docs/html-test/index.html
+          ls -alR .nox/_artifacts/docs
+      - name: Upload dummy docs artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dummy-docs
+          path: .nox/_artifacts/docs/html-test/
+          retention-days: 7
+      - name: Prepare SSH
+        env:
+          SSH_HOST: ${{ secrets.DOCS_SSH_HOST }}
+          SSH_PORT: ${{ secrets.DOCS_SSH_PORT }}
+        run: |
+          install -m 700 -d ~/.ssh
+          install -m 600 /dev/null ~/.ssh/id_rsync
+          printf '%s\n' "${{ secrets.DOCS_SSH_KEY }}" > ~/.ssh/id_rsync
+          ssh-keyscan -p "${SSH_PORT:-22}" "${SSH_HOST}" >> ~/.ssh/known_hosts
+      - name: Rsync to server
+        env:
+          SSH_HOST: ${{ secrets.DOCS_SSH_HOST }}
+          SSH_USER: ${{ secrets.DOCS_SSH_USER }}
+          SSH_PORT: ${{ secrets.DOCS_SSH_PORT }}
+          REMOTE_DIR: ${{ secrets.DOCS_SSH_PATH }}
+        run: |
+          # ensure target dir exists
+          ssh -i ~/.ssh/id_rsync -p "${SSH_PORT:-22}" -o StrictHostKeyChecking=yes \
+            "${SSH_USER}@${SSH_HOST}" "mkdir -p '${REMOTE_DIR}'"
+          rsync -az \
+            -e "ssh -i ~/.ssh/id_rsync -p ${SSH_PORT:-22} -o StrictHostKeyChecking=yes" \
+            .nox/_artifacts/docs/html*/ "${SSH_USER}@${SSH_HOST}:${REMOTE_DIR}/"

mapflpy-1.1.2/.github/workflows/publish.yml ADDED Viewed

@@ -0,0 +1,199 @@
+name: Publish Build
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+permissions:
+  actions: read
+jobs:
+  build_sdist:
+    name: Build sdist
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mamba-org/setup-micromamba@v2
+        with:
+          init-shell: bash
+          cache-downloads: true
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: .python-version
+      - name: Install nox
+        run: |
+          python -m pip install --upgrade pip
+          pip install nox[pbs]
+      - name: Set nox conda backend
+        run: echo "CONDA_EXE=micromamba" >> "$GITHUB_ENV"
+      - name: Build sdist
+        run: |
+          nox -s sdist
+      - name: Upload sdist artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: sdist
+          path: .nox/_artifacts/sdist/*.tar.gz
+          retention-days: 7
+  build_wheels:
+    name: Build wheels (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    needs:
+      - build_sdist
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-24.04
+          - ubuntu-22.04-arm
+          - macos-15-intel
+          - macos-15
+    steps:
+      - uses: mamba-org/setup-micromamba@v2
+        with:
+          init-shell: bash
+          cache-downloads: true
+      - name: Checkout mapflpy
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: .python-version
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install nox[pbs]
+      - name: Set nox conda backend
+        run: echo "CONDA_EXE=micromamba" >> "$GITHUB_ENV"
+      - name: macOS SDK + nox conda backend
+        if: startsWith(matrix.os, 'macos-')
+        run: |
+          echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> "$GITHUB_ENV"
+          echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> "$GITHUB_ENV"
+          echo "CFLAGS=-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" >> "$GITHUB_ENV"
+          echo "FCFLAGS=-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" >> "$GITHUB_ENV"
+          echo "LDFLAGS=-Wl,-syslibroot,$SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" >> "$GITHUB_ENV"
+      - name: Build wheels
+        run: |
+          nox -s build
+      - name: Repair wheels
+        run: |
+          nox -s repair
+      - name: Upload wheel artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ matrix.os }}
+          path: .nox/_artifacts/wheelhouse/*.whl
+          retention-days: 7
+  test_builds:
+    name: Test wheels for ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    needs:
+      - build_wheels
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-24.04
+          - ubuntu-22.04-arm
+          - macos-15-intel
+          - macos-15
+    steps:
+      - uses: mamba-org/setup-micromamba@v2
+        with:
+          init-shell: bash
+          cache-downloads: true
+      - name: Checkout mapflpy
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: .python-version
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install nox[pbs]
+      - name: Set nox conda backend
+        run: echo "CONDA_EXE=micromamba" >> "$GITHUB_ENV"
+      - name: Download prebuilt wheels
+        uses: actions/download-artifact@v6
+        with:
+          name: wheels-${{ matrix.os }}
+          path: .nox/_artifacts/wheelhouse
+      - name: Run tests
+        run: |
+          nox -s test
+  publish:
+    name: Publish distributions
+    permissions:
+      contents: write
+      id-token: write
+    needs:
+      - test_builds
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -el {0}
+    steps:
+      - name: Download sdist
+        uses: actions/download-artifact@v6
+        with:
+          name: sdist
+          path: dist
+      - name: Download wheels
+        uses: actions/download-artifact@v6
+        with:
+          pattern: wheels-*
+          merge-multiple: true
+          path: dist
+      - run: pwd && ls -alt . && ls -alt dist/
+      - name: Upload to GitHub releases
+        uses: softprops/action-gh-release@v2.4.1
+        with:
+          draft: false
+          generate_release_notes: false
+          files: |
+            dist/*
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.12.4
+        with:
+          packages-dir: dist

mapflpy-1.1.2/.python-version ADDED Viewed

	@@ -0,0 +1 @@
1	+ 3.13.9

mapflpy-1.1.2/PKG-INFO ADDED Viewed

@@ -0,0 +1,85 @@
+Metadata-Version: 2.4
+Name: mapflpy
+Version: 1.1.2
+Summary: Python extension for tracing field lines using the Fortran tracer from MapFL
+Keywords: solar physics,space physics,heliophysics,magnetohydrodynamic,science,mas,predsci,psi,modeling,fortran
+Author: Ryder Davidson, Cooper Downs, Andres Reyes, Asher Pembroke
+Author-Email: "Predictive Science Inc." <webmaster@predsci.com>
+License-Expression: Apache-2.0
+License-File: LICENSE.txt
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Science/Research
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Fortran
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Operating System :: Unix
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Typing :: Typed
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Classifier: Topic :: Scientific/Engineering :: Physics
+Project-URL: homepage, https://predsci.com/
+Project-URL: documentation, https://predsci.com/doc/mapflpy
+Project-URL: repository, https://github.com/predsci/mapflpy
+Requires-Python: >=3.10
+Requires-Dist: numpy>=2.1.0
+Requires-Dist: psi-io>=1.0.0
+Provides-Extra: hdf4
+Requires-Dist: pyhdf>=0.11.6; extra == "hdf4"
+Provides-Extra: data
+Requires-Dist: pooch==1.8.2; extra == "data"
+Requires-Dist: matplotlib==3.10.7; extra == "data"
+Requires-Dist: scipy; extra == "data"
+Provides-Extra: build
+Requires-Dist: python-build; extra == "build"
+Requires-Dist: packaging; extra == "build"
+Provides-Extra: test
+Requires-Dist: pytest>=8.4.0; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Provides-Extra: types
+Requires-Dist: mypy>=1.15; extra == "types"
+Provides-Extra: lint
+Requires-Dist: ruff>=0.11.7; extra == "lint"
+Provides-Extra: docs
+Requires-Dist: sphinx==8.2.3; extra == "docs"
+Requires-Dist: sphinx-book-theme==1.1.4; extra == "docs"
+Requires-Dist: sphinx-gallery==0.19.0; extra == "docs"
+Requires-Dist: sphinx-copybutton==0.5.2; extra == "docs"
+Requires-Dist: pooch==1.8.2; extra == "docs"
+Requires-Dist: matplotlib==3.10.7; extra == "docs"
+Requires-Dist: scipy; extra == "docs"
+Requires-Dist: pthree==1.0.1; extra == "docs"
+Provides-Extra: dev
+Requires-Dist: nox>=2025.11.12; extra == "dev"
+Provides-Extra: all
+Requires-Dist: mapflpy[build,data,dev,docs,hdf4,lint,test,types]; extra == "all"
+Description-Content-Type: text/x-rst
+mapflpy
+=======
+Python extension for tracing field lines using the
+`MapFL <https://github.com/predsci/MapFL>`_ Fortran tracer.
+The goal of **mapflpy** is to provide fast and accurate tracing capabilities for
+spherical vector fields inside a convenient Python interface. **mapflpy** is
+designed to work natively with the staggered meshes produced by
+Predictive Science Inc.'s codes for simulating the solar corona, and
+inner heliosphere (*e.g.* `MAS <https://www.predsci.com/mas>`_ or
+`POT3D <https://github.com/predsci/POT3D>`_), but it should be generally compatible
+with any global vector field that can be described on a rectilinear grid in
+spherical coordinates.
+Resources
+---------
+- **Predictive Science Inc.:** https://predsci.com
+- **Source Code:** https://github.com/predsci/mapflpy
+- **Documentation:** https://predsci.com/doc/mapflpy
+- **Distribution:** https://pypi.org/project/mapflpy

mapflpy-1.1.2/README.rst ADDED Viewed

@@ -0,0 +1,22 @@
+mapflpy
+=======
+Python extension for tracing field lines using the
+`MapFL <https://github.com/predsci/MapFL>`_ Fortran tracer.
+The goal of **mapflpy** is to provide fast and accurate tracing capabilities for
+spherical vector fields inside a convenient Python interface. **mapflpy** is
+designed to work natively with the staggered meshes produced by
+Predictive Science Inc.'s codes for simulating the solar corona, and
+inner heliosphere (*e.g.* `MAS <https://www.predsci.com/mas>`_ or
+`POT3D <https://github.com/predsci/POT3D>`_), but it should be generally compatible
+with any global vector field that can be described on a rectilinear grid in
+spherical coordinates.
+Resources
+---------
+- **Predictive Science Inc.:** https://predsci.com
+- **Source Code:** https://github.com/predsci/mapflpy
+- **Documentation:** https://predsci.com/doc/mapflpy
+- **Distribution:** https://pypi.org/project/mapflpy

{mapflpy-1.1.1 → mapflpy-1.1.2}/docs/source/conf.py RENAMED Viewed

@@ -1,18 +1,10 @@
 from __future__ import annotations
-import builtins
 import os
 import sys
-import importlib
-import pkgutil
-import re
-import ast
-import inspect
 from dataclasses import dataclass, field, asdict
 from datetime import datetime
 from pathlib import Path
-from types import ModuleType
-from typing import Iterable
 try:
     # First try to run sphinx_build against installed dist
@@ -25,11 +17,11 @@ except ImportError:
     import mapflpy
 try:
-    from project_parser import build_node_tree
+    from pthree import build_node_tree, node_tree_to_dict
 except ImportError:
     raise ImportError(
-        "The 'project_parser' package is required to build the documentation. "
-        "Please install it via 'pip install project_parser' and try again."
+        "The 'pthree' package is required to build the documentation. "
+        "Please install it via 'pip install pthree' and try again."
     )
 # ------------------------------------------------------------------------------
@@ -70,15 +62,17 @@ html_theme_options = {
             "type": "fontawesome",
         },
         {
-            'name': 'Github',
-            'url': 'https://github.com/predsci/',
+            'name': 'Source Code',
+            'url': 'https://github.com/predsci/mapflpy',
+            # 'url': 'https://bitbucket.org/predsci/mapflpy',
+            # "icon": "fa-brands fa-bitbucket fa-fw",
             "icon": "fa-brands fa-github fa-fw",
             "type": "fontawesome",
         },
         {
-            'name': 'Bitbucket',
-            'url': 'https://bitbucket.org/predsci/',
-            "icon": "fa-brands fa-bitbucket fa-fw",
+            'name': 'Documentation',
+            'url': 'https://predsci.com/doc/mapflpy',
+            "icon": "fa fa-file fa-fw",
             "type": "fontawesome",
         },
         {
@@ -128,7 +122,7 @@ node_tree = build_node_tree(root_package,
                             exclude_dunder,
                             exclusions)
-autosummary_context = dict(pkgtree=asdict(node_tree))
+autosummary_context = dict(pkgtree=node_tree_to_dict(node_tree))
 # ------------------------------------------------------------------------------
 # Autodoc Configuration

mapflpy-1.1.2/docs/source/guide/installation.rst ADDED Viewed

@@ -0,0 +1,28 @@
+.. _installation:
+Installation
+============
+.. attention::
+    We highly recommend using a virtual environment to manage your Python packages and avoid conflicts with other
+    projects. For the best results, we recommend using ``conda`` – *via* Miniforge (preferred), Miniconda, or Anaconda
+    – to create and manage your virtual environments.
+To get started with **mapflpy**, you can install it directly from PyPI:
+.. code-block:: bash
+    pip install mapflpy
+Required Dependencies
+----------------------
+- `Python >= 3.10 <https://www.python.org/>`_
+- `numpy <https://numpy.org/>`_
+- `psi-io <https://pypi.org/project/psi-io/>`_
+Optional Dependencies
+----------------------
+- `matplotlib <https://matplotlib.org/>`_
+- `pooch <https://www.fatiando.org/pooch/>`_

mapflpy-1.1.2/environment.yml ADDED Viewed

@@ -0,0 +1,53 @@
+channels:
+  - conda-forge
+dependencies:
+  # -------- Core Python --------
+  - python=3.13
+  # -------- Build toolchain --------
+  - meson>=1.4
+  - meson-python>=0.15
+  - ninja>=1.11
+  # -------- Compilers --------
+  - pkg-config
+  - c-compiler
+  - cxx-compiler
+  - fortran-compiler
+  - python-build
+  - zlib
+  - hdf5
+  # -------- Python Runtime --------
+  - numpy                 # package dependency
+  - h5py                  # psi-io dependency
+  - pyhdf                 # hdf4 support
+  # -------- Testing / QA --------
+  - pytest
+  - pytest-cov
+  - mypy
+  - ruff
+  - coverage
+  - nox
+  # -------- Docs --------
+  - sphinx
+  - sphinx-book-theme
+  - sphinx-gallery
+  - sphinx-copybutton
+  - matplotlib
+  - pooch
+  - scipy
+  # -------- Scripts --------
+  - packaging
+  # -------- Publish --------
+  - twine
+  # -------- Pip installs --------
+  - pip
+  - pip:
+      - psi-io    # Python runtime package
+      - pthree    # Documentation building

{mapflpy-1.1.1 → mapflpy-1.1.2}/mapflpy/__init__.py RENAMED Viewed

@@ -7,15 +7,27 @@ allow users a high-level interface to the underlying Fortran routines, as well a
 visualizing and analyzing the traced fieldlines.
 """
 # mapflpy/__init__.py
 try:
     # If Meson generated this file:
     from ._version import __version__  # type: ignore[attr-defined]
-except Exception:
+except ModuleNotFoundError as e:
     try:
-        # Fallback to installed metadata (wheel/sdist)
         from importlib.metadata import version as _pkg_version
+        from importlib.metadata import PackageNotFoundError
+        from pathlib import Path
+        # Fallback to installed metadata (wheel/sdist)
         __version__ = _pkg_version("mapflpy")  # type: ignore[assignment]
-    except Exception:  # dev/editable without metadata
-        __version__ = "0+unknown"  # type: ignore[assignment]
+    except PackageNotFoundError as e:  # dev/editable without metadata
+        try:
+            import tomllib  # Python 3.11+
+        except ModuleNotFoundError:  # pragma: no cover
+            import tomli as tomllib  # pip install tomli
+        pyproject = Path(__file__).parents[1].resolve() / 'pyproject.toml'
+        data = tomllib.loads(pyproject.read_text())
+        project_version = data.get("project", {}).get("version", "0+unknown")
+        project_version = project_version.replace('"', '').replace("'", '')
+        __version__ = project_version

{mapflpy-1.1.1 → mapflpy-1.1.2}/mapflpy/utils.py RENAMED Viewed

@@ -2,12 +2,11 @@
 Utility functions for processing fieldline traces.
 """
 from __future__ import annotations
 import math
-import os
 import random
-from collections import namedtuple
 from pathlib import Path
-from typing import Tuple, List, Any, Literal
+from typing import Tuple, List, Any
 import numpy as np
 from numpy._typing import NDArray

{mapflpy-1.1.1 → mapflpy-1.1.2}/meson.build RENAMED Viewed

@@ -1,11 +1,14 @@
 project(
   'mapflpy',
-  ['c', 'fortran'],
-  version : '1.1.1',
+  'c', 'cpp', 'fortran',
+  version: run_command(['tools/pyproject_version.py'], check: true).stdout().strip(),
   license : 'Apache-2.0',
   meson_version : '>=1.1.0',
-  default_options : ['warning_level=1', 'buildtype=release'],
+  default_options : [
+    'warning_level=1',
+    'buildtype=release'
+   ],
 )
 # ---- Compilers / platform niceties
@@ -92,10 +95,7 @@ py.extension_module(
   install : true,
 )
-# ---- Install the pure-Python package tree (future-proof)
-install_subdir('mapflpy', install_dir : py.get_install_dir())
-# ---- Generate mapflpy/_version.py with Meson project version
+# ---- Generate mapflpy/_version.py
 conf = configuration_data()
 conf.set('VERSION', meson.project_version())
 configure_file(
@@ -105,3 +105,14 @@ configure_file(
   install       : true,
   install_dir   : py.get_install_dir() / 'mapflpy',
 )
+# ---- Install the pure-Python package tree
+install_subdir(
+  'mapflpy',
+  install_dir : py.get_install_dir(),
+  exclude_files: [
+    '_version.py.in',
+    '__pycache__',
+    '*.pyc',
+  ]
+)

mapflpy 1.1.1__tar.gz → 1.1.2__tar.gz

mapflpy 1.1.1tar.gz → 1.1.2tar.gz