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

Jump to bottom

sunpy v3.1.4 #114

Merged
merged 5 commits into from
Mar 3, 2022
Merged

sunpy v3.1.4 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f376374
updated v3.1.4
regro-cf-autotick-bot Feb 21, 2022
1c61740
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.17.2, and co…
regro-cf-autotick-bot Feb 21, 2022
ad3b965
Pin asdf
dstansby Mar 2, 2022
aa9d4f8
Set maximum h5netcdf pin
dstansby Mar 2, 2022
3041927
Only exclude one asdf version
dstansby Mar 2, 2022
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
3 changes: 1 addition & 2 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion .ci_support/README
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 29 additions & 13 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "sunpy" %}
{% set version = "3.1.3" %}
{% set sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2" %}
{% set version = "3.1.4" %}
{% set sha256 = "4c3b25635294a2147dcf2c89ebe07de4c30cb142f54c1978f4bfa7482bd9f672" %}

package:
name: {{ name|lower }}
Expand Down Expand Up @@ -45,7 +45,7 @@ requirements:
- python-dateutil >=2.8.0
- zeep >=3.4.0
- tqdm >=4.32.1
- h5netcdf >=0.8.1
- h5netcdf >=0.8.1,<0.14
- h5py >=3.1.0 # Not a direct dependancy, but goes files wont load without
- mpl_animators >=1.0.0

Expand All @@ -54,7 +54,7 @@ test:
- hypothesis
- pytest-astropy
- pytest-mock
- asdf
- asdf !=2.10.0
- jplephem
- pytest-mpl
- reproject
Expand Down