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

Build and packaging fixes #5733

Merged
merged 4 commits into from
Jul 24, 2023
Merged

Build and packaging fixes #5733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
380f89f
requirements-dev.txt: remove aexpect
clebergnu Jul 18, 2023
af38c50
Development/build requirements: remove elementpath
clebergnu Jul 18, 2023
f47ea05
Builds eggs and upload them at release time
clebergnu Jul 18, 2023
00a2dc8
optional_plugins/varianter_pict: include README.rst in packages
clebergnu Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion optional_plugins/varianter_pict/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include VERSION
include VERSION README.rst
6 changes: 4 additions & 2 deletions python-avocado.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -409,6 +408,9 @@ Again Shell code (and possibly other similar shells).
%{_libexecdir}/avocado*

%changelog
* Tue Jul 18 2023 Cleber Rosa <[email protected]> - 102.0-2
- Removed python3-elementpath build requirement

* Fri Jun 23 2023 Cleber Rosa <[email protected]> - 102.0-1
- New release

Expand Down
2 changes: 0 additions & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,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
Expand Down