Skip to content

[staging-next] python312Package.tqdm: enable without tests #287001

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

Merged
mweinelt merged 2 commits into from
Feb 7, 2024
Merged

[staging-next] python312Package.tqdm: enable without tests #287001

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
4a6e0a2
python312Packages.tqdm: enable without tests
mweinelt Feb 7, 2024
a77c95f
python312Packages.fontparts: refactor, fix tests on 3.12
mweinelt Feb 7, 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
55 changes: 41 additions & 14 deletions pkgs/development/python-modules/fontparts/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,67 @@
{ lib, buildPythonPackage, fetchPypi, python, pythonOlder
, fonttools, lxml, fs, unicodedata2
, defcon, fontpens, fontmath, booleanoperations
, pytest, setuptools-scm
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch2
, pythonOlder

# build-system
, setuptools
, setuptools-scm

# dependencies
, fonttools
, defcon
, fontmath
, booleanoperations

# tests
, python
}:

buildPythonPackage rec {
pname = "fontParts";
pname = "fontparts";
version = "0.12.1";
pyproject = true;

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
pname = "fontParts";
inherit version;
hash = "sha256-eeU13S1IcC+bsiK3YDlT4rVDeXDGcxx1wY/is8t5pCA=";
extension = "zip";
};

nativeBuildInputs = [ setuptools-scm ];
patches = [
(fetchpatch2 {
# replace remaining usage of assertEquals for Python 3.12 support
# https://github.com/robotools/fontParts/pull/720
url = "https://github.com/robotools/fontParts/commit/d7484cd98051aa1588683136da0bb99eac31523b.patch";
hash = "sha256-maoUgbmXY/RC4TUZI4triA9OIfB4T98qjUaQ94uhsbg=";
})
];

nativeBuildInputs = [
setuptools
setuptools-scm
];

propagatedBuildInputs = [
booleanoperations
fonttools
unicodedata2 # fonttools[unicode] extra
lxml # fonttools[lxml] extra
fs # fonttools[ufo] extra
defcon
fontpens # defcon[pens] extra
fontmath
];
fonttools
]
++ defcon.optional-dependencies.pens
++ fonttools.optional-dependencies.ufo
++ fonttools.optional-dependencies.lxml
++ fonttools.optional-dependencies.unicode;

checkPhase = ''
runHook preCheck
${python.interpreter} Lib/fontParts/fontshell/test.py
runHook postCheck
'';
nativeCheckInputs = [ pytest ];

meta = with lib; {
description = "An API for interacting with the parts of fonts during the font development process.";
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/tqdm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, stdenv
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, pythonOlder
, setuptools
, setuptools-scm
, wheel
Expand All @@ -20,9 +20,6 @@ buildPythonPackage rec {
version = "4.66.1";
format = "pyproject";

# https://github.com/tqdm/tqdm/issues/1537
disabled = pythonAtLeast "3.12";

src = fetchPypi {
inherit pname version;
hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc=";
Expand All @@ -34,6 +31,9 @@ buildPythonPackage rec {
wheel
];

# https://github.com/tqdm/tqdm/issues/1537
doCheck = pythonOlder "3.12";

nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
Expand Down