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.

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

Rebuild for gfortran 7 for OSX (fixed) #48

Merged
merged 19 commits into from
Aug 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ jobs:
strategy:
maxParallel: 8
matrix:
linux_python2.7:
CONFIG: linux_python2.7
UPLOAD_PACKAGES: True
DOCKER_IMAGE: condaforge/linux-anvil-comp7
linux_python3.6:
CONFIG: linux_python3.6
UPLOAD_PACKAGES: True
Expand Down
3 changes: 0 additions & 3 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ jobs:
strategy:
maxParallel: 8
matrix:
osx_python2.7:
CONFIG: osx_python2.7
UPLOAD_PACKAGES: True
osx_python3.6:
CONFIG: osx_python3.6
UPLOAD_PACKAGES: True
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if [ -z "$CONFIG" ]; then
fi

if [ -z "${DOCKER_IMAGE}" ]; then
SHYAML_INSTALLED="$(shyaml --version || echo NO)"
SHYAML_INSTALLED="$(shyaml -h || echo NO)"
if [ "${SHYAML_INSTALLED}" == "NO" ]; then
echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7"
DOCKER_IMAGE="condaforge/linux-anvil-comp7"
Expand Down
48 changes: 0 additions & 48 deletions .ci_support/linux_python2.7.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions .ci_support/linux_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.70.0
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,39 +6,11 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
fortran_compiler:
- gfortran
fortran_compiler_version:
- '7'
hdf5:
- 1.10.5
jasper:
- 1.900.1
libnetcdf:
- 4.6.2
libpng:
- 1.6.35
numpy:
- '1.14'
perl:
- '5.26'
pin_run_as_build:
boost:
max_pin: x.x.x
jasper:
max_pin: x
libnetcdf:
max_pin: x.x.x
libpng:
max_pin: x.x
perl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
30 changes: 0 additions & 30 deletions .ci_support/linux_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
boost:
- 1.70.0
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,39 +6,11 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
fortran_compiler:
- gfortran
fortran_compiler_version:
- '7'
hdf5:
- 1.10.5
jasper:
- 1.900.1
libnetcdf:
- 4.6.2
libpng:
- 1.6.35
numpy:
- '1.14'
perl:
- '5.26'
pin_run_as_build:
boost:
max_pin: x.x.x
jasper:
max_pin: x
libnetcdf:
max_pin: x.x.x
libpng:
max_pin: x.x
perl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
52 changes: 0 additions & 52 deletions .ci_support/osx_python2.7.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions .ci_support/osx_python3.6.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost:
- 1.70.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -10,41 +8,13 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '4'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '4'
hdf5:
- 1.10.5
jasper:
- 1.900.1
libnetcdf:
- 4.6.2
libpng:
- 1.6.35
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.14'
perl:
- '5.26'
pin_run_as_build:
boost:
max_pin: x.x.x
jasper:
max_pin: x
libnetcdf:
max_pin: x.x.x
libpng:
max_pin: x.x
perl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
30 changes: 0 additions & 30 deletions .ci_support/osx_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost:
- 1.70.0
c_compiler:
- clang
c_compiler_version:
Expand All @@ -10,41 +8,13 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '4'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '4'
hdf5:
- 1.10.5
jasper:
- 1.900.1
libnetcdf:
- 4.6.2
libpng:
- 1.6.35
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.14'
perl:
- '5.26'
pin_run_as_build:
boost:
max_pin: x.x.x
jasper:
max_pin: x
libnetcdf:
max_pin: x.x.x
libpng:
max_pin: x.x
perl:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @kmuehlbauer @kynan @ocefpaf @pelson
15 changes: 0 additions & 15 deletions .github/CONTRIBUTING.md

This file was deleted.

25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

18 changes: 0 additions & 18 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

Loading