Merge develop to main (#151)

* Update constants.py

Replace from numpy.asscalar to item() because numpy.asscalar causes FutureWarning.
Deprecated since numpy version 1.16: Deprecated, use numpy.ndarray.item() instead.

* Update decorators.py

Because of the change in the structure of the "collections" module, I change a bit.

* Update latlonutils.py

To avoid FutureWarning, Function "Iterable" should import from collections.abc.

* Update util.py

To avoid FutureWarning, function "Iterable" and "Mapping" should be imported from collections.abc.

* Restructuring repo (#150)

* Restructured folders and env files and some docs in regards

* Additional refactoring to file names

* Github actions configured fully

* Corrected ubuntu vs win64 bug in CI

* Windows build fix

* Trying to fix Windows build tests

* Continue fixing windows build tests

* ANother fixing attempt on windows build tests

* Stil attempting to fix

* Another attempt to fix

* Little correction in config

* Still trying to get windows build tests done

* Maybe this time

* try a different windows build bat

* Another attempt

* Trying vs2015 installation

* again

* Gave up windows build tests

* Remove CircleCI config

* Corrected env namein docs

* Sorted env files alphabetically

* Modified meta.yml and removed unnecessary meta.yaml files

* Corrected constants numpy item

* Numpy item use

Co-authored-by: muchojp <[email protected]>
Co-authored-by: Michaela Sizemore <[email protected]>

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: CI
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  # schedule:
+  #    - cron: '0 0 * * *' # Daily “At 00:00”
+
+jobs:
+  test:
+    # if: |
+    #   github.repository == 'NCAR/wrf-python'
+    name: Python (${{ matrix.python-version }}, ${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ "ubuntu-latest", "macos-latest"]
+        python-version: [ "3.6", "3.7", "3.8", "3.9" ]
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          token: ${{ github.token }}
+      - name: Conda setup
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: wrf_python_build
+          python-version: ${{ matrix.python-version }}
+          channels: conda-forge, ncar
+      - name: Conda install (Darwin)
+        if: matrix.os == 'macos-latest'
+        run: |
+          conda env update --file build_envs/Darwin.yml --prune
+      - name: Conda install (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          conda env update --file build_envs/Linux.yml --prune
+      - name: Build WRF-Python
+        run: |
+          cd build_scripts
+          ./gnu_omp.sh
+          cd ..
+      - name: Run tests
+        run: |
+          cd test/ci_tests
+          python utests.py

osx.yml → build_envs/Darwin.yml

@@ -1,20 +1,21 @@
 # Create full conda environment for development, including some useful tools
-name: develop
+name: wrf_python_build
 channels:
   - conda-forge
 dependencies:
   - python=3
-  - wrapt
-  - numpy
+  - basemap
+  - cartopy
+  - clang_osx-64
+  - gfortran_osx-64
+  - jupyter
   - matplotlib
   - netcdf4
-  - xarray
-  - jupyter
+  - numpy
+  - pycodestyle
+  - setuptools
   - sphinx
   - sphinx_rtd_theme
-  - pycodestyle
-  - cartopy
-  - basemap
-  - clang_osx-64
-  - gfortran_osx-64
+  - wrapt
+  - xarray
 

linux.yml → build_envs/Linux.yml

@@ -1,20 +1,21 @@
 # Create full conda environment for development, including some useful tools
-name: develop
+name: wrf_python_build
 channels:
   - conda-forge
 dependencies:
   - python=3
-  - wrapt
-  - numpy
+  - basemap
+  - cartopy
+  - gcc_linux-64
+  - gfortran_linux-64
+  - jupyter
   - matplotlib
   - netcdf4
-  - xarray
-  - jupyter
+  - numpy
+  - pycodestyle
+  - setuptools
   - sphinx
   - sphinx_rtd_theme
-  - pycodestyle
-  - cartopy
-  - basemap
-  - gcc_linux-64
-  - gfortran_linux-64
+  - wrapt
+  - xarray
 

win64.yml → build_envs/Win64.yml

@@ -1,19 +1,21 @@
 # Create full conda environment for development, including some useful tools
-name: develop
+name: wrf_python_build
 channels:
   - conda-forge
+  - msys2
 dependencies:
   - python=3
-  - wrapt
-  - numpy
+  - basemap
+  - cartopy
+  - jupyter
+  - m2w64-toolchain
   - matplotlib
   - netcdf4
-  - xarray
-  - jupyter
+  - numpy
+  - pycodestyle
+  - setuptools
   - sphinx
   - sphinx_rtd_theme
-  - pycodestyle
-  - cartopy
-  - basemap
-  - m2w64-toolchain
+  - wrapt
+  - xarray
 

conda_recipe/meta.yaml

@@ -1,12 +1,17 @@
-{% set version = "1.3.2.5" %}
+{% set version = "1.3.2.6" %}
 
 package:
   name: wrf-python
   version: {{ version }}
 
 source:
+#  for develop
   git_url: https://github.com/NCAR/wrf-python
-  git_branch: develop 
+  git_branch: develop
+#  for release
+#  fn: wrf-python-{{ version }}.tar.gz
+#  url: https://github.com/NCAR/wrf-python/archive/{{ version }}.tar.gz
+#  sha256: 9ca11366ed9a0d5e83e576ac80ce36be4748ba8a06752dac077277acec5e46d9
 
 build:
   number: 0