Skip to content

Commit

Permalink
Merge pull request #361 from xhochy/spdx
Browse files Browse the repository at this point in the history
Reflect PSF-2.0 being an official SPDX license
  • Loading branch information
ocefpaf authored Sep 21, 2023
2 parents 0ce048f + 6bc26df commit 0d78a2c
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 62 deletions.
56 changes: 8 additions & 48 deletions .azure-pipelines/azure-pipelines-win.yml

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

9 changes: 4 additions & 5 deletions .scripts/build_steps.sh

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

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

8 changes: 4 additions & 4 deletions .scripts/run_osx_build.sh

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

115 changes: 115 additions & 0 deletions .scripts/run_win_build.bat

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

2 changes: 1 addition & 1 deletion README.md

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

4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
sha256: 83e97200421dc8b0022eba92f03174d9bf80c966df25a6f03f44608bfe36a7ac

build:
number: 0
number: 1

outputs:
- name: matplotlib-base
Expand Down Expand Up @@ -94,7 +94,7 @@ outputs:

about:
home: http://matplotlib.org/
license: LicenseRef-PSF-2.0 and CC0-1.0
license: PSF-2.0
license_url: http://matplotlib.sourceforge.net/users/license.html
license_family: PSF
license_file: LICENSE/LICENSE
Expand Down

0 comments on commit 0d78a2c

Please sign in to comment.