Merge branch 'master' of https://github.com/tjlang/CSU_RadarTools

Author: tjlang

.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - 'master'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: ${{ matrix.os }}-python-${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        os: [ubuntu-latest] # only testing ubuntu
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gfortran python3-dev build-essential
+          gfortran --version
+
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install cython pytest
+          pip install -r requirements.txt
+
+      - name: Build and Install csu_radartools
+        run: |
+          python setup.py build_ext --inplace
+          python setup.py install
+
+      - name: Run Tests
+        run: |
+          pytest tests/
+
+

continuous_integration/environment-ci.yml

@@ -0,0 +1,12 @@
+name: csu-radartools-dev
+channels:
+  - conda-forge
+dependencies:
+  - numpy
+  - pandas
+  - scipy
+  - matplotlib
+  - cython
+  - setuptools  # For building and installing the package
+  - pytest      # For running tests
+

csu_radartools/csu_fhc_melt.py

@@ -213,7 +213,7 @@ def get_ml_ppi(fh, dz, height, expected_ML,
             npts = len(np.ravel(whsec))
             # print(npts)
             ML_num_sector = len(ML_sector)
-            per_ML = np.float(ML_num_sector)/npts*100.
+            per_ML = float(ML_num_sector)/npts*100.
             # print('ML number in sector', ML_num_sector,
             #       'percent of sector', per_ML)
             # print('Mean dz in ML', np.nanmean(dz[wh_sector1]))

csu_radartools/csu_misc.py

@@ -15,7 +15,7 @@
 from __future__ import division
 import numpy as np
 from warnings import warn
-from scipy.ndimage.measurements import label
+from scipy.ndimage import label
 
 VERSION = '1.3'
 

requirements.txt

@@ -0,0 +1,6 @@
+numpy
+pandas
+scipy
+matplotlib
+cython
+

setup.py

@@ -79,8 +79,7 @@ def get_version(module=None):
                         include_dirs=INCLUDE_DIRS)]  # <-- MOVED HERE
 
 if USE_CYTHON:
-    EXTENSIONS = cythonize(EXTENSIONS,
-                           compiler_directives={'cpow': True})
+    EXTENSIONS = cythonize(EXTENSIONS, compiler_directives={'cpow': True})
 
 
 # Run setup