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.

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

Merge #391 #392

Merged
merged 22 commits into from
Feb 2, 2024
Merged

Merge #391 #392

merged 22 commits into from
Feb 2, 2024

Conversation

mottosso
Copy link
Owner

@mottosso mottosso commented Feb 2, 2024

Merging this transient branch used to test #391

martin-chatterjee and others added 22 commits January 4, 2024 14:54
'pgrep Xvfb' identifies the process by name, which is a more robust test.

The output of 'ps aux | grep Xvfb' inside the Docker container running on Apple silicon is slightly different
and incompatible with the previous while condition:

$ ps aux | grep Xvfb
root      3025  0.0  0.4 1451928 32588 pts/0   Sl   14:25   0:00 /rosetta/rosetta /usr/bin/Xvfb Xvfb :99 -screen 0 1024x768x16
root      3142  0.0  0.0 1206448 7808 pts/0    S+   14:32   0:00 /rosetta/rosetta /usr/bin/grep grep --color=auto Xvfb
Prevent potential infinite loop if Xvfb is not able to start up, for whatever reason.
Exit with exit code 124 ("Command timed out") after 60 seconds.
One-to-one conversion of the previous Travis CI based testing workflow.
❗️ Currently runs on every push ❗️
A separate Github Action will take care of the package deployment to PyPi.
Therefore, the pip installation within the Docker container can be removed.
'Run tests' should not run on pushed tags, otherwise we it would
get run twice unneccesarily during release tag push.
- Uses PyPA's release Github action.
- The Github repo needs to be set up as a 'Trusted Publisher' on pypi.org.
- ❗️ For testing purposes this workflow currently releases to test.pypi.org ❗️
     → This needs to be removed before a potential merge into main.
Modern twine/build expects long_description to be set.
This way 'README.md' will be displayed on https://pypi.org/project/Qt.py/.
❗️ Currently references 'martin-chatterjee/Qt.py', for testing purposes. ❗️
❗️ Currently states 'version 1.3.9'. This is an assumption, and
   needs to be changed before merge. ❗️
Test-releases to 'test.pypi.org' as project 'martin-chatterjee-Qt.py'.
Remove test.pypi.org for release
@mottosso mottosso merged commit 9748c22 into master Feb 2, 2024
8 checks passed
@mottosso mottosso deleted the temp branch February 20, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants