Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3fc66462dee4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ae60cff0c20
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 10, 2019

  1. devpi-client: 4.1.0 -> 5.0.0 

    unbreak the package, clean up dependencies and make them overridable
    @makefu
    makefu authored and Jon committed Oct 10, 2019
    Copy the full SHA
    9ae60cf View commit details
Showing with 43 additions and 18 deletions.
  1. +42 −17 pkgs/development/tools/devpi-client/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
59 changes: 42 additions & 17 deletions pkgs/development/tools/devpi-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,65 @@
{ stdenv
, pythonPackages
, buildPythonApplication
, fetchPypi
# buildInputs
, glibcLocales
, pkginfo
, check-manifest
# propagatedBuildInputs
, py
, devpi-common
, pluggy
, setuptools
# CheckInputs
, pytest
, pytest-flake8
, webtest
, mock
, devpi-server
, tox
, sphinx
, wheel
, git
, mercurial
} :

pythonPackages.buildPythonApplication rec {
buildPythonApplication rec {
pname = "devpi-client";
version = "4.1.0";
version = "5.0.0";

src = pythonPackages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "0f5jkvxx9fl8v5vwbwmplqhjsdfgiib7j3zvn0zxd8krvi2s38fq";
sha256 = "0hyj3xc5c6658slk5wgcr9rh7hwi5r3hzxk1p6by61sqx5r38v3q";
};

checkInputs = with pythonPackages; [
pytest pytest-flakes webtest mock
devpi-server tox
sphinx wheel git mercurial detox
setuptools
];
buildInputs = [ glibcLocales pkginfo check-manifest ];

propagatedBuildInputs = [ py devpi-common pluggy setuptools ];

checkInputs = [
pytest pytest-flake8 webtest mock
devpi-server tox
sphinx wheel git mercurial
];

checkPhase = ''
export PATH=$PATH:$out/bin
export HOME=$TMPDIR # fix tests failing in sandbox due to "/homeless-shelter"
# setuptools do not get propagated into the tox call (cannot import setuptools)
rm testing/test_test.py
# test_pypi_index_attributes: tries to connect to upstream pypi
# test_test: setuptools does not get propagated into the tox call (cannot import setuptools), also no detox
# test_index: hangs forever
# test_upload: fails multiple times with
# > assert args[0], args
# F AssertionError: [None, local('/build/pytest-of-nixbld/pytest-0/test_export_attributes_git_set0/repo2/setupdir/setup.py'), '--name']
# test_pypi_index_attributes tries to connect to upstream pypi
py.test -k 'not test_pypi_index_attributes' testing
py.test -k 'not test_pypi_index_attributes \
and not test_test \
and not test_index \
and not test_upload' testing
'';

LC_ALL = "en_US.UTF-8";
buildInputs = with pythonPackages; [ glibcLocales pkginfo check-manifest ];
propagatedBuildInputs = with pythonPackages; [ py devpi-common pluggy setuptools ];

meta = with stdenv.lib; {
homepage = http://doc.devpi.net;
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7526,7 +7526,7 @@ in

dbmate = callPackage ../development/tools/database/dbmate { };

devpi-client = callPackage ../development/tools/devpi-client {};
devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};

devpi-server = callPackage ../development/tools/devpi-server {};