From 02e0e77f3805fd15f1ace84fb8651271cf789e77 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Thu, 4 Jan 2024 14:54:20 +0100 Subject: [PATCH 01/21] run_docker.sh: Add execution permissions. --- run_docker.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 run_docker.sh diff --git a/run_docker.sh b/run_docker.sh old mode 100644 new mode 100755 From e4ffb10578a36fee35843dcbbb3f224d637da96e Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Thu, 4 Jan 2024 14:55:49 +0100 Subject: [PATCH 02/21] entrypoint.sh: Switch to using pgrep to verify running Xvfb process. '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 --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index b104f7d3..71a3b729 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,7 +5,7 @@ set -e # Start Xvfb Xvfb :99 -screen 0 1024x768x16 2>/dev/null & -while ! ps aux | grep -q '[0]:00 Xvfb :99 -screen 0 1024x768x16'; do +while ! pgrep 'Xvfb' &> /dev/null; do echo "Waiting for Xvfb..." sleep 1 done From 95f7d6bdbf366b3acc882e25b155874caaf13ed7 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Thu, 4 Jan 2024 18:00:14 +0100 Subject: [PATCH 03/21] entrypoint.sh: Exit with code 124 if Xvfb is not running after 60 secs. 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. --- entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 71a3b729..410bc0e8 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,9 +5,15 @@ set -e # Start Xvfb Xvfb :99 -screen 0 1024x768x16 2>/dev/null & +counter=0 while ! pgrep 'Xvfb' &> /dev/null; do echo "Waiting for Xvfb..." sleep 1 + ((counter+=1)) + if [[ $counter -ge 60 ]]; then + echo "Xvfb: Exceeded timeout." + exit 124 + fi done if [ -n "$RELEASE" ]; then From 782c2db5494205997f97f8836c32f446065ef6c1 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Thu, 4 Jan 2024 18:22:51 +0100 Subject: [PATCH 04/21] Github Actions: Add 'run-tests' workflow. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One-to-one conversion of the previous Travis CI based testing workflow. ❗️ Currently runs on every push ❗️ --- .github/workflows/run-tests.yaml | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/run-tests.yaml diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml new file mode 100644 index 00000000..0020d424 --- /dev/null +++ b/.github/workflows/run-tests.yaml @@ -0,0 +1,44 @@ +name: run-tests + +on: + push + +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - os: ubuntu-latest + VFXPLATFORM: "2018" + PYTHON: "2.7" + - os: ubuntu-latest + VFXPLATFORM: "2018" + PYTHON: "3.4" + - os: ubuntu-latest + VFXPLATFORM: "2018" + PYTHON: "3.5" + - os: ubuntu-latest + VFXPLATFORM: "2018" + PYTHON: "3.6" + - os: ubuntu-latest + VFXPLATFORM: "2017" + PYTHON: "2.7" + - os: ubuntu-latest + VFXPLATFORM: "2017" + PYTHON: "3.4" + - os: ubuntu-latest + VFXPLATFORM: "2017" + PYTHON: "3.5" + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Run tests in Docker container + run: | + docker run --rm \ + -v $(pwd):/Qt.py \ + -e PYTHON=${{ matrix.PYTHON }} \ + -e RELEASE=${{ matrix.RELEASE }} \ + fredrikaverpil/qt.py:${{ matrix.VFXPLATFORM }} From a2cadeed35b414112ea97e44c6b43923a2604099 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Thu, 4 Jan 2024 19:07:11 +0100 Subject: [PATCH 05/21] entrypoint.sh: Remove obsolete pip installation. A separate Github Action will take care of the package deployment to PyPi. Therefore, the pip installation within the Docker container can be removed. --- entrypoint.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 410bc0e8..bed3c6b5 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -16,14 +16,6 @@ while ! pgrep 'Xvfb' &> /dev/null; do fi done -if [ -n "$RELEASE" ]; then - wget https://bootstrap.pypa.io/pip/2.7/get-pip.py - python${PYTHON} ./get-pip.py - printf "#\n# Installed pip for Python 2.7\n" -else - printf "#\n# Skipped pip, RELEASE not set\n" -fi - printf "#\n# Running tests in Python ${PYTHON}\n" export NOSETESTS_BINARY=nosetests${PYTHON} printf "#\n# Testing implementation..\n" From 1c1a99f7a53f1a233c51cd97d7efcda2854273c4 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 21:42:13 +0100 Subject: [PATCH 06/21] run-tests.yaml: Only run on pushed commits, not on pushed tags. 'Run tests' should not run on pushed tags, otherwise we it would get run twice unneccesarily during release tag push. --- .github/workflows/run-tests.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 0020d424..783ed953 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -1,7 +1,9 @@ -name: run-tests +name: Run Tests on: - push + push: + branches: + - "*" jobs: test: @@ -40,5 +42,4 @@ jobs: docker run --rm \ -v $(pwd):/Qt.py \ -e PYTHON=${{ matrix.PYTHON }} \ - -e RELEASE=${{ matrix.RELEASE }} \ fredrikaverpil/qt.py:${{ matrix.VFXPLATFORM }} From ba39275dfdc979ba9fed147ee3e038c4c451ad31 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:00:50 +0100 Subject: [PATCH 07/21] Rename Github workflow config file suffix to '.yml'. --- .github/workflows/{run-tests.yaml => run-tests.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{run-tests.yaml => run-tests.yml} (100%) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yml similarity index 100% rename from .github/workflows/run-tests.yaml rename to .github/workflows/run-tests.yml From 92a5dc25bd30b2db4e62a76038cdf3dbb238d4de Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:18:05 +0100 Subject: [PATCH 08/21] Github Actions: Add 'release-to-pypi' workflow. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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. --- .github/workflows/release-to-pypi.yml | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/release-to-pypi.yml diff --git a/.github/workflows/release-to-pypi.yml b/.github/workflows/release-to-pypi.yml new file mode 100644 index 00000000..3b87ac30 --- /dev/null +++ b/.github/workflows/release-to-pypi.yml @@ -0,0 +1,35 @@ +name: Release to PyPi + +on: + push: + tags: + - "*" + +jobs: + build-and-release: + name: Build and Release + runs-on: ubuntu-latest + # if: github.repository_owner == 'mottosso' + + environment: + name: pypi + url: https://pypi.org/p/Qt.py + permissions: + id-token: write # IMPORTANT: this permission is mandatory for trusted publishing + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.7.x" + - name: Install build dependency + run: python3 -m pip install --upgrade build + - name: Build a binary wheel and a source tarball + run: python3 -m build + - name: Release to PyPi + uses: pypa/gh-action-pypi-publish@release/v1 + # TODO: Remove with: block before actual release. + with: + repository-url: https://test.pypi.org/legacy/ From d90800a307273fd6a2de1fc49b14375b75798b86 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:40:09 +0100 Subject: [PATCH 09/21] setup.py: Pass content of 'README.md' in as long_description. Modern twine/build expects long_description to be set. This way 'README.md' will be displayed on https://pypi.org/project/Qt.py/. --- setup.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index af72d08c..9acca229 100644 --- a/setup.py +++ b/setup.py @@ -20,12 +20,19 @@ "Topic :: Utilities" ] +DESCRIPTION=( + "Python 2 & 3 compatibility wrapper around all Qt bindings - " + "PySide, PySide2, PyQt4 and PyQt5." +) +ROOT_PATH = os.path.dirname(os.path.realpath(__file__)) +README_PATH = os.path.join(ROOT_PATH, "README.md") setup( name="Qt.py", version=version, - description="Python 2 & 3 compatibility wrapper around all Qt bindings - " - "PySide, PySide2, PyQt4 and PyQt5.", + description=DESCRIPTION, + long_description=open(README_PATH).read(), + long_description_content_type="text/markdown", author="Marcus Ottosson", author_email="konstruktion@gmail.com", url="https://github.com/mottosso/Qt", From f7e2064e287960b113d2a6a9e2937c5e6cd063de Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:46:41 +0100 Subject: [PATCH 10/21] README.md: Load logo with absolute URL. This way it will also render correctly on https://pypi.org/project/Qt.py/. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71552bf1..028042f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + [![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) [![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) From 16189384640a963aee8a25852b591939cf69b797 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:50:03 +0100 Subject: [PATCH 11/21] README.md: Replace Travis CI badge with Github Actions badge. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❗️ Currently references 'martin-chatterjee/Qt.py', for testing purposes. ❗️ --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 028042f8..08a3e1c3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ -[![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) -[![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) +[![Downloads](https://pepy.tech/badge/qt-py)](https://pepy.tech/project/qt-py) +[![Run Tests](https://github.com/martin-chatterjee/Qt.py/actions/workflows/run-tests.yml/badge.svg)](https://github.com/martin-chatterjee/Qt.py/actions) +[![PyPI version](https://badge.fury.io/py/Qt.py.svg)](https://pypi.python.org/pypi/Qt.py) +[![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) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com) Qt.py enables you to write software that runs on any of the 4 supported bindings - PySide2, PyQt5, PySide and PyQt4. From 636dc16926ca12e5b928ef01dad60813c72c5eb2 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:53:48 +0100 Subject: [PATCH 12/21] README.md: Add CI changes to News section. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❗️ Currently states 'version 1.3.9'. This is an assumption, and needs to be changed before merge. ❗️ --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 08a3e1c3..7294bd3a 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Qt.py enables you to write software that runs on any of the 4 supported bindings | Date | Version | Event |:---------|:----------|:---------- +| Jan 2024 | [1.3.9][] | Run CI on Github Actions, instead of Travis CI. | Sep 2020 | [1.3.0][] | Stability improvements and greater ability for `QtCompat.wrapInstance` to do its job | Jun 2019 | [1.2.1][] | Bugfixes and [additional members](https://github.com/mottosso/Qt.py/releases/tag/1.2.0) | Jan 2018 | [1.1.0][] | Adds new test suite, new members @@ -32,6 +33,7 @@ Qt.py enables you to write software that runs on any of the 4 supported bindings [1.1.0]: https://github.com/mottosso/Qt.py/releases/tag/1.1.0 [1.2.1]: https://github.com/mottosso/Qt.py/releases/tag/1.2.1 [1.3.0]: https://github.com/mottosso/Qt.py/releases/tag/1.3.0 +[1.3.9]: https://github.com/mottosso/Qt.py/releases/tag/1.3.9 ##### Guides From f117855b05201aed81b29ae289396ee427ba1b14 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 22:59:31 +0100 Subject: [PATCH 13/21] Update documentation. --- DOCKER.md | 10 +++++----- README.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DOCKER.md b/DOCKER.md index 1c8d0467..fccc98ab 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -1,6 +1,6 @@ ## Docker -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/). +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/). The Docker images follow the [VFX Reference Platform specifications](http://www.vfxplatform.com/) with some additionals, and are quite jam-packed. @@ -24,10 +24,10 @@ The Docker images follow the [VFX Reference Platform specifications](http://www. * PyQt51 * PySide21 -1 Per specification from VFX Platform -2 Adds possibility to faster clone large repositories -3 cmake 3.x required to build PySide2 -4 Required for Qt.py testing +1 Per specification from VFX Platform +2 Adds possibility to faster clone large repositories +3 cmake 3.x required to build PySide2 +4 Required for Qt.py testing 5 Required for `PySide2.QtUiTools`
diff --git a/README.md b/README.md index 7294bd3a..b173540d 100644 --- a/README.md +++ b/README.md @@ -574,7 +574,7 @@ docker run --rm -v %CD%:/Qt.py -e PYTHON=3.6 fredrikaverpil/qt.py:2018 # OK ``` -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! +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! For details on the Docker image for testing, see [`DOCKER.md`](DOCKER.md). From cd4cb7406b8310cb9f90fd0d0ddd520fee5676a7 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 23:00:13 +0100 Subject: [PATCH 14/21] =?UTF-8?q?setup.py:=20Add=20support=20for=20Python?= =?UTF-8?q?=203.7=20=E2=80=93=203.10.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py index 9acca229..d6b85cfb 100644 --- a/setup.py +++ b/setup.py @@ -16,6 +16,11 @@ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Utilities" ] From c1f588560bea0470d780c4d566393b2798777bde Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 23:00:37 +0100 Subject: [PATCH 15/21] Remove obsolete Travis CI config file. --- .travis.yml | 57 ----------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 66e50988..00000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -matrix: - include: - - # VFX Platform 2018 - - os: linux - env: - - VFXPLATFORM=2018 - - PYTHON=2.7 - - RELEASE=true - - os: linux - env: - - VFXPLATFORM=2018 - - PYTHON=3.4 - - os: linux - env: - - VFXPLATFORM=2018 - - PYTHON=3.5 - - os: linux - env: - - VFXPLATFORM=2018 - - PYTHON=3.6 - - # VFX Platform 2017 - - os: linux - env: - - VFXPLATFORM=2017 - - PYTHON=2.7 - - os: linux - env: - - VFXPLATFORM=2017 - - PYTHON=3.4 - - os: linux - env: - - VFXPLATFORM=2017 - - PYTHON=3.5 - - -language: python -sudo: required -dist: focal - -services: - - docker - -script: - - docker run --rm -v $(pwd):/Qt.py -e PYTHON=${PYTHON} fredrikaverpil/qt.py:${VFXPLATFORM} - -deploy: - provider: pypi - user: mottosso - password: - secure: kDHKpxgDtn6PoS2Hs0jKd3Xeq+ArFwcOKNW+NkZB2S8+MVxwkzsXBWsvK5Bo14GU/Xoo/PPQKMZi61GNXLJdb/5yGUo9hmuRH/UVCBuFar30pROzHLc2slUL1vbAw82pGa3UCpVLDPi/RVyfUWY4KOnlvr7Hb29IMg/NzfibP4cIEUGFqwp9F1KtE9N8oq6aK5rLznJJwq9Hjj564Zqo4JvEUzucLHnNS4WHFEURuF9gxxQ1E4EZXAnIDGEKmKvBRGKXpDGIJ7hIG9+6fEltZRBdb5jevHxbIjBHKbcK780XnR7gYOQwiCUWaQF90CPbHQA3ff9lKZVDAbQiuYhiqCEVnFCTfgB6D8rL2XQYe/A/pRN8eB2m++ft+v+zYAfmPK+wkNga8wXWMLkc7z+n+aEmeWxopj9MoQqzzKqJeRZ6wgqXWL1YB8TAbUiCRkpcxuMJVu5qIOuWw9eKp+yo6zHjxh6a4MxN50107ZR05ZDEdkU3PgJik5IScWDegJGRQALMCU2Wlis1cdbV8qSosrnMYMdcrpd0R3Bpl/2q9WtUZhZJ7z3GN4YV+d/l0fIUXbrHmOzWjoyW9U8zY2oL+5glCahA6IHBDD+Na47TT93EyMkJ5MxukqNi/rnqUvVdqzgG+tX/HeehNiZkPcN+CWSQoOt1Oeo9pkixpVbjmxA= - distributions: "sdist bdist_wheel" - on: - tags: true - repo: mottosso/Qt.py - condition: $RELEASE = true From 773417816ca5295f82c2a26ddc75d236c2fac9b9 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 23:07:07 +0100 Subject: [PATCH 16/21] Release test: Change project name and version. Test-releases to 'test.pypi.org' as project 'martin-chatterjee-Qt.py'. --- Qt.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Qt.py b/Qt.py index c261d30e..7c2f200a 100644 --- a/Qt.py +++ b/Qt.py @@ -45,7 +45,7 @@ import json -__version__ = "1.3.8" +__version__ = "1.3.9.dev3" # Enable support for `from Qt import *` __all__ = [] diff --git a/setup.py b/setup.py index d6b85cfb..0501a1bb 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ README_PATH = os.path.join(ROOT_PATH, "README.md") setup( - name="Qt.py", + name="martin-chatterjee-Qt.py", version=version, description=DESCRIPTION, long_description=open(README_PATH).read(), From e9a79fb56a9fc661e21ed9054ca45bf23ab04c53 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 23:20:49 +0100 Subject: [PATCH 17/21] Revert project name and version after release test. --- Qt.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Qt.py b/Qt.py index 7c2f200a..c261d30e 100644 --- a/Qt.py +++ b/Qt.py @@ -45,7 +45,7 @@ import json -__version__ = "1.3.9.dev3" +__version__ = "1.3.8" # Enable support for `from Qt import *` __all__ = [] diff --git a/setup.py b/setup.py index 0501a1bb..d6b85cfb 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ README_PATH = os.path.join(ROOT_PATH, "README.md") setup( - name="martin-chatterjee-Qt.py", + name="Qt.py", version=version, description=DESCRIPTION, long_description=open(README_PATH).read(), From 8415b61ccdc8dcba199a3c8ea9c88e7e26edbfc8 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 23:21:39 +0100 Subject: [PATCH 18/21] Release to PyPi: Un-comment 'repository_owner' constraint. --- .github/workflows/release-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-to-pypi.yml b/.github/workflows/release-to-pypi.yml index 3b87ac30..ebfc0483 100644 --- a/.github/workflows/release-to-pypi.yml +++ b/.github/workflows/release-to-pypi.yml @@ -9,7 +9,7 @@ jobs: build-and-release: name: Build and Release runs-on: ubuntu-latest - # if: github.repository_owner == 'mottosso' + if: github.repository_owner == 'mottosso' environment: name: pypi From 009591dcbde1d94674024337fc0fb08913f40679 Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Wed, 10 Jan 2024 23:22:30 +0100 Subject: [PATCH 19/21] README.md: Change absolute badge URLs to 'mottosso/Qt.py'. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b173540d..1460b0b6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Downloads](https://pepy.tech/badge/qt-py)](https://pepy.tech/project/qt-py) -[![Run Tests](https://github.com/martin-chatterjee/Qt.py/actions/workflows/run-tests.yml/badge.svg)](https://github.com/martin-chatterjee/Qt.py/actions) +[![Run Tests](https://github.com/mottosso/Qt.py/actions/workflows/run-tests.yml/badge.svg)](https://github.com/mottosso/Qt.py/actions) [![PyPI version](https://badge.fury.io/py/Qt.py.svg)](https://pypi.python.org/pypi/Qt.py) [![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) From 65d87b390f01202fb16a77d01c1bd91552728cfb Mon Sep 17 00:00:00 2001 From: Martin Chatterjee Date: Sat, 27 Jan 2024 14:11:41 +0100 Subject: [PATCH 20/21] Qt.py: Update version to '1.3.9'. --- Qt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Qt.py b/Qt.py index c261d30e..ebe692b2 100644 --- a/Qt.py +++ b/Qt.py @@ -45,7 +45,7 @@ import json -__version__ = "1.3.8" +__version__ = "1.3.9" # Enable support for `from Qt import *` __all__ = [] From ffdf4ef403eabdd4b3b91dfc0436c3bb53b7a9c6 Mon Sep 17 00:00:00 2001 From: Marcus Ottosson Date: Fri, 2 Feb 2024 07:55:50 +0000 Subject: [PATCH 21/21] Update release-to-pypi.yml Remove test.pypi.org for release --- .github/workflows/release-to-pypi.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-to-pypi.yml b/.github/workflows/release-to-pypi.yml index ebfc0483..e58d0bba 100644 --- a/.github/workflows/release-to-pypi.yml +++ b/.github/workflows/release-to-pypi.yml @@ -30,6 +30,3 @@ jobs: run: python3 -m build - name: Release to PyPi uses: pypa/gh-action-pypi-publish@release/v1 - # TODO: Remove with: block before actual release. - with: - repository-url: https://test.pypi.org/legacy/