pygtide 0.8.0__tar.gz → 0.8.2__tar.gz

pygtide-0.8.2/MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md
+include build_pygtide_abi.py
+include meson.build
+include src/etpred.f90

{pygtide-0.8.0/pygtide.egg-info → pygtide-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygtide
-Version: 0.8.0
+Version: 0.8.2
 Summary: A Python module and wrapper for ETERNA PREDICT to compute gravitational tides on Earth
 Author: Tom Eulenfeld
 Author-email: "Gabriel C. Rau" <gabriel@hydrogeo.science>
@@ -49,18 +49,18 @@ There are two options:
 * Download and install [*Anaconda*](https://www.anaconda.com/products/distribution) or [*Miniconda*](https://docs.conda.io/en/latest/miniconda.html)
 * Install required packages:
   ```
-  conda install numpy pandas requests
+  conda install numpy pandas
   ```
 
 ### Installation options
 
-#### Option 1: Install and compile source distribution from PyPi (Linux, macOS, Windows; Python 3.8–3.14)
+#### Option 1: Install and compile source distribution from PyPi (Python 3.8–3.11) or install pre-compiled distribution (Linux, macOS, Windows; Python>=3.12)
 
 ```bash
 pip install pygtide
 ```
 
-#### Option 2: Build from source locally (Linux, macOS, Windows; Python 3.8–3.14)
+#### Option 2: Build from source locally (Linux, macOS, Windows; Python>=3.8)
 
 **Requirements for building:**
 - A Fortran compiler (e.g., `gfortran` via MinGW on Windows; included in Linux/macOS gcc toolchains) `conda install gfortran`
@@ -78,17 +78,6 @@ cd /path/to/pygtide
 pip install .
 ```
 
-If Meson or Ninja are missing, pip will attempt to install them automatically. For faster builds, pre-install them:
-```bash
-pip install meson-python meson ninja
-```
-
-#### Option 3: Pre-built wheels (Windows, Python 3.8–3.11)
-Download the correct wheel for your Python version from the `windows/` subfolder and install:
-```powershell
-pip install [wheel_name_depending_on_python_version]
-```
-
 ### After installation
 
 * Run tests to verify installation:

{pygtide-0.8.0 → pygtide-0.8.2}/README.md

@@ -19,18 +19,18 @@ There are two options:
 * Download and install [*Anaconda*](https://www.anaconda.com/products/distribution) or [*Miniconda*](https://docs.conda.io/en/latest/miniconda.html)
 * Install required packages:
   ```
-  conda install numpy pandas requests
+  conda install numpy pandas
   ```
 
 ### Installation options
 
-#### Option 1: Install and compile source distribution from PyPi (Linux, macOS, Windows; Python 3.8–3.14)
+#### Option 1: Install and compile source distribution from PyPi (Python 3.8–3.11) or install pre-compiled distribution (Linux, macOS, Windows; Python>=3.12)
 
 ```bash
 pip install pygtide
 ```
 
-#### Option 2: Build from source locally (Linux, macOS, Windows; Python 3.8–3.14)
+#### Option 2: Build from source locally (Linux, macOS, Windows; Python>=3.8)
 
 **Requirements for building:**
 - A Fortran compiler (e.g., `gfortran` via MinGW on Windows; included in Linux/macOS gcc toolchains) `conda install gfortran`
@@ -48,17 +48,6 @@ cd /path/to/pygtide
 pip install .
 ```
 
-If Meson or Ninja are missing, pip will attempt to install them automatically. For faster builds, pre-install them:
-```bash
-pip install meson-python meson ninja
-```
-
-#### Option 3: Pre-built wheels (Windows, Python 3.8–3.11)
-Download the correct wheel for your Python version from the `windows/` subfolder and install:
-```powershell
-pip install [wheel_name_depending_on_python_version]
-```
-
 ### After installation
 
 * Run tests to verify installation:

pygtide-0.8.2/build_pygtide_abi.py

@@ -0,0 +1,47 @@
+import subprocess
+import shutil
+import os
+import glob
+import sys
+
+
+def build():
+    # --- Configuration ---
+    print('Start Meson build')
+    build_dir = 'build_abi'
+    ext = 'pyd' if os.name == 'nt' else 'so'
+
+    # --- Step 1: Setup Meson build directory ---
+    if os.path.exists(build_dir):
+        print(f"Build directory '{build_dir}' already exists, skipping setup.")
+    else:
+        print(f"Setting up Meson build directory '{build_dir}'...")
+        subprocess.check_call(['meson', 'setup', build_dir])
+    # --- Step 2: Compile Meson targets ---
+    print("Compiling Meson targets...")
+    subprocess.check_call(['meson', 'compile', '-C', build_dir])
+
+    # --- Step 3: Copy ABI module to pygtide/ ---
+    print("Locating ABI module in build directory...")
+    build_path = os.path.abspath(build_dir)
+    pattern = os.path.join(build_path, '**', f'etpred*.{ext}')
+    matches = glob.glob(pattern, recursive=True)
+
+    if not matches:
+        print("ERROR: ABI module not found! Did Meson compile succeed?")
+        sys.exit(1)
+
+    dst = os.path.join(os.path.abspath('.'), 'pygtide', f'etpred.{ext}')
+    shutil.copy(matches[0], dst)
+    print(f"Copied ABI module {matches[0]} -> {dst}")
+
+    # --- Step 4: Clean up build directory ---
+    print(f"Deleting build directory '{build_dir}'...")
+    shutil.rmtree(build_dir)
+    print("Meson build complete!")
+
+    #print("\nNext step: run 'pip install .' or 'pip install -e .' to install the package.")
+
+
+if __name__ == '__main__':
+    build()

pygtide-0.8.2/meson.build

@@ -0,0 +1,74 @@
+project('pygtide', 'fortran',
+  version : '0.8.2',
+  meson_version : '>=1.1.0',
+)
+
+py = import('python').find_installation()
+
+host_os = host_machine.system()
+fc = meson.get_compiler('fortran')
+
+if host_os == 'windows'
+  ext = 'pyd'
+  if fc.get_id() == 'msvc'
+    f90flags = ['/O2']
+  else
+    f90flags = ['-O3']
+  endif
+else
+  ext = 'so'
+  f90flags = ['-fPIC', '-O3']
+endif
+
+src = 'src/etpred.f90'
+f90_flag_args = ['--f90flags=' + ' '.join(f90flags)]
+
+# --------------------------------------------------
+# 1. Build f2py (ABI-tagged output)
+# --------------------------------------------------
+etpred_build = custom_target(
+  'etpred_build',
+  input : src,
+  output : 'etpred.build.stamp',
+  command : [
+    py,
+    '-m', 'numpy.f2py',
+    '-c',
+  ] + f90_flag_args + [
+    '-m', 'etpred',
+    '@INPUT@',
+  ],
+  build_by_default : true,
+)
+
+# --------------------------------------------------
+# 2. Copy ABI module → pygtide/etpred.pyd
+# --------------------------------------------------
+copy_code = '''
+import glob, os, shutil, sys
+
+build_dir = os.getcwd()
+src_root = r"@0@"
+
+pattern = os.path.join(build_dir, '**', 'etpred*.@1@')
+matches = glob.glob(pattern, recursive=True)
+
+if not matches:
+    print("ERROR: etpred ABI module not found")
+    sys.exit(1)
+
+dst = os.path.join(src_root, 'pygtide', 'etpred.@1@')
+shutil.copy(matches[0], dst)
+print(f"Copied {matches[0]} -> {dst}")
+'''.format(
+  meson.project_source_root(),
+  ext
+)
+
+custom_target(
+  'copy_etpred',
+  input : etpred_build,
+  output : 'etpred.copy.stamp',
+  command : [py, '-c', copy_code],
+  build_by_default : true,
+)

{pygtide-0.8.0 → pygtide-0.8.2/pygtide.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygtide
-Version: 0.8.0
+Version: 0.8.2
 Summary: A Python module and wrapper for ETERNA PREDICT to compute gravitational tides on Earth
 Author: Tom Eulenfeld
 Author-email: "Gabriel C. Rau" <gabriel@hydrogeo.science>
@@ -49,18 +49,18 @@ There are two options:
 * Download and install [*Anaconda*](https://www.anaconda.com/products/distribution) or [*Miniconda*](https://docs.conda.io/en/latest/miniconda.html)
 * Install required packages:
   ```
-  conda install numpy pandas requests
+  conda install numpy pandas
   ```
 
 ### Installation options
 
-#### Option 1: Install and compile source distribution from PyPi (Linux, macOS, Windows; Python 3.8–3.14)
+#### Option 1: Install and compile source distribution from PyPi (Python 3.8–3.11) or install pre-compiled distribution (Linux, macOS, Windows; Python>=3.12)
 
 ```bash
 pip install pygtide
 ```
 
-#### Option 2: Build from source locally (Linux, macOS, Windows; Python 3.8–3.14)
+#### Option 2: Build from source locally (Linux, macOS, Windows; Python>=3.8)
 
 **Requirements for building:**
 - A Fortran compiler (e.g., `gfortran` via MinGW on Windows; included in Linux/macOS gcc toolchains) `conda install gfortran`
@@ -78,17 +78,6 @@ cd /path/to/pygtide
 pip install .
 ```
 
-If Meson or Ninja are missing, pip will attempt to install them automatically. For faster builds, pre-install them:
-```bash
-pip install meson-python meson ninja
-```
-
-#### Option 3: Pre-built wheels (Windows, Python 3.8–3.11)
-Download the correct wheel for your Python version from the `windows/` subfolder and install:
-```powershell
-pip install [wheel_name_depending_on_python_version]
-```
-
 ### After installation
 
 * Run tests to verify installation:

{pygtide-0.8.0 → pygtide-0.8.2}/pygtide.egg-info/SOURCES.txt

@@ -1,11 +1,12 @@
 LICENSE
 MANIFEST.in
 README.md
+build_pygtide_abi.py
+meson.build
 pyproject.toml
 setup.py
 pygtide/__init__.py
 pygtide/core.py
-pygtide/etpred.so
 pygtide/tests.py
 pygtide/update_etpred_data.py
 pygtide.egg-info/PKG-INFO
@@ -26,4 +27,5 @@ pygtide/commdat/hw95s.dat
 pygtide/commdat/ksm03.dat
 pygtide/commdat/ratgp95.dat
 pygtide/commdat/tamurahw.dat
-pygtide/commdat/xi1989hw.dat
+pygtide/commdat/xi1989hw.dat
+src/etpred.f90

{pygtide-0.8.0 → pygtide-0.8.2}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygtide"
-version = "0.8.0"
+version = "0.8.2"
 description = "A Python module and wrapper for ETERNA PREDICT to compute gravitational tides on Earth"
 readme = "README.md"
 license = "MPL-2.0"
@@ -50,8 +50,7 @@ Issues = "https://github.com/hydrogeoscience/pygtide/issues"
 # Setuptools-specific configuration
 # ----------------------------
 [tool.setuptools]
-packages = ["pygtide"]             # <-- move packages here
-include-package-data = true        # include package data
+packages = ["pygtide"]
 
 [tool.setuptools.package-data]
 pygtide = ["etpred.*", "commdat/*"]

pygtide-0.8.2/setup.py

@@ -0,0 +1,40 @@
+# setup.py
+from pathlib import Path
+import sys
+
+from setuptools import setup, Distribution
+from setuptools.command.build import build as _build
+
+
+class build(_build):
+    def run(self):
+        # Detect platform-specific ABI extension
+        here = Path(__file__).resolve().parent
+        ext = '.pyd' if sys.platform.startswith('win') else '.so'
+        etpred_path = here / 'pygtide' / f'etpred{ext}'
+        if etpred_path.exists():
+            print(f"Use ABI module {etpred_path}")
+        else:
+            print(f"Prebuilt ABI module not found: {etpred_path}\n"
+                    "Run build_pygtide_abi.py")
+            sys.path.insert(0, str(here))
+            import build_pygtide_abi
+            # Start Meson build
+            build_pygtide_abi.build()
+            if not etpred_path.exists():
+                raise FileNotFoundError(f"No ABI module, error in Meson build")
+        super().run()
+
+
+# tell setuptools to build platform-dependent wheels
+class BinaryDistribution(Distribution):
+    def has_ext_modules(self):
+        return True
+
+
+# Metadata pulled from pyproject.toml
+setup(
+    distclass=BinaryDistribution,
+    cmdclass={'build': build}
+)
+