Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fortran compiler 4.8.5 requirement for OSX #560

Merged
merged 4 commits into from
Nov 13, 2019
Merged

Remove fortran compiler 4.8.5 requirement for OSX #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c9d70b
Remove gfortran 4.8.5 requirement
mauzey1 Sep 3, 2019
88f11cc
Merge branch 'master' into gfortran7
mauzey1 Nov 13, 2019
010d34a
Remove setting libnetcdf to 4.6.2
mauzey1 Nov 13, 2019
3d433be
Set libnetcdf to 4.6.2 again
mauzey1 Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ aliases:
export PYTHONPATH=Test/:$PYTHONPATH
for file in `ls -1 Test/test_python_CMIP6_CV*.py`; do echo $file; python $file; mystatus=$?; if [[ "$mystatus" != "0" ]]; then return ${mystatus}; fi; done
python run_tests.py -v2 -H -n1 Test/test_python_CMIP6_CV*.py

- &conda_upload
name: conda_upload
command: |
Expand Down
3 changes: 0 additions & 3 deletions recipes/cmor/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ python:
- 2.7
- 3.6
- 3.7
fortran_compiler_version: # [osx]
- 4.8.5 # [osx]

2 changes: 1 addition & 1 deletion recipes/cmor/meta.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ requirements:
- udunits2
- six
- json-c
- libnetcdf 4.6.2
- {{ pin_compatible('numpy') }}
- {{ pin_compatible('hdf5') }}
- {{ pin_compatible('libnetcdf') }}
- {{ pin_compatible('netcdf4') }}

about:
Expand Down