Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pkgs/development/python-modules/aiosteamist/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ buildPythonPackage rec {

postPatch = ''
substituteInPlace pyproject.toml \
--replace 'xmltodict = "^0.12.0"' 'xmltodict = ">=0.12.0"' \
--replace "--cov=aiosteamist" ""
'';

Expand Down
28 changes: 19 additions & 9 deletions pkgs/development/python-modules/sopel/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
{ lib, buildPythonPackage, fetchPypi, isPyPy
{ lib
, buildPythonPackage
, dnspython
, fetchPypi
, geoip2
, ipython
, isPyPy
, praw
, pyenchant
, pygeoip
, pytestCheckHook
, pythonOlder
, pytz
, sqlalchemy
, xmltodict
}:

buildPythonPackage rec {
pname = "sopel";
version = "7.1.8";
disabled = isPyPy;
version = "7.1.9";
format = "setuptools";

disabled = isPyPy || pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
sha256 = "sha256-zxb95GVcDrd3FG/k+0PLg+dVlMgQpf1ntG8jF/zpHH4=";
hash = "sha256-IJ+ovLQv6/UU1oepmUQjzaWBG3Rdd3xvui7FjK85Urs=";
};

propagatedBuildInputs = [
Expand All @@ -33,15 +39,17 @@ buildPythonPackage rec {
xmltodict
];

# remove once https://github.com/sopel-irc/sopel/pull/1653 lands
checkInputs = [
pytestCheckHook
];
Comment on lines +42 to +44
Copy link
Member

Choose a reason for hiding this comment

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

Why did you move that? The position before was better.


postPatch = ''
substituteInPlace requirements.txt \
--replace "praw>=4.0.0,<6.0.0" "praw" \
--replace "sqlalchemy<1.4" "sqlalchemy"
--replace "sqlalchemy<1.4" "sqlalchemy" \
--replace "xmltodict==0.12" "xmltodict>=0.12"
'';

checkInputs = [ pytestCheckHook ];

preCheck = ''
export TESTDIR=$(mktemp -d)
cp -R ./test $TESTDIR
Expand All @@ -52,7 +60,9 @@ buildPythonPackage rec {
popd
'';

pythonImportsCheck = [ "sopel" ];
pythonImportsCheck = [
"sopel"
];

meta = with lib; {
description = "Simple and extensible IRC bot";
Expand Down
11 changes: 9 additions & 2 deletions pkgs/development/python-modules/xmltodict/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,29 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
}:

buildPythonPackage rec {
pname = "xmltodict";
version = "0.12.0";
version = "0.13.0";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21";
sha256 = "sha256-NBWVpIjj4BqFqdiRHYkS/ZIu3l/sxNzkN+tLbI0DflY=";
};

checkInputs = [
pytestCheckHook
];

pythonImportsCheck = [
"xmltodict"
];

meta = with lib; {
description = "Makes working with XML feel like you are working with JSON";
homepage = "https://github.com/martinblech/xmltodict";
Expand Down