cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #128992 from fabaff/bump-asdf

Browse source
This commit is contained in:
Sandro 2021-07-05 23:49:14 +02:00 committed by GitHub
commit 6f49222269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/python-modules/asdf/default.nix
View file

@ -2,6 +2,8 @@
, astropy , astropy
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, importlib-resources
, jmespath
, jsonschema , jsonschema
, numpy , numpy
, packaging , packaging
@ -15,23 +17,26 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "asdf"; pname = "asdf";
version = "2.7.3"; version = "2.8.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp"; sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ propagatedBuildInputs = [
jmespath
jsonschema jsonschema
numpy numpy
packaging packaging
pyyaml pyyaml
semantic-version semantic-version
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
]; ];
checkInputs = [ checkInputs = [
@ -50,6 +55,6 @@ buildPythonPackage rec {
description = "Python tools to handle ASDF files"; description = "Python tools to handle ASDF files";
homepage = "https://github.com/spacetelescope/asdf"; homepage = "https://github.com/spacetelescope/asdf";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = with maintainers; [ costrouc ];
}; };
} }

10
pkgs/development/python-modules/sunpy/default.nix
View file

@ -31,12 +31,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sunpy"; pname = "sunpy";
version = "3.0.0"; version = "3.0.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-N/DAvnO+S9E4tndEWpiG84P3FCFwxYNdGFxbxUVsTx8="; sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -75,11 +75,13 @@ buildPythonPackage rec {
# darwin has write permission issues # darwin has write permission issues
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
# ignore documentation tests # ignore documentation tests and ignore tests with schema issues
checkPhase = '' checkPhase = ''
PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \ PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \
--deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \ --deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \
--deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module \
--ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml \
--ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml
''; '';
meta = with lib; { meta = with lib; {