From 380f89fae3772ad84853ae6bb3d01a9c5527db58 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 18 Jul 2023 17:49:54 -0400 Subject: [PATCH 1/4] requirements-dev.txt: remove aexpect Aexpect was last used in a selftests before a640bf4e0ae. Signed-off-by: Cleber Rosa --- requirements-dev.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 997dc3ad0a..680f477c09 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -10,7 +10,6 @@ black==22.3.0 coverage==5.5 # To run make check -aexpect==1.6.1 psutil==5.8.0 # pycdlib is an optional requirement in production From af38c500234e8a7f383256fef71d6e3b7dcbaf2c Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 18 Jul 2023 17:49:54 -0400 Subject: [PATCH 2/4] Development/build requirements: remove elementpath In 847d53624, elementpath and xmlschema were added to the build requirements with the reasoning that coverage was expanded (the tests that relied on "them" would be enable at build time). But, in fact, only xmlschema was being used at the time, and that remains today. Let's remove elementpath for a cleaner set of build requirements. Signed-off-by: Cleber Rosa --- python-avocado.spec | 6 ++++-- requirements-dev.txt | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index 2cf833e86f..7512f642e2 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -28,7 +28,7 @@ Summary: Framework with tools and libraries for Automated Testing Name: python-avocado Version: 102.0 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} License: GPLv2+ and GPLv2 and MIT URL: https://avocado-framework.github.io/ %if 0%{?rel_build} @@ -66,7 +66,6 @@ BuildRequires: python3-yaml BuildRequires: python3-netifaces %if ! 0%{?rhel} BuildRequires: perl-Test-Harness -BuildRequires: python3-elementpath BuildRequires: python3-xmlschema %endif BuildRequires: zstd @@ -409,6 +408,9 @@ Again Shell code (and possibly other similar shells). %{_libexecdir}/avocado* %changelog +* Tue Jul 18 2023 Cleber Rosa - 102.0-2 +- Removed python3-elementpath build requirement + * Fri Jun 23 2023 Cleber Rosa - 102.0-1 - New release diff --git a/requirements-dev.txt b/requirements-dev.txt index 680f477c09..49884e5b7e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,6 @@ pycdlib==1.13.0 netifaces==0.11.0 # For tests that validate the produced XUnit output -elementpath==2.3.2 xmlschema==1.7.0 # For building the manpage From f47ea05ade4f62fffd21e78afd38f8447d2c6ca5 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 18 Jul 2023 17:49:54 -0400 Subject: [PATCH 3/4] Builds eggs and upload them at release time Commit 033e5220f enabled the building of plugins' eggs as a pre-merge check. This adds the building and uploading of plugins' eggs as part of the release process. Signed-off-by: Cleber Rosa --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d78b49ba1a..818c72ac60 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,12 +100,12 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Build eggs - run: python setup.py bdist_egg + run: make -f Makefile.gh build-egg - name: Upload binaries to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.RELEASE_TOKEN }} - file: ${{ github.workspace }}/dist/avocado_framework* + file: ${{ github.workspace }}/EGG_UPLOAD/avocado_framework*egg tag: ${{ github.event.inputs.version }} overwrite: true file_glob: true From 00a2dc8914e51d88476aaf48fc390aed10a40012 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 18 Jul 2023 17:49:54 -0400 Subject: [PATCH 4/4] optional_plugins/varianter_pict: include README.rst in packages While building wheels, the following condition was caught: * Getting build dependencies for wheel... Traceback (most recent call last): File "/home/cleber/.local/lib/python3.11/site-packages/pyproject_hooks/_in_process/_in_process.py", line 353, in main() File "/home/cleber/.local/lib/python3.11/site-packages/pyproject_hooks/_in_process/_in_process.py", line 335, in main json_out['return_val'] = hook(**hook_input['kwargs']) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/cleber/.local/lib/python3.11/site-packages/pyproject_hooks/_in_process/_in_process.py", line 118, in get_requires_for_build_wheel return hook(config_settings) ^^^^^^^^^^^^^^^^^^^^^ File "/tmp/build-env-3g7hr9m7/lib/python3.11/site-packages/setuptools/build_meta.py", line 341, in get_requires_for_build_wheel return self._get_build_requires(config_settings, requirements=['wheel']) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/tmp/build-env-3g7hr9m7/lib/python3.11/site-packages/setuptools/build_meta.py", line 323, in _get_build_requires self.run_setup() File "/tmp/build-env-3g7hr9m7/lib/python3.11/site-packages/setuptools/build_meta.py", line 488, in run_setup self).run_setup(setup_script=setup_script) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/tmp/build-env-3g7hr9m7/lib/python3.11/site-packages/setuptools/build_meta.py", line 338, in run_setup exec(code, locals()) File "", line 43, in File "", line 34, in get_long_description FileNotFoundError: [Errno 2] No such file or directory: '/tmp/build-via-sdist-gu1zghmm/avocado-framework-plugin-varianter-pict-102.0/README.rst' Which revealed a mistake introduced in 2e0591d44 that missed the README.rst for the pict plugin. Signed-off-by: Cleber Rosa --- optional_plugins/varianter_pict/MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optional_plugins/varianter_pict/MANIFEST.in b/optional_plugins/varianter_pict/MANIFEST.in index ceeea233fc..88c0d60cef 100644 --- a/optional_plugins/varianter_pict/MANIFEST.in +++ b/optional_plugins/varianter_pict/MANIFEST.in @@ -1 +1 @@ -include VERSION +include VERSION README.rst