Commit Graph

904 Commits

Author SHA1 Message Date
Pieter De Gendt 0536d7a3c4 configuration: Update arguments type for delete_config
The deprecated delete_config function supports passing a list
of ConfigFile enumerations. Update argument typing accordingly.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-30 09:15:52 +01:00
Pieter De Gendt 292c43c5b8 tests: Wrap or remove deprecated functions in test_config.py
Make deprecated calls explicit during testing or remove them if
unnecessary.
Change the update_config and delete_config helper methods to use a
Configuration class instead of the global deprecated config functions.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-30 09:15:52 +01:00
Pieter De Gendt 38655154af tests: Remove deprecated calls to read_config
These calls are deprecated and unneeded, simply remove them.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-30 09:15:52 +01:00
Marc Herbert e1958cedbe project: "fail fast" west init when directories cannot be renamed
In October 2024, a problem reported in #558 showed that some Windows
systems can be configured to allow directory and file creations but not
renames. Test this _before_ git cloning to "fail fast" and remove git
from the very confusing picture.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-10-21 22:57:52 +02:00
Marc Herbert 7370037c05 project: add west init --rename-delay-hack
This will be useful as both a diagnostic tool and as a workaround; see
October 2024 comments in west issue #558 for examples and details.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-10-21 22:57:52 +02:00
Marc Herbert e03e34dded commands: make die() print a stack trace when -vvv or more
Print a stack trace when debugging with -vvv or more. This is MUCH
faster than `git grep error_message` and it's even more useful when the
same error message is used in multiple places! Example: die_already() in
project.py

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-10-21 13:40:05 +02:00
Pieter De Gendt d36e887b5e tests: Add test cases for invalid west projects manifests
Add tests for cases where projects are inside the .west directory.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-21 13:39:14 +02:00
Pieter De Gendt 9f4dcf55c0 manifest: Do not allow projects inside the west directory
It's not allowed to have projects inside the .west directory,
add a check when parsing the manifest.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-21 13:39:14 +02:00
Pieter De Gendt 4163c96b28 app: Re-use constant WEST_DIR
Use the literal constant WEST_DIR instead of using the same string
value scattered around the project.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-21 13:39:14 +02:00
Pieter De Gendt c3aadf5301 .github: Update supported python versions
Python 3.8 is end-of-life, removed.
Python 3.13 is released, added.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-15 08:32:53 +02:00
Pieter De Gendt 85fd5979f2 manifest: Fix absolute path checking on windows for Python 3.13
Python 3.13 changed the behavior for os.path.isabs
https://docs.python.org/3/library/os.path.html#os.path.isabs

Prevent absolute paths that start with a '/'.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-15 08:32:53 +02:00
Pieter De Gendt 42c0a5d3d5 .github: Specify the download artifact for the distribution
Omitting the artifact name changes the behavior, it will download all
artifacts and create subdirectories for each.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-10 14:45:57 -07:00
Pieter De Gendt 979ef4e90a .github: Add comments to release workflow
Add more details on parts of the steps.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-10 14:45:57 -07:00
Pieter De Gendt c6d96c8364 version: 1.3.99
Update pyproject version to 1.3.99

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-10 11:32:32 +02:00
Marc Herbert 0199418012 project.py: fix west diff --manifest to use `manifest-rev`
Fixes new `west diff --manifest` option added by commit
0d5ee4eb08 ("app: project: Allow to diff against manifest revision")

Do not pass `project.revision` to `git diff` because `project.revision`
is unresolved user input and does not always resolve to a commit. For
instance, `project.revision` can be the name of a remote branch like
`v3.7-branch` that does not exist locally; then `git diff` fails. Or
even worse: there could be a local branch of the same name which points
to a totally different commit.

This bug was found when discussing issue #747, see 7th comment there for
a longer description of what `manifest-rev` is and how it works.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-10-09 12:34:45 -07:00
Muhammad Usman 1007557b92 Add test cases for west init -o= option 2024-10-08 07:43:50 -07:00
Muhammad Usman c80b291f18 Add option to specify git clone options like --depth for Zephyr repo clone via init 2024-10-08 07:43:50 -07:00
Pieter De Gendt 09ca0ce50d MAINTAINER.rst: Update Pypi releases
Update section on creating Pypi releases.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-03 15:20:31 -07:00
Pieter De Gendt 04b7bcb6d3 .github: Add release workflow
Upload a pypi package when a Github release is published.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-03 15:20:31 -07:00
Pieter De Gendt 38aae907fd .github: Add workflow for creating a pypi package
Add a package workflow with the latest python version to test creating a
pypi release.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-03 15:20:31 -07:00
Pieter De Gendt 4d1d8ad4d2 .github: Add testing for 3.11 and latest (currently 3.12)
Verify build for all major.minor versions from 3.8 till latest.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-10-03 15:20:31 -07:00
Martí Bolívar e432aff137 Add docker compose based testing
Our release process documentation recommends getting passing tox
results on as many popular linux distributions as time allows. Doing
this by hand is cumbersome, redundant, and error prone.

Add a directory with a helper script that automates the entire process
using docker compose and document its use in MAINTAINERS.rst.

Signed-off-by: Martí Bolívar <mbolivar@amperecomputing.com>
Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-25 07:18:42 -07:00
Martí Bolívar 113ff95ec5 tox.ini: generate HTML coverage output
This makes it trivial to inspect, line by line, what got covered.
That is useful when evaluating coverage for a new feature.

Signed-off-by: Martí Bolívar <mbolivar@amperecomputing.com>
2024-09-25 07:18:42 -07:00
Pieter De Gendt 775dce9cc6 tests: Add manifest test for submodules
Add a testcase to parse a manifest and validate the as_dict output.
Add an invalid manifest file for missing required submodule properties.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-24 10:55:24 -07:00
Pieter De Gendt 0cebb60b70 tests: Add tests for manifest --freeze and submodules
Add a minimal testing to validate submodule output for manifest --freeze

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-24 10:55:24 -07:00
Pieter De Gendt 0da3de16eb manifest: Add submodule representation in as_dict
Submodules were missing when calling --freeze or --resolve

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-24 10:55:24 -07:00
Pieter De Gendt 08d0329131 README.rst: Update installing from source section
This section was outdated as we have moved to pyproject.toml.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-20 09:42:17 -07:00
Marc Herbert 49f0a101df app: tell the user to use `-vv` when debugging "manifest --validate"
It seems natural to recommend "debug" flags when telling the user to
"debug".

More specifically, this makes a big difference in situations like the
one reported in #671

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-09-16 07:06:32 -07:00
Ayush Singh c399c01257 project: Switch to pyproject
Starting with PEP 621, `pyproject.toml` is the standard way of
specifying project metadata.

Also switch to using the version from `pyproject.toml` instead of having
a west.version python module. Adjust documentation for the same.

Update MAINTAINERS.rst to use build for dist building.

Signed-off-by: Ayush Singh <ayush@beagleboard.org>
2024-09-12 14:31:41 -07:00
Pieter De Gendt d4ad25641b tests: Add alias testing
Add simple test cases to verify alias' functionality.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-06 07:12:34 -07:00
Pieter De Gendt 9383d8216e app: support alias commands
Replace west commands with alias set in configuration files

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-09-06 07:12:34 -07:00
Pieter De Gendt 694b78920e app: Skip handling an unknown command if -h is passed
Let the builtin help command handle the passed arguments.

Signed-off-by: Pieter De Gendt <pieter.degendt@gmail.com>
2024-09-06 07:12:34 -07:00
Marc Herbert ab31960df4 app: project: fix git diff --exit-code logic
Fixes 2020 commit a53ec10cf2 ("west diff: only print output for
projects with nonempty diffs")

Fixes #731

At least with git version 2.46.0, --exit-code is 0 when there has been a
merge conflict! git bug or feature? Either way this causes west diff to
wrongly assume there is no diff in that repo.

Two other issues:
1. if returncode is higher than 1 (= a git diff failure) AND -v is used,
   then failed.append(project) is never run.
2. stderr is never, ever printed

Try for instance `west diff --fubar` and `west -v --fubar` (which are
possible since commit 73aee32278). One fails and the other does
not. Neither prints any useful error.

The verbosity level should never have any side-effect.

To fix:
- Assume there is a diff when --exit-code is zero AND stdout is not
  empty. Treat this the same as --exit-code=1
- Always `failed.append(project)` when --exit-code > 1
- Print stderr when there is a diff or in verbose mode.

This drops one `elif` which also simplifies the logic.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-09-04 11:39:05 -07:00
Pieter De Gendt 0612a6ddae app: Add -q argument for quiet mode
Add a west argument to decrease the verbosity.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-30 10:36:14 -07:00
Pieter De Gendt d55f585af6 app: project: Simplify git diff --manifest
Do not use --merge-base but call git diff with the manifest version
directly.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-30 10:35:09 -07:00
Marc Herbert 8af9e2a370 .github: checkout in a directory with spaces
This is enough to find many quoting issues.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-08-29 16:16:53 -07:00
Marc Herbert 06a3b50dd6 tox.ini: use a pytest --basetemp with spaces
This catches quoting bugs that were just fixed by removing shlex in the
previous commit.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-08-29 16:16:53 -07:00
Marc Herbert 94f8a04ac8 tests: stop using shlex.split() and use lists instead
Stop using `shlex.split()` in conftest.py as a way to prepare test
commands for subprocess.run() because it does not always work. When we
have quoting issues, just avoid them entirely by passing the test
command as a list.

Replace shlex.split() with a simple str.split() for convenience in
simple cases. This simple split() will immediately fail when trying to
use quote which is working exactly as intended.

This also makes the cmd() interface more similar to subprocess.run() and
its many friends, which is good thing.

This is similar to commit 41007648d9 ("Project.git(list/str): reduce
reliance on shlex.split()") but applied to tests/

Before commit 624880e8ff, shlex.split() was used unconditionally in
conftest.py. As expected, this eventually broke on Windows: shlex is
not compatible across all operating systems and shells.

https://docs.python.org/3/library/subprocess.html#security-considerations

> If the shell is invoked explicitly, via shell=True, it is the
> application’s responsibility to ensure that all whitespace and
> metacharacters are quoted appropriately to avoid shell injection
> vulnerabilities. On _some_ platforms, it is possible to use shlex.quote()
> for this escaping.

(Emphasis mine)

Then commit 624880e8ff made the "interesting" decision to stop using
shlex.split()... only on Windows. This was discussed in
https://github.com/zephyrproject-rtos/west/pull/266#discussion_r284670076

So after this commit, parsing of test commands was delegated to the
shell but... only on Windows! This worked for a long time but eventually
broke testing white spaces for the new `west alias` #716. Rather than
making that Windows-specific hack even more complex with a special case,
finally do the right thing and ask more complex test commands to use a
list. Now we can drop shlex.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-08-29 16:16:53 -07:00
Marc Herbert 45762a01e3 app: point "handle_unknown_command()" error message to "west -vv status"
Commit d842371089 ("app: handle unexpected command name better")
intentionally created a big error handling difference between extensions
and built-in commands. As an unfortunate side effect, it lost the
relevant "manifest import failure" error messages for _extension_
commands.  This is especially ironic when the extension command is
missing because the import failed, see example in #726.

Error handling is generally very hard to test comprehensively and even
more so in this complex "bootstrap" area. Rather than trying to refactor
it once again, tweak the existing error messages to gently steer the
user away from (potentially missing) extensions and towards built-in
commands that provide a simpler and better error handling out of the
box: they still show relevant, manifest error messages! Always have.

Also recommand the -vv option which conveniently includes git error
messages like "dubious ownership" since previous commit
23db6e1f3c ("app: re-work logging yet again") from the same giant PR

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-08-27 14:31:45 +02:00
Pieter De Gendt d9c71b13e0 tests: Add cases for diff/status argument passing
Call west diff and status commands with arguments to be passed to git.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-27 14:30:57 +02:00
Pieter De Gendt 73aee32278 app: Allow passing arguments to git status/diff
west should pass unknown arguments to git status and diff commands.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-27 14:30:57 +02:00
Pieter De Gendt b69c85e2e5 tests: Add forall test cases
Test using the environment variables in forall

Signed-off-by: Pieter De Gendt <pieter.degendt@gmail.com>
2024-08-27 13:30:42 +02:00
Pieter De Gendt 659319fe60 app: project: Improve forall
* Add environment variables when running forall for each project.
* Add a "cwd" argument to execute the command in different directory

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-27 13:30:42 +02:00
Pieter De Gendt 6aaf248c3e tests: Run diff with manifest argument
Run the diff command with --manifest argument.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-27 13:29:34 +02:00
Pieter De Gendt 0d5ee4eb08 app: project: Allow to diff against manifest revision
Add an argument to the west diff command that allows to set the
manifest revision as the merge-base.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-08-27 13:29:34 +02:00
Pieter De Gendt 4c4dc04755 project: ignore .venv directory
Additionally exclude the python .venv directory for flake8 if it exists.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
2024-07-22 09:29:26 -07:00
Marc Herbert 155b242f2c project: use new Manifest.encoding constant (utf-8) to read manifest
Fixes issue reported in PR #710 where most places are hardcoded to
'utf-8' while this one is (Windows) locale-dependent. In the future, we
may want to make this more flexible but the most urgent fix is
consistency: with this commit, manifest decoding should be hardcoded to
'utf-8' everywhere.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-06-26 10:33:09 -07:00
Marc Herbert 6cd2f95332 manifest: add new Manifest.encoding constant = 'utf-8'
No functional change: just a lot less duplication & hardcoding.

This can help testing and supporting other encodings. It does not hurt
in any case.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-06-26 10:33:09 -07:00
Marc Herbert 551cff1210 manifest: add new local constant "git_filenames_encoding"
Cosmetic fix, no functional change. A little less duplication and
hardcoding.

listdir_at() had an optional "encoding" parameter but it was never used
before now, always defaulting to 'utf-8'.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-06-26 10:33:09 -07:00
Marc Herbert e5fe0ef896 .github: upgrade to checkout@v4 and setup-python@v5
Long overdue; both where still at @v1!

Found by chance in
https://github.com/zephyrproject-rtos/west/actions/runs/9275086435/job/25518959121?pr=711
where all macos-latest configs failed like this:
```
Run actions/setup-python@v1
Error: Version 3.8 with arch x64 not found
Available versions:
  (empty)
```

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
2024-06-14 16:25:56 +02:00