All .tlf fonts not included in PyPI distribution

[edward-jazzhands]

I recently noticed that all the fonts with .tlf extensions are not included in the built release that gets uploaded to PyPI. From what I can tell it looks like these fonts were never actually included in the build. I wanted to ask about this here in case there's something I'm missing.

The setup.py file has this line:

package_data={'pyfiglet.fonts': ['*.flf', '*.flc']},

Likewise the MANIFEST file only contains this:

include pyfiglet/fonts/*.flf
include pyfiglet/fonts/*.flc

No mention of .tlf extension in either file. Is this intentional? I feel like there must be something I'm missing here, although I'm certain that all the toilet fonts are not included in the built wheel on PyPI.

[pwaller]

Sounds like an unintentional omission. Anyone want to fix it? I will cut a new release if needed.

[edward-jazzhands]

Yeah no problem I'll handle it. Probably have time to do up the PR today at some point.

[edward-jazzhands]

Hey sorry about the wait been busy the past few days. Got the PR submitted:
#154

[pwaller]

I just tried out #154, but when I do a python setup.py sdist bdist_wheel, I don't get tlf files shipped. I think the reason is that the tlf files are in fonts-contrib/, which per this previous licensing discussion, none of those files are in the fonts/ directory. Any thoughts? I'm thinking if my belief is correct, then those are not currently eligable to be shipped as a part of the pypi distribution.

[edward-jazzhands]

I'm confused by what you mean, on that discussion it seems to say that all the fonts in the contrib folder are ok to be put on PyPI and its only Fedora that has incredibly strict rules that block their inclusion.

[pwaller]

Ah, thanks for pointing out that part of the discussion. I have very limited time and attention for this -- I think I need to run a command to generate the fonts directory or something like this. It would be useful if this step happened when we do sdist but I'm not certain what the right behaviours are so that we do the right thing for both pypi and distros. Can anyone weigh in and figure it out?

Heads up I'll be AFK from soon until 1st September. If I forget to respond soon after that please don't hestitate to ping the thread again.

[peterbrittain]

This is all expected. Check out the Makefile. To satisfy the different types of build, it will either use the limited set with appropriate licenses, or the full set based on the target you ask make to build.

[edward-jazzhands]

ah I see what you mean. Ok no worries at all, it's the middle of summer so everyone is bound to be busy for the next few weeks. If the build process might need to be re-structured a bit to satisfy different license conditions then it makes sense to sit on it for a bit and make sure we get it right.

[peterbrittain]

No restructuring required. Just run make full and you'll get the package.

[pwaller]

Thank you @peterbrittain for chiming in and reminding me! make full did the expected thing. I have tagged v1.0.4 and the infrastructure should automatically generate a new pypi release imminently. I would appreciate if you can please check things are as you expect and then close the issue as complete.

https://github.com/pwaller/pyfiglet/actions/runs/16996644668 is the workflow.

[pwaller]

It was quick enough I had time to check, and I see them in the release tarball, https://pypi.org/project/pyfiglet/1.0.4/

$ tar tf pyfiglet-1.0.4.tar.gz | grep tlf
pyfiglet-1.0.4/pyfiglet/fonts/ascii12.tlf
pyfiglet-1.0.4/pyfiglet/fonts/ascii9.tlf
pyfiglet-1.0.4/pyfiglet/fonts/bigascii12.tlf
pyfiglet-1.0.4/pyfiglet/fonts/bigascii9.tlf
pyfiglet-1.0.4/pyfiglet/fonts/bigmono12.tlf
pyfiglet-1.0.4/pyfiglet/fonts/bigmono9.tlf
pyfiglet-1.0.4/pyfiglet/fonts/circle.tlf
pyfiglet-1.0.4/pyfiglet/fonts/emboss.tlf
pyfiglet-1.0.4/pyfiglet/fonts/emboss2.tlf
pyfiglet-1.0.4/pyfiglet/fonts/future.tlf
pyfiglet-1.0.4/pyfiglet/fonts/letter.tlf
pyfiglet-1.0.4/pyfiglet/fonts/mono12.tlf
pyfiglet-1.0.4/pyfiglet/fonts/mono9.tlf
pyfiglet-1.0.4/pyfiglet/fonts/pagga.tlf
pyfiglet-1.0.4/pyfiglet/fonts/smascii12.tlf
pyfiglet-1.0.4/pyfiglet/fonts/smascii9.tlf
pyfiglet-1.0.4/pyfiglet/fonts/smblock.tlf
pyfiglet-1.0.4/pyfiglet/fonts/smbraille.tlf
pyfiglet-1.0.4/pyfiglet/fonts/smmono12.tlf
pyfiglet-1.0.4/pyfiglet/fonts/smmono9.tlf
pyfiglet-1.0.4/pyfiglet/fonts/wideterm.tlf

So sorted then? Shout if not. Thanks all.