Repository navigation
fix(packaging): licenca BSD-3-Clause nos pacotes nativos e man pages no wheel e nos pacotes - #2166
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Duas correcoes de empacotamento dos pacotes nativos e do wheel, nos mesmos geradores (#2161 e #2163).
Licenca (Native packages (deb/rpm/apk/pacman/xbps) declare license AGPL-3.0-or-later; project license is BSD-3-Clause #2161).
core/native_nfpm.pyecore/void_xbps.pytinhamAGPL-3.0-or-laterescrito a mao; o projeto (LICENSE,pyproject.toml, rotulo da imagem Docker, PyPI) dizBSD-3-Clause. Os geradores passam a ler a licenca de[project].licensedopyproject.toml; os arquivos gerados foram regenerados: 7 YAML nfpm comlicense: BSD-3-Clausee o template Void comlicense="BSD-3-Clause"; nenhuma ocorrencia de AGPL nos geradores nem nos gerados. Os 4 pacotes nativos ja publicados no v1.8.0 nao mudam (assets de release); a correcao vale a partir da proxima release.Man pages (Man pages are not installed by pip/pipx/native packages; man data-boar only works through a manual symlink #2163). Nem o wheel nem os pacotes nativos instalavam a man page; ela so existia por um link manual para um clone. Agora: o wheel leva
share/man/man1/data-boar.1eshare/man/man5/data-boar.5(mapeamentoshared-datado hatchling empyproject.toml); o nfpm instala em/usr/share/man/man1eman5; o template Void ganha os arquivos emfiles/. Opipxlinka sozinho o que um pacote traz emshare/man.Testes novos (falham no codigo antigo):
tests/test_native_package_license.py(licenca gerada igual a dopyproject.toml) etests/test_native_package_manpages.py(o wheel construido contem as duas man pages com.THna versao do projeto, e o YAML nfpm tem as entradas de man).Conferido pelo auditor: wheel construido da branch contem
data_boar-1.8.0.data/data/share/man/man1/data-boar.1eman5/data-boar.5; 8 ocorrencias deBSD-3-Clausee 0 deAGPLnos gerados. O que so o CI prova: o nfpm referencia as man pages por caminho relativo (../../docs/...), entao o jobNative packagesdesta PR e quem confirma que o pacote monta.Nenhum arquivo do diff esta em
GATE_FILES(nao precisa de selo). Verificacao local:check-allno host termina com 5 falhas de ambiente (4 de licenciamento, porque o host tem licenca real instalada, etest_main_web_transport_cli, porta 8766 ocupada). O CI, em ambiente limpo, e o gate.Refs #2161, #2163