amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-fonttools-full: Rename to python-fonttools.

Browse source 
* gnu/packages/python-xyz.scm (python-fonttools): Rename to...
(python-fonttools-minimal): ... this.
(python-fonttools-full): Adjust references to base package.  Rename to...
(python-fonttools): ... this.
(python-matplotlib):
* gnu/packages/fontutils.scm (python-cu2qu) [propagated-inputs]: Rename
python-fonttools-full to python-fonttools.
(python-ufolib2, python-defcon-bootstrap): Likewise.
* gnu/packages/pdf.scm (weasyprint): Likewise.
* gnu/packages/fonts.scm (font-meera-inimai) Adjust for renamed
python-fonttools-minimal.
* gnu/packages/fontutils.scm (python-cffsubr): Likewise.
(python-compreffor, python-cu2qu, python-fontmath, python-fontpens-bootstrap)
(python-fontparts-bootstrap, python-glyphsets, python-mutatormath)
(python-ufoprocessor, graphite2, python-ufolib2)
(python-defcon-bootstrap): Likewise.
* gnu/packages/graphics.scm (python-booleanoperations): Likewise.
This commit is contained in:
Maxim Cournoyer 2023-04-19 07:58:20 -04:00
parent 00a328847a
commit af015334d1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
5 changed files with 61 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/fonts.scm
View file

@ -2469,7 +2469,7 @@ It comes in seven weights and Roman, Italic and Oblique styles.")
`(("fontforge" ,fontforge) `(("fontforge" ,fontforge)
("harfbuzz" ,harfbuzz "bin") ("harfbuzz" ,harfbuzz "bin")
("python" ,python-minimal) ("python" ,python-minimal)
("python-fonttools" ,python-fonttools) ("python-fonttools-minimal" ,python-fonttools-minimal)
("python-brotli" ,python-brotli))) ("python-brotli" ,python-brotli)))
(arguments (arguments
`(#:make-flags (list "PY=python3" `(#:make-flags (list "PY=python3"

25
gnu/packages/fontutils.scm
View file

@ -379,7 +379,7 @@ but also provides many useful font conversion and analysis facilities.
(invoke "pytest" "-vv"))))))) (invoke "pytest" "-vv")))))))
(native-inputs (list python-pytest python-setuptools-scm python-wheel)) (native-inputs (list python-pytest python-setuptools-scm python-wheel))
(inputs (list python-afdko)) (inputs (list python-afdko))
(propagated-inputs (list python-fonttools)) (propagated-inputs (list python-fonttools-minimal))
(home-page "https://github.com/adobe-type-tools/cffsubr") (home-page "https://github.com/adobe-type-tools/cffsubr")
(synopsis "Compact Font Format (CFF) subroutinizer") (synopsis "Compact Font Format (CFF) subroutinizer")
(description "This package provides the @command{cffsubr} command, a (description "This package provides the @command{cffsubr} command, a
@ -409,7 +409,7 @@ Kit for OpenType (AFDKO) @command{tx} tool.")
((", \"setuptools_git_ls_files\"") ""))))))) ((", \"setuptools_git_ls_files\"") "")))))))
(native-inputs (list python-pytest python-pytest-runner (native-inputs (list python-pytest python-pytest-runner
python-setuptools-scm)) python-setuptools-scm))
(propagated-inputs (list python-fonttools)) (propagated-inputs (list python-fonttools-minimal))
(home-page "https://github.com/googlefonts/compreffor") (home-page "https://github.com/googlefonts/compreffor")
(synopsis "Compact Font Format (CFF) subroutinizer for fontTools") (synopsis "Compact Font Format (CFF) subroutinizer for fontTools")
(description "This package provides a Compact Font Format (CFF) (description "This package provides a Compact Font Format (CFF)
@ -427,7 +427,7 @@ subroutinizer for fontTools.")
(sha256 (sha256
(base32 "1x762r7bf39g6aivfvrmq00h6f07abvs9x1xm0fz8l81vq8jz64c")))) (base32 "1x762r7bf39g6aivfvrmq00h6f07abvs9x1xm0fz8l81vq8jz64c"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-fonttools-full)) (propagated-inputs (list python-fonttools))
(native-inputs (native-inputs
(list python-cython (list python-cython
python-defcon python-defcon
@ -484,7 +484,7 @@ to generate OpenType font binaries from Unified Font Objects (UFOs).")
(sha256 (sha256
(base32 "070v1jz5f18g15if459ppwswq4w5hzffwp1gvdc5j47bgz5qflva")))) (base32 "070v1jz5f18g15if459ppwswq4w5hzffwp1gvdc5j47bgz5qflva"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-fonttools)) (propagated-inputs (list python-fonttools-minimal))
(native-inputs (native-inputs
(list python-setuptools-scm (list python-setuptools-scm
python-pytest python-pytest
@ -510,7 +510,7 @@ font, glyph, etc. mathematical operations on font data.")
(base32 "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6")))) (base32 "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(propagated-inputs (list python-fonttools)) (propagated-inputs (list python-fonttools-minimal))
(native-inputs (list unzip)) (native-inputs (list unzip))
(home-page "https://github.com/robofab-developers/fontPens") (home-page "https://github.com/robofab-developers/fontPens")
(synopsis "Python classes implementing the pen protocol") (synopsis "Python classes implementing the pen protocol")
@ -561,7 +561,7 @@ implementing the pen protocol for manipulating glyphs.")
(list python-booleanoperations (list python-booleanoperations
python-defcon-bootstrap python-defcon-bootstrap
python-fontmath python-fontmath
python-fonttools)) python-fonttools-minimal))
(native-inputs (list python-setuptools-scm unzip)) (native-inputs (list python-setuptools-scm unzip))
(home-page "https://github.com/robotools/fontParts") (home-page "https://github.com/robotools/fontParts")
(synopsis "Library for interacting with font parts") (synopsis "Library for interacting with font parts")
@ -645,7 +645,7 @@ to UFOs and DesignSpace files via @code{defcon} and @code{designspaceLib}.")
(invoke "pytest" "-vv" "tests/testusage.py"))))))) (invoke "pytest" "-vv" "tests/testusage.py")))))))
(native-inputs (list python-pytest python-setuptools-scm)) (native-inputs (list python-pytest python-setuptools-scm))
(propagated-inputs (propagated-inputs
(list python-defcon python-fonttools python-glyphslib)) (list python-defcon python-fonttools-minimal python-glyphslib))
(home-page "https://github.com/googlefonts/glyphsets/") (home-page "https://github.com/googlefonts/glyphsets/")
(synopsis "Evaluate coverage of glyph sets") (synopsis "Evaluate coverage of glyph sets")
(description (description
@ -701,7 +701,8 @@ different scripts and languages.")
(sha256 (sha256
(base32 "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1")))) (base32 "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-defcon python-fontmath python-fonttools)) (propagated-inputs (list python-defcon python-fontmath
python-fonttools-minimal))
(native-inputs (list unzip)) (native-inputs (list unzip))
(home-page "https://github.com/LettError/MutatorMath") (home-page "https://github.com/LettError/MutatorMath")
(synopsis "Piecewise linear interpolation Python library") (synopsis "Piecewise linear interpolation Python library")
@ -869,7 +870,7 @@ paths (intersection, union, difference, xor).")
(list python-defcon (list python-defcon
python-fontmath python-fontmath
python-fontparts python-fontparts
python-fonttools python-fonttools-minimal
python-mutatormath)) python-mutatormath))
(native-inputs (list python-setuptools-scm unzip)) (native-inputs (list python-setuptools-scm unzip))
(home-page "https://github.com/LettError/ufoProcessor") (home-page "https://github.com/LettError/ufoProcessor")
@ -1331,7 +1332,7 @@ applications should be.")
"01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list python python-fonttools)) (list python python-fonttools-minimal))
(inputs (inputs
(list freetype)) (list freetype))
(synopsis "Reimplementation of the SIL Graphite text processing engine") (synopsis "Reimplementation of the SIL Graphite text processing engine")
@ -1611,7 +1612,7 @@ with @samp{nameIDs}.")
(build-system pyproject-build-system) (build-system pyproject-build-system)
(native-inputs (native-inputs
(list python-pytest python-setuptools-scm)) (list python-pytest python-setuptools-scm))
(propagated-inputs (list python-attrs python-fonttools-full)) (propagated-inputs (list python-attrs python-fonttools))
(home-page "https://github.com/fonttools/ufoLib2") (home-page "https://github.com/fonttools/ufoLib2")
(synopsis "Unified Font Object (UFO) font processing library") (synopsis "Unified Font Object (UFO) font processing library")
(description "The ufoLib2 Python library is meant to be a thin (description "The ufoLib2 Python library is meant to be a thin
@ -1635,7 +1636,7 @@ API-compatible with defcon.")
(sha256 (sha256
(base32 "0i1a306b8c42dpbplwxj6ili2aac5lwq2ir6r1jswicysvk9dqxf")))) (base32 "0i1a306b8c42dpbplwxj6ili2aac5lwq2ir6r1jswicysvk9dqxf"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-fontpens-bootstrap python-fonttools-full)) (propagated-inputs (list python-fontpens-bootstrap python-fonttools))
(native-inputs (native-inputs
(list python-pytest (list python-pytest
python-pytest-runner python-pytest-runner

2
gnu/packages/graphics.scm
View file

@ -938,7 +938,7 @@ basic geometries.")
(sha256 (sha256
(base32 "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc")))) (base32 "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-fonttools python-pyclipper)) (propagated-inputs (list python-fonttools-minimal python-pyclipper))
(native-inputs (native-inputs
(list python-defcon-bootstrap (list python-defcon-bootstrap
python-fontpens-bootstrap python-fontpens-bootstrap

2
gnu/packages/pdf.scm
View file

@ -1615,7 +1615,7 @@ manipulating PDF documents from the command line. It supports
python-cairosvg python-cairosvg
python-cffi python-cffi
python-cssselect2 python-cssselect2
python-fonttools-full python-fonttools
python-html5lib python-html5lib
python-pillow python-pillow
python-pydyf python-pydyf

90
gnu/packages/python-xyz.scm
View file

@ -7149,7 +7149,7 @@ tests = True~%" (assoc-ref inputs "tcl") (assoc-ref inputs "tk"))))))
python-certifi python-certifi
python-cycler python-cycler
python-dateutil python-dateutil
python-fonttools python-fonttools-minimal
python-kiwisolver python-kiwisolver
python-numpy python-numpy
python-packaging python-packaging
@ -12188,10 +12188,10 @@ number of lines in the contained files easily.")
(license license:expat))) (license license:expat)))
;;; Tests are left out in the main package to avoid cycles. ;;; Tests are left out in the main package to avoid cycles.
(define-public python-fonttools (define-public python-fonttools-minimal
(hidden-package (hidden-package
(package (package
(name "python-fonttools") (name "python-fonttools-minimal")
(version "4.39.3") (version "4.39.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -12213,48 +12213,48 @@ also contains a tool called “TTX” which converts TrueType/OpenType fonts to
from an XML-based format.") from an XML-based format.")
(license license:expat)))) (license license:expat))))
;;; Rename 'python-fonttools' in next cycle, renaming the current (define-public python-fonttools
;;; 'python-fonttools' to 'python-fonttools-minimal'. (let ((base python-fonttools-minimal))
(define-public python-fonttools-full (package/inherit base
(package/inherit python-fonttools (name "python-fonttools")
(arguments (arguments
(substitute-keyword-arguments (package-arguments python-fonttools) (substitute-keyword-arguments (package-arguments base)
((#:tests? _ #f) ((#:tests? _ #f)
(not (%current-target-system))) (not (%current-target-system)))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases `(modify-phases ,phases
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "pytest" "-vv" (invoke "pytest" "-vv"
"-k" "-k"
;; XXX: These tests need .trm files that are ;; XXX: These tests need .trm files that are
;; not shipped with the PyPI release. ;; not shipped with the PyPI release.
(format #f "not ~a" (format #f "not ~a"
(string-join (string-join
'("test_read_fontdimens_mathsy" '("test_read_fontdimens_mathsy"
"test_read_fontdimens_mathex" "test_read_fontdimens_mathex"
"test_read_fontdimens_vanilla" "test_read_fontdimens_vanilla"
"test_read_boundary_char" "test_read_boundary_char"
"fontTools.tfmLib" "fontTools.tfmLib"
;; The MtiTest tests fail for unknown ;; The MtiTest tests fail for unknown
;; reasons (see: ;; reasons (see:
;; https://github.com/fonttools/ ;; https://github.com/fonttools/
;; fonttools/issues/3078) ;; fonttools/issues/3078)
"MtiTest") "MtiTest")
" and not ")))))))))) " and not "))))))))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs python-fonttools) (modify-inputs (package-native-inputs base)
(append python-pytest))) (append python-pytest)))
(propagated-inputs (propagated-inputs
(list python-brotli (list python-brotli
python-fs python-fs
python-lxml python-lxml
python-lz4 python-lz4
python-scipy python-scipy
python-unicodedata2 python-unicodedata2
python-zopfli)) python-zopfli))
(properties (alist-delete 'hidden? (package-properties python-fonttools))))) (properties (alist-delete 'hidden? (package-properties base))))))
(define-public python-ly (define-public python-ly
(package (package