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.

Sign up for GitHub

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

python312Packages.pastedeploy: 3.0.1 -> 3.1 #341434

Merged
merged 2 commits into from
Nov 3, 2024
Merged

python312Packages.pastedeploy: 3.0.1 -> 3.1 #341434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648e093
python312Packages.paste: use `pyproject = true`
anthonyroussel Sep 12, 2024
b2d96f2
python312Packages.pastedeploy: 3.0.1 -> 3.1
anthonyroussel Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkgs/development/python-modules/paste/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "paste";
version = "3.10.1";
format = "setuptools";
pyproject = true;

disabled = pythonOlder "3.7";

src = fetchFromGitHub {
owner = "cdent";
owner = "pasteorg";
repo = "paste";
rev = "refs/tags/${version}";
hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o=";
Expand All @@ -26,7 +26,9 @@ buildPythonPackage rec {
patchShebangs tests/cgiapp_data/
'';

propagatedBuildInputs = [
build-system = [ setuptools ];

dependencies = [
setuptools
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure setuptools is required at runtime?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you for the review!
Yes, setuptools is required for pkg_resources, see https://github.com/pasteorg/paste/blob/bc1753b00c5f342d28b1af73cd4f662b206c1f37/setup.py#L58

six
];
Expand All @@ -43,7 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Tools for using a Web Server Gateway Interface stack";
homepage = "https://pythonpaste.readthedocs.io/";
changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt";
changelog = "https://github.com/pasteorg/paste/blob/${version}/docs/news.txt";
license = licenses.mit;
maintainers = [ ];
};
Expand Down
11 changes: 7 additions & 4 deletions pkgs/development/python-modules/pastedeploy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,30 @@
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
setuptools,
}:

buildPythonPackage rec {
pname = "pastedeploy";
version = "3.0.1";
format = "setuptools";
version = "3.1";
pyproject = true;

disabled = pythonOlder "3.7";

src = fetchFromGitHub {
owner = "Pylons";
repo = pname;
repo = "pastedeploy";
rev = "refs/tags/${version}";
hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q=";
Copy link
Member

Choose a reason for hiding this comment

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

@anthonyroussel you didn't update the hash for the new version (which also means you built and tested against the old version's source, which happened to be in your local store as a fixed-output derivation).

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you for the review!

Oops sorry, indeed, looks like I forgot to update the hash for this package.

I created this PR to fix the hash: #368915

};

postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov" ""
--replace-fail " --cov" ""
Copy link
Member

Choose a reason for hiding this comment

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

We could also use pytest-cov-stub

'';

build-system = [ setuptools ];

nativeCheckInputs = [ pytestCheckHook ];

pythonImportsCheck = [ "paste.deploy" ];
Expand Down