Skip to content

Commit

Permalink
Merge pull request #114 from regro-cf-autotick-bot/3.1.4_h9ed563
Browse files Browse the repository at this point in the history 
sunpy v3.1.4
  • Loading branch information
@dstansby
dstansby committed Mar 3, 2022
2 parents 9f2c7c6 + 3041927 commit 98a862f
Show file tree
Hide file tree
Showing 20 changed files with 62 additions and 42 deletions.
3 changes: 1 addition & 2 deletions .azure-pipelines/azure-pipelines-win.yml
View file

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

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
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
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
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
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
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
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
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
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
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
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
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

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

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

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

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

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

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
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

1 comment on commit 98a862f

@conda-forge-linter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

You should get push access to this feedstock and CI services.

Your package won't be available for installation locally until it is built
and synced to the anaconda.org CDN (takes 1-2 hours after the build finishes).

Feel free to join the community chat room.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details on this are here.

Please sign in to comment.