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

makefu · 2017-12-05T10:34:15Z

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 · 2017-12-05T10:49:12Z

@GrahamcOfBorg build devpi-client devpi-server

GrahamcOfBorg

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

Mic92 · 2017-12-05T11:22:01Z

pkgs/development/python-modules/pytest-timeout/default.nix

+    inherit pname version;
+    sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
+  };
+  buildInputs = [ pytest ];


Not propagatedBuildInputs?

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

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

Mic92 · 2017-12-05T11:22:59Z

pkgs/top-level/python-packages.nix

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


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

python-packages is fubar, with multiple beginnings and endings

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

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

Even partial order should help to avoid merge conflicts.

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

FRidh · 2017-12-05T11:51:31Z

pkgs/development/python-modules/pytest-timeout/default.nix

+    inherit pname version;
+    sha256 = "1kdp6qbh5v1168l99rba5yfzvy05gmzkmkhldgp36p9xcdjd5dv8";
+  };
+  buildInputs = [ pytest ];


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

FRidh · 2017-12-05T11:52:43Z

pkgs/development/tools/devpi-client/default.nix

+{ stdenv
+, lib
+, python
+, python3


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

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 · 2017-12-05T12:24:52Z

@GrahamcOfBorg eval

enable tests with packaged devpi-server

makefu · 2017-12-05T12:46:31Z

thanks!

makefu requested a review from FRidh as a code owner December 5, 2017 10:34

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Dec 5, 2017

GrahamcOfBorg reviewed Dec 5, 2017

View reviewed changes

Mic92 reviewed Dec 5, 2017

View reviewed changes

FRidh requested changes Dec 5, 2017

View reviewed changes

makefu force-pushed the pkgs/devpi-common/update branch from 87de3e1 to ffce662 Compare December 5, 2017 12:19

argon2_cffi: init at 16.3.0

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

7c464e3

GrahamcOfBorg added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 and removed 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Dec 5, 2017

makefu added 6 commits December 5, 2017 13:31

pytest-timeout: init at 1.2.1

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

19ce61d

passlib: build with argon2_cffi

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

6ad7626

devpi-common: 3.1.0 -> 3.2.0

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

8002a3b

devpi-server: init at 4.3.1

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

623f9c1

devpi-client: 3.1.0rc1 -> 3.1.0

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

29672cf

enable tests with packaged devpi-server

devpi-client: enable tests

Verified

This commit was signed with the committer’s verified signature.

makefu Felix Richter

GPG key ID: 36F7711F3FC0F225

Verified
Learn about vigilant mode

7e39ecb

makefu force-pushed the pkgs/devpi-common/update branch from ffce662 to 7e39ecb Compare December 5, 2017 12:32

Mic92 merged commit 7e6068c into NixOS:master Dec 5, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

makefu commented Dec 5, 2017

Mic92 commented Dec 5, 2017

GrahamcOfBorg left a comment

Mic92 Dec 5, 2017 •

edited

Loading

makefu Dec 5, 2017

FRidh Dec 5, 2017

Mic92 Dec 5, 2017 •

edited

Loading

makefu Dec 5, 2017

FRidh Dec 5, 2017

makefu Dec 5, 2017

Mic92 Dec 5, 2017

makefu Dec 5, 2017

FRidh Dec 5, 2017

FRidh Dec 5, 2017

makefu Dec 5, 2017

grahamc commented Dec 5, 2017

makefu commented Dec 5, 2017


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

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

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

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

Conversation

makefu commented Dec 5, 2017

Motivation for this change

Things done

Mic92 commented Dec 5, 2017

GrahamcOfBorg left a comment

Choose a reason for hiding this comment

Mic92 Dec 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mic92 Dec 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grahamc commented Dec 5, 2017

makefu commented Dec 5, 2017

Mic92 Dec 5, 2017 •

edited

Loading

Mic92 Dec 5, 2017 •

edited

Loading