Skip to content

Commit 3f8dc6f

Browse files
erogluorhanmuchojpmichaelavs
authored
Merge develop to main (NCAR#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 (NCAR#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 <61620767+muchojp@users.noreply.github.com> Co-authored-by: Michaela Sizemore <43652875+michaelavs@users.noreply.github.com>
1 parent 240c092 commit 3f8dc6f

File tree

16 files changed

+106
-308
lines changed

16 files changed

+106
-308
lines changed

‎.circleci/conda_env.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.circleci/config.yml

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎.github/workflows/ci.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: CI
2+
on:
3+
push:
4+
pull_request:
5+
workflow_dispatch:
6+
# schedule:
7+
# - cron: '0 0 * * *' # Daily “At 00:00”
8+
9+
jobs:
10+
test:
11+
# if: |
12+
# github.repository == 'NCAR/wrf-python'
13+
name: Python (${{ matrix.python-version }}, ${{ matrix.os }})
14+
runs-on: ${{ matrix.os }}
15+
defaults:
16+
run:
17+
shell: bash -l {0}
18+
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
os: [ "ubuntu-latest", "macos-latest"]
23+
python-version: [ "3.6", "3.7", "3.8", "3.9" ]
24+
25+
steps:
26+
- name: Cancel previous runs
27+
uses: styfle/cancel-workflow-action@0.9.0
28+
with:
29+
access_token: ${{ github.token }}
30+
- name: Checkout
31+
uses: actions/checkout@v2
32+
with:
33+
token: ${{ github.token }}
34+
- name: Conda setup
35+
uses: conda-incubator/setup-miniconda@v2
36+
with:
37+
activate-environment: wrf_python_build
38+
python-version: ${{ matrix.python-version }}
39+
channels: conda-forge, ncar
40+
- name: Conda install (Darwin)
41+
if: matrix.os == 'macos-latest'
42+
run: |
43+
conda env update --file build_envs/Darwin.yml --prune
44+
- name: Conda install (Linux)
45+
if: matrix.os == 'ubuntu-latest'
46+
run: |
47+
conda env update --file build_envs/Linux.yml --prune
48+
- name: Build WRF-Python
49+
run: |
50+
cd build_scripts
51+
./gnu_omp.sh
52+
cd ..
53+
- name: Run tests
54+
run: |
55+
cd test/ci_tests
56+
python utests.py

‎osx.yml renamed to ‎build_envs/Darwin.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
# Create full conda environment for development, including some useful tools
2-
name: develop
2+
name: wrf_python_build
33
channels:
44
- conda-forge
55
dependencies:
66
- python=3
7-
- wrapt
8-
- numpy
7+
- basemap
8+
- cartopy
9+
- clang_osx-64
10+
- gfortran_osx-64
11+
- jupyter
912
- matplotlib
1013
- netcdf4
11-
- xarray
12-
- jupyter
14+
- numpy
15+
- pycodestyle
16+
- setuptools
1317
- sphinx
1418
- sphinx_rtd_theme
15-
- pycodestyle
16-
- cartopy
17-
- basemap
18-
- clang_osx-64
19-
- gfortran_osx-64
19+
- wrapt
20+
- xarray
2021

‎linux.yml renamed to ‎build_envs/Linux.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
# Create full conda environment for development, including some useful tools
2-
name: develop
2+
name: wrf_python_build
33
channels:
44
- conda-forge
55
dependencies:
66
- python=3
7-
- wrapt
8-
- numpy
7+
- basemap
8+
- cartopy
9+
- gcc_linux-64
10+
- gfortran_linux-64
11+
- jupyter
912
- matplotlib
1013
- netcdf4
11-
- xarray
12-
- jupyter
14+
- numpy
15+
- pycodestyle
16+
- setuptools
1317
- sphinx
1418
- sphinx_rtd_theme
15-
- pycodestyle
16-
- cartopy
17-
- basemap
18-
- gcc_linux-64
19-
- gfortran_linux-64
19+
- wrapt
20+
- xarray
2021

‎win64.yml renamed to ‎build_envs/Win64.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
# Create full conda environment for development, including some useful tools
2-
name: develop
2+
name: wrf_python_build
33
channels:
44
- conda-forge
5+
- msys2
56
dependencies:
67
- python=3
7-
- wrapt
8-
- numpy
8+
- basemap
9+
- cartopy
10+
- jupyter
11+
- m2w64-toolchain
912
- matplotlib
1013
- netcdf4
11-
- xarray
12-
- jupyter
14+
- numpy
15+
- pycodestyle
16+
- setuptools
1317
- sphinx
1418
- sphinx_rtd_theme
15-
- pycodestyle
16-
- cartopy
17-
- basemap
18-
- m2w64-toolchain
19+
- wrapt
20+
- xarray
1921

‎conda_recipe/meta.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
{% set version = "1.3.2.5" %}
1+
{% set version = "1.3.2.6" %}
22

33
package:
44
name: wrf-python
55
version: {{ version }}
66

77
source:
8+
# for develop
89
git_url: https://github.com/NCAR/wrf-python
9-
git_branch: develop
10+
git_branch: develop
11+
# for release
12+
# fn: wrf-python-{{ version }}.tar.gz
13+
# url: https://github.com/NCAR/wrf-python/archive/{{ version }}.tar.gz
14+
# sha256: 9ca11366ed9a0d5e83e576ac80ce36be4748ba8a06752dac077277acec5e46d9
1015

1116
build:
1217
number: 0

‎conda_recipe/meta.yaml.develop

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)