python/knot_resolver: meson configured constants
The goal is to get rid of the separate python module (knot_resolver_build_options) that only has meson constants in it, but still have the configured meson constants available in the knot_resolver python module.
Requires updated Docker image for Python parts knot-resolver-ci!6 (merged).
Merge request reports
Activity
added 7 commits
- 46d80825 - python/knot_resolver: use constants.py configured by Meson
- 22e11b4b - python/knot_resolver: constants fixes
- 6f6eacdc - ci: manager: configure meson before every test
- f5a5aaf2 - scripts/poe-tasks: use id cmd instead of $USER env var in _env.sh
- df6f009c - ci/images/manager/DockerFile removed
- 20a2b0bb - doc/_static/config.schema.json: update
- 9671da5f - scripts/poe-tasks: improvements
Toggle commit listadded 1 commit
- c8d6134c - scripts/poe-tasks: ./configure not required for some tasks
added 28 commits
-
73c7efd3...07b21302 - 13 commits from branch
master - 07b21302...6ae0c1f0 - 5 earlier commits
- 037015b9 - ci/images/manager/DockerFile removed
- a4d12eac - doc/_static/config.schema.json: update
- 05e3ed33 - scripts/poe-tasks: improvements
- 0f1f5b2b - python: removed env vars from python code
- 2d46abbf - python: use CACHE_DIR and RUN_DIR constants
- d6f010e1 - scripts/poe-tasks: doc-schema added
- 4125d9a1 - meson.build: use non-standard prefix for run_dir
- a82f54af - scripts/poe-tasks: ./configure not required for some tasks
- d62ff913 - scripts/poe-tasks: _env.sh improvements and formatting
- ff6ece13 - scripts/poe-tasks: created gen-constantspy script
Toggle commit list-
73c7efd3...07b21302 - 13 commits from branch
Resolved by Jakub RužičkaWhy wasn't
python/knot_resolver/constants.pydeleted from the repo?- Last reply by Jakub Ružička
- Resolved by Aleš Mrázek
Nit: is the name
is_buil_dev_dir_configuredintentional? I'd expectis_build_dev_dir_configured. - Last reply by Aleš Mrázek
requested review from @jruzicka
- Resolved by Jakub Ružička
I'm confused by
python/constants.py.invspython/knot_resolver/constants.py, I'd expect to see-
python/knot_resolver/constants.py.inonly python/knot_resolver/constants.py{,.in}
I assume the meson templating stays, which might cause issues when someone tries to use the
python/knot_resolvermodule directly without runing meson.I think it would be convenient to go with 2) - include default
constants.pyin the repo alongside theconstants.py.inso that it works without meson templating. We will still re-generate the file using meson, but it won't be strictly required.Edited by Jakub Ružička -
- Last reply by Aleš Mrázek
added 1 commit
- 4096b7b9 - fixup! scripts/poe-tasks: _env.sh improvements and formatting
added 1 commit
- 14bf41e9 - distro/pkg: update packaging for single python module
added 1 commit
- eb222d92 - fixup! distro/pkg: update packaging for single python module
added 1 commit
- 682a3761 - fixup! distro/pkg: update packaging for single python module
added 1 commit
- 82142c64 - tests/packaging: skip systemd tests without systemd
- Resolved by Jakub Ružička
OK, I've updated packaging for the single module, it's much nicer now
As a bonus I've switched
pkg:archto docker as Arch doesn't work in LXC no matter what I do. Systemd tests are skipped when systemd isn't PID 1.@amrazek Shall I update the packaged
constants.pywith meson-generated one a lacp build_deb/python/knot_resolver/constants.py debian/tmp/python/knot-resolver/constants.pyand equivalents?
- Last reply by Jakub Ružička
- Resolved by Jakub Ružička
I've excluded
*.inandmeson.buildfrompyproject.tomlbut I'm not sure aboutsetup.py- is that poetry-generated? - Last reply by Jakub Ružička
added 1 commit
- 5286fc02 - fixup! ci: manager: configure meson before every test
added 18 commits
- 94470ec6...736640a2 - 8 earlier commits
- 95a80abd - meson.build: use non-standard prefix for run_dir
- c22bcd23 - scripts/poe-tasks: ./configure not required for some tasks
- 0cfe6074 - scripts/poe-tasks: _env.sh improvements and formatting
- 16965e3e - scripts/poe-tasks: created gen-constantspy script
- fc8a5fc9 - python: meson constants.py template moved to knot_resolver module
- a81afc4b - pyproject.toml: exclude meson templates
- 24bb19c9 - distro/pkg: update packaging for single python module
- ec7726aa - tests/packaging: skip systemd tests without systemd
- 3cd232e7 - CI: use standard docker for pkg:arch
- b8ec0127 - .gitlab-ci.yml: IMAGE_TAG update
Toggle commit listadded 1 commit
- b3ba97cb - fixup! tests/packaging: skip systemd tests without systemd
marked this merge request as draft from b3ba97cb
added 28 commits
-
9a54c1b5...9fcd2b5f - 7 commits from branch
master - 9fcd2b5f...5ad88a40 - 11 earlier commits
- d2c8db59 - meson.build: use non-standard prefix for run_dir
- 83e23309 - scripts/poe-tasks: ./configure not required for some tasks
- d940726d - scripts/poe-tasks: _env.sh improvements and formatting
- 7c6871ce - scripts/poe-tasks: created gen-constantspy script
- 9f70c6e5 - python: meson constants.py template moved to knot_resolver module
- 0286a094 - pyproject.toml: exclude meson templates
- 101248e7 - distro/pkg: update packaging for single python module
- 0f85472c - tests/packaging: skip systemd tests without systemd
- c1660b02 - CI: use standard docker for pkg:arch
- 776acb5b - .gitlab-ci.yml: IMAGE_TAG update
Toggle commit list-
9a54c1b5...9fcd2b5f - 7 commits from branch
mentioned in issue #921
mentioned in commit eed008a0
-
There's an unsolved lint problem: https://gitlab.nic.cz/knot/knot-resolver/-/jobs/1178977
I mean, we can probably disregard such lints in
tests/pytests/, but keeping it red in CI is annoying.
