diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2023-01-25 10:32:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 10:32:07 +0100 |
commit | 99aab903b28a7a1d3757d2df08560148cdad7ea4 (patch) | |
tree | d3eb2215c8dec4549ac64b10f073b96f627627e8 /pkgs | |
parent | 7b042d4dbf8bf5ca2418b36c17f2a4af882f53ce (diff) | |
parent | 53fe843d31741ba128e901a4247eebb88a42b16c (diff) |
Merge pull request #212478 from fabaff/stone-fix
python310Packages.stone: replace inspect.getargspec
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/stone/default.nix | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 1e20409b0ec9c..a0d07fa515424 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -5,43 +5,53 @@ , ply , pytestCheckHook , six +, pythonOlder }: buildPythonPackage rec { pname = "stone"; version = "3.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi sdist misses requirements.txt src = fetchFromGitHub { owner = "dropbox"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - sed -i '/pytest-runner/d' setup.py + # https://github.com/dropbox/stone/issues/288 + substituteInPlace stone/frontend/ir_generator.py \ + --replace "inspect.getargspec" "inspect.getfullargspec" + substituteInPlace setup.py \ + --replace "'pytest-runner == 5.2.0'," "" ''; - propagatedBuildInputs = [ ply six ]; - - nativeCheckInputs = [ pytestCheckHook mock ]; + propagatedBuildInputs = [ + ply + six + ]; - # try to import from `test` directory, which is exported by the python interpreter - # and cannot be overridden without removing some py3 to py2 support - disabledTestPaths = [ - "test/test_tsd_types.py" - "test/test_js_client.py" + nativeCheckInputs = [ + pytestCheckHook + mock ]; + disabledTests = [ "test_type_name_with_module" ]; - pythonImportsCheck = [ "stone" ]; + pythonImportsCheck = [ + "stone" + ]; meta = with lib; { description = "Official Api Spec Language for Dropbox"; homepage = "https://github.com/dropbox/stone"; + changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; |