Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Recipe Versions #39

Merged
merged 4 commits into from
Nov 27, 2023
Merged

Bump Recipe Versions #39

merged 4 commits into from
Nov 27, 2023

Conversation

Bastian-Krause
Copy link
Member

@Bastian-Krause Bastian-Krause commented Jul 7, 2023 •
edited
Loading

  • python3-janus: version bump 0.6.1 -> 1.0.0
  • python3-powerrelay: version bump bf5d2e1 -> 41c030f
  • python3-usbmuxctl: install from pypi, version bump 096905f -> 0.1.3
  • sispmctl: version bump 4.9 -> 4.11

Build-tested only.

Emantor
Emantor previously approved these changes Jul 20, 2023
View reviewed changes
jluebbe
jluebbe previously approved these changes Jul 20, 2023
View reviewed changes
Copy link
Member

@jluebbe jluebbe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but it should be run-time tested as well.

@Bastian-Krause
Copy link
Member Author

Agreed, maybe @hnez can do that.

@hnez
Copy link
Contributor

hnez commented Aug 14, 2023

The files installed by python3-pyserial-labgrid.bb conflict with those installed by python3-pyserial.bb from e.g. meta-openembedded.
I couldn't quite figure out which of the packages in meta-lxatac depends on the plain python3-pyserial.bb but that does not matter to much anyways, as I think the issue lies with python3-pyserial-labgrid.bb.

What would be a good fix for this? Installing the forked pyserial as pyserial-labgrid and importing it accordingly in labgrid?

Installing python3-pyserial (3.5) on root
Downloading file:meta-lxatac/build/tmp/work/lxatac-oe-linux-gnueabi/lxatac-core-image-base/1.0-r0/oe-rootfs-repo/cortexa7t2hf-neon-vfpv4/python3-pyserial_3.5-r0_cortexa7t2hf-neon-vfpv4.ipk.
Installing python3-charset-normalizer (3.0.0) on root
Downloading file:meta-lxatac/build/tmp/work/lxat * check_data_file_clashes: Package python3-pyserial-labgrid wants to install file meta-lxatac/build/tmp/work/lxatac-oe-linux-gnueabi/lxatac-core-image-base/1.0-r0/rootfs/usr/lib/python3.10/site-packages/serial/__init__.py
        But that file is already provided by package  * python3-pyserial
 * check_data_file_clashes: Package python3-pyserial-labgrid wants to install file meta-lxatac/build/tmp/work/lxatac-oe-linux-gnueabi/lxatac-core-image-base/1.0-r0/rootfs/usr/lib/python3.10/site-packages/serial/__main__.py
…

@Bastian-Krause
Copy link
Member Author

I guess this is similar to labgrid-project/labgrid#1245.

@Bastian-Krause Bastian-Krause dismissed stale reviews from jluebbe and Emantor via 72de766 November 10, 2023 18:09
@Bastian-Krause Bastian-Krause force-pushed the bst/version-bumps-2023-07 branch from 351467d to 72de766 Compare November 10, 2023 18:09
@Bastian-Krause
Copy link
Member Author

Let's postpone the version bump of python3-pyserial-labgrid. I've dropped the corresponding commit, rebased everything on latest master and bumped sispmctl to v4.11 instead of v4.10.

@hnez Could you please test this again?

@Bastian-Krause
Copy link
Member Author

Note: build failure will be fixed by #41.

@ejoerns ejoerns force-pushed the bst/version-bumps-2023-07 branch from 72de766 to f77b92b Compare November 12, 2023 12:39
@ejoerns
Copy link
Contributor

ejoerns commented Nov 12, 2023

I've rebased this onto master with merged #41 to let the CI test it.

@hnez
Copy link
Contributor

hnez commented Nov 13, 2023

Hi,

Could you please test this again?

the LXA TAC images (based on my mickledore development branch) build fine now and the labgrid-exporter seems to be working.
Running usbmuxctl -h also works, but I do not have an USB-Mux at hand to check if it works, but I would assume it does.

@Bastian-Krause
python3-janus: version bump 0.6.1 -> 1.0.0
cc29b53 
janus declared the PEP-517 compliant
`setuptools.build_meta build-backend` in the `[build-system]` section of
pyproject.toml a while ago [1].

Since that's the preffered way of building and installing Python
packages nowadays, let's use that corresponding
"python_setuptools_build_meta class" instead of "setuptools3".

[1] aio-libs/janus@67e3782

Signed-off-by: Bastian Krause <[email protected]>
@Bastian-Krause
python3-powerrelay: version bump bf5d2e1 -> 41c030f
5e8d4d8 
Signed-off-by: Bastian Krause <[email protected]>
@Bastian-Krause
python3-usbmuxctl: install from pypi, version bump 096905f -> 0.1.3
7859df4 
Signed-off-by: Bastian Krause <[email protected]>
@Bastian-Krause
sispmctl: version bump 4.9 -> 4.11
b43d02b 
Signed-off-by: Bastian Krause <[email protected]>
@Bastian-Krause Bastian-Krause force-pushed the bst/version-bumps-2023-07 branch from f77b92b to b43d02b Compare November 13, 2023 11:45
ejoerns
ejoerns approved these changes Nov 13, 2023
View reviewed changes
Copy link
Contributor

@ejoerns ejoerns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine for me from the Yocto integration perspective.

@hnez
Copy link
Contributor

hnez commented Nov 27, 2023

I think this should be merged, shouldn't it?

@ejoerns ejoerns merged commit 319d0c3 into labgrid-project:master Nov 27, 2023
2 checks passed
@Bastian-Krause Bastian-Krause deleted the bst/version-bumps-2023-07 branch November 27, 2023 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ejoerns ejoerns ejoerns approved these changes

@jluebbe jluebbe jluebbe left review comments

@Emantor Emantor Emantor left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Bastian-Krause @hnez @ejoerns @Emantor @jluebbe