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.

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

init devpi-server at 4.3.1, bump devpi-client #32335

Merged
merged 7 commits into from Dec 5, 2017

Conversation

makefu
Copy link
Contributor

@makefu makefu commented Dec 5, 2017

Motivation for this change

This PR introduces devpi-server to nixpkgs. For this PR, argon2 needs to be supported by passlib.
With the devpi-server package it is possible to re-enable tests for devpi-client, however a couple of tests needed to be disabled because of issues with tox and setuptools.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

waiting for you, @GrahamcOfBorg ;)

@Mic92
Copy link
Member

Mic92 commented Dec 5, 2017

@GrahamcOfBorg build devpi-client devpi-server

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux


=============================== warnings summary ===============================
None
  Module already imported so can not be re-written: _pytest.pytester

-- Docs: http://doc.pytest.org/en/latest/warnings.html
============================== 1 tests deselected ==============================
====== 182 passed, 2 skipped, 1 deselected, 1 warnings in 423.22 seconds =======
/nix/store/nwpi23zfcr48cxgw66fq84lh2ljv8gxr-devpi-client-3.1.0
/nix/store/4dl5a6vk25i7jml785wfcmjw7w38jncp-devpi-server-4.3.1

inherit pname version;
sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
};
buildInputs = [ pytest ];
Copy link
Member

@Mic92 Mic92 Dec 5, 2017

Choose a reason for hiding this comment

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

Not propagatedBuildInputs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I took pytest-xdist, `pytest-datafiles as reference, none of them seems to use pytest as propagated build input

Copy link
Member

Choose a reason for hiding this comment

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

Correct. pytest plugins do not propagate pytest because it should be possible to use a different pytest with a certain plugin.


argon2_cffi = callPackage ../development/python-modules/argon2_cffi { };

pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
Copy link
Member

@Mic92 Mic92 Dec 5, 2017

Choose a reason for hiding this comment

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

@FRidh does not like just appending new packages to the end :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

python-packages is fubar, with multiple beginnings and endings

Copy link
Member

Choose a reason for hiding this comment

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

I don't like it? Well, we should aim at having ordering. PR's that improve ordering are more than welcome.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will have a look into it, but not for this PR ;)

Copy link
Member

Choose a reason for hiding this comment

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

Even partial order should help to avoid merge conflicts.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just tried my best to add them somewhere ...

inherit pname version;
sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
};
buildInputs = [ pytest ];
Copy link
Member

Choose a reason for hiding this comment

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

Correct. pytest plugins do not propagate pytest because it should be possible to use a different pytest with a certain plugin.

{ stdenv
, lib
, python
, python3
Copy link
Member

Choose a reason for hiding this comment

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

python3 is not used. Also, don't pass both python and pythonPackages. Both already contain references to each other.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

you are right, this is a leftover from the times where i've tried to get the test_test.py tests running but failed in providing a python version with setuptools to the tox environment

@grahamc
Copy link
Member

grahamc commented Dec 5, 2017

@GrahamcOfBorg eval

@Mic92 Mic92 merged commit 7e6068c into NixOS:master Dec 5, 2017
@makefu
Copy link
Contributor Author

makefu commented Dec 5, 2017

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants