Skip to content

Commit 9748c22

Browse files
mottossomottosso
authored
Merge pull request #392 from mottosso/temp
Merge #391
2 parents 183c187 + ffdf4ef commit 9748c22

File tree

8 files changed

+112
-77
lines changed

8 files changed

+112
-77
lines changed

‎.github/workflows/release-to-pypi.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Release to PyPi
2+
3+
on:
4+
push:
5+
tags:
6+
- "*"
7+
8+
jobs:
9+
build-and-release:
10+
name: Build and Release
11+
runs-on: ubuntu-latest
12+
if: github.repository_owner == 'mottosso'
13+
14+
environment:
15+
name: pypi
16+
url: https://pypi.org/p/Qt.py
17+
permissions:
18+
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
19+
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v4
23+
- name: Set up Python
24+
uses: actions/setup-python@v4
25+
with:
26+
python-version: "3.7.x"
27+
- name: Install build dependency
28+
run: python3 -m pip install --upgrade build
29+
- name: Build a binary wheel and a source tarball
30+
run: python3 -m build
31+
- name: Release to PyPi
32+
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/run-tests.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Run Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- "*"
7+
8+
jobs:
9+
test:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
include:
14+
- os: ubuntu-latest
15+
VFXPLATFORM: "2018"
16+
PYTHON: "2.7"
17+
- os: ubuntu-latest
18+
VFXPLATFORM: "2018"
19+
PYTHON: "3.4"
20+
- os: ubuntu-latest
21+
VFXPLATFORM: "2018"
22+
PYTHON: "3.5"
23+
- os: ubuntu-latest
24+
VFXPLATFORM: "2018"
25+
PYTHON: "3.6"
26+
- os: ubuntu-latest
27+
VFXPLATFORM: "2017"
28+
PYTHON: "2.7"
29+
- os: ubuntu-latest
30+
VFXPLATFORM: "2017"
31+
PYTHON: "3.4"
32+
- os: ubuntu-latest
33+
VFXPLATFORM: "2017"
34+
PYTHON: "3.5"
35+
36+
steps:
37+
- name: Checkout code
38+
uses: actions/checkout@v4
39+
40+
- name: Run tests in Docker container
41+
run: |
42+
docker run --rm \
43+
-v $(pwd):/Qt.py \
44+
-e PYTHON=${{ matrix.PYTHON }} \
45+
fredrikaverpil/qt.py:${{ matrix.VFXPLATFORM }}

‎.travis.yml‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎DOCKER.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Docker
22

3-
In order to successfully test Qt.py against the different bindings of different versions, we use Travis-CI to run Docker containers based on [pre-built CentOS-based images](https://hub.docker.com/r/fredrikaverpil/qt.py/tags/).
3+
In order to successfully test Qt.py against the different bindings of different versions, we use [Github Actions](https://docs.github.com/en/actions/automating-builds-and-tests/about-continuous-integration) to run Docker containers based on [pre-built CentOS-based images](https://hub.docker.com/r/fredrikaverpil/qt.py/tags/).
44

55
The Docker images follow the [VFX Reference Platform specifications](http://www.vfxplatform.com/) with some additionals, and are quite jam-packed.
66

@@ -24,10 +24,10 @@ The Docker images follow the [VFX Reference Platform specifications](http://www.
2424
* PyQt5<sup>1</sup>
2525
* PySide2<sup>1</sup>
2626

27-
<sup>1</sup> Per specification from VFX Platform
28-
<sup>2</sup> Adds possibility to faster clone large repositories
29-
<sup>3</sup> cmake 3.x required to build PySide2
30-
<sup>4</sup> Required for Qt.py testing
27+
<sup>1</sup> Per specification from VFX Platform
28+
<sup>2</sup> Adds possibility to faster clone large repositories
29+
<sup>3</sup> cmake 3.x required to build PySide2
30+
<sup>4</sup> Required for Qt.py testing
3131
<sup>5</sup> Required for `PySide2.QtUiTools`
3232

3333
<br>

‎README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
<img width=260 src=logo.svg>
1+
<img width=260 src=https://raw.githubusercontent.com/mottosso/Qt.py/master/logo.svg>
22

3-
[![Downloads](https://pepy.tech/badge/qt-py)](https://pepy.tech/project/qt-py) [![Build Status](https://travis-ci.org/mottosso/Qt.py.svg?branch=master)](https://travis-ci.org/mottosso/Qt.py) [![PyPI version](https://badge.fury.io/py/Qt.py.svg)](https://pypi.python.org/pypi/Qt.py)
4-
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/qt.py/badges/version.svg)](https://anaconda.org/conda-forge/qt.py) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Qt-py/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
3+
[![Downloads](https://pepy.tech/badge/qt-py)](https://pepy.tech/project/qt-py)
4+
[![Run Tests](https://github.com/mottosso/Qt.py/actions/workflows/run-tests.yml/badge.svg)](https://github.com/mottosso/Qt.py/actions)
5+
[![PyPI version](https://badge.fury.io/py/Qt.py.svg)](https://pypi.python.org/pypi/Qt.py)
6+
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/qt.py/badges/version.svg)](https://anaconda.org/conda-forge/qt.py)
7+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Qt-py/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
58
[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
69

710
Qt.py enables you to write software that runs on any of the 4 supported bindings - PySide2, PyQt5, PySide and PyQt4.
@@ -12,6 +15,7 @@ Qt.py enables you to write software that runs on any of the 4 supported bindings
1215

1316
| Date | Version | Event
1417
|:---------|:----------|:----------
18+
| Jan 2024 | [1.3.9][] | Run CI on Github Actions, instead of Travis CI.
1519
| Sep 2020 | [1.3.0][] | Stability improvements and greater ability for `QtCompat.wrapInstance` to do its job
1620
| Jun 2019 | [1.2.1][] | Bugfixes and [additional members](https://github.com/mottosso/Qt.py/releases/tag/1.2.0)
1721
| Jan 2018 | [1.1.0][] | Adds new test suite, new members
@@ -29,6 +33,7 @@ Qt.py enables you to write software that runs on any of the 4 supported bindings
2933
[1.1.0]: https://github.com/mottosso/Qt.py/releases/tag/1.1.0
3034
[1.2.1]: https://github.com/mottosso/Qt.py/releases/tag/1.2.1
3135
[1.3.0]: https://github.com/mottosso/Qt.py/releases/tag/1.3.0
36+
[1.3.9]: https://github.com/mottosso/Qt.py/releases/tag/1.3.9
3237

3338
##### Guides
3439

@@ -569,7 +574,7 @@ docker run --rm -v %CD%:/Qt.py -e PYTHON=3.6 fredrikaverpil/qt.py:2018
569574
# OK
570575
```
571576

572-
Now both you and Travis are operating on the same assumptions which means that when the tests pass on your machine, they pass on Travis. And everybody wins!
577+
Now both you and Github Actions are operating on the same assumptions which means that when the tests pass on your machine, they pass on Github Actions. And everybody wins!
573578

574579
For details on the Docker image for testing, see [`DOCKER.md`](DOCKER.md).
575580

‎entrypoint.sh‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ set -e
55

66
# Start Xvfb
77
Xvfb :99 -screen 0 1024x768x16 2>/dev/null &
8-
while ! ps aux | grep -q '[0]:00 Xvfb :99 -screen 0 1024x768x16'; do
8+
counter=0
9+
while ! pgrep 'Xvfb' &> /dev/null; do
910
echo "Waiting for Xvfb..."
1011
sleep 1
12+
((counter+=1))
13+
if [[ $counter -ge 60 ]]; then
14+
echo "Xvfb: Exceeded timeout."
15+
exit 124
16+
fi
1117
done
1218

13-
if [ -n "$RELEASE" ]; then
14-
wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
15-
python${PYTHON} ./get-pip.py
16-
printf "#\n# Installed pip for Python 2.7\n"
17-
else
18-
printf "#\n# Skipped pip, RELEASE not set\n"
19-
fi
20-
2119
printf "#\n# Running tests in Python ${PYTHON}\n"
2220
export NOSETESTS_BINARY=nosetests${PYTHON}
2321
printf "#\n# Testing implementation..\n"

‎run_docker.sh‎

100644100755
File mode changed.

‎setup.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,28 @@
1616
"Programming Language :: Python :: 3",
1717
"Programming Language :: Python :: 3.3",
1818
"Programming Language :: Python :: 3.5",
19+
"Programming Language :: Python :: 3.6",
20+
"Programming Language :: Python :: 3.7",
21+
"Programming Language :: Python :: 3.8",
22+
"Programming Language :: Python :: 3.9",
23+
"Programming Language :: Python :: 3.10",
1924
"Topic :: Software Development :: Libraries :: Python Modules",
2025
"Topic :: Utilities"
2126
]
2227

28+
DESCRIPTION=(
29+
"Python 2 & 3 compatibility wrapper around all Qt bindings - "
30+
"PySide, PySide2, PyQt4 and PyQt5."
31+
)
32+
ROOT_PATH = os.path.dirname(os.path.realpath(__file__))
33+
README_PATH = os.path.join(ROOT_PATH, "README.md")
2334

2435
setup(
2536
name="Qt.py",
2637
version=version,
27-
description="Python 2 & 3 compatibility wrapper around all Qt bindings - "
28-
"PySide, PySide2, PyQt4 and PyQt5.",
38+
description=DESCRIPTION,
39+
long_description=open(README_PATH).read(),
40+
long_description_content_type="text/markdown",
2941
author="Marcus Ottosson",
3042
author_email="[email protected]",
3143
url="https://github.com/mottosso/Qt",

0 commit comments

Comments
 (0)