From 96987b35096810ee06ecf20203051ecd96743847 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Apr 14 2020 08:22:28 +0000 Subject: [packit] 0.10.0 upstream release Upstream tag: 0.10.0 Upstream commit: 440dee66 Signed-off-by: Jiri Popelka --- diff --git a/.gitignore b/.gitignore index cf437f3..941a53e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /packitos-0.6.1.tar.gz /packitos-0.7.0.tar.gz /packitos-0.7.1.tar.gz +/packitos-0.10.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 7f1c5c4..68df8a7 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,39 +1,32 @@ --- -specfile_path: packit.spec synced_files: - - packit.spec - - .packit.yaml - src: fedora-tests/ dest: tests/ # packit was already taken on PyPI upstream_package_name: packitos -# backwards compat -upstream_project_name: packitos -downstream_package_name: packit upstream_project_url: https://github.com/packit-service/packit -current_version_command: ["python3", "setup.py", "--version"] -create_tarball_command: ["python3", "setup.py", "sdist", "--dist-dir", "."] -create_pr: false + +actions: + create-archive: + - "python3 setup.py sdist --dist-dir ." + - "sh -c 'echo packitos-$(python3 setup.py --version).tar.gz'" + get-current-version: + - "python3 setup.py --version" + jobs: -- job: propose_downstream - trigger: release - metadata: - dist-git-branch: master -- job: propose_downstream - trigger: release - metadata: - dist-git-branch: f30 -- job: propose_downstream - trigger: release - metadata: - dist-git-branch: f29 -- job: sync_from_downstream - trigger: commit -- job: copr_build - trigger: pull_request - metadata: - targets: - - fedora-29-x86_64 - - fedora-30-x86_64 - - fedora-31-x86_64 - - fedora-rawhide-x86_64 # no compose for a week+, let's have ticks in our PRs + - job: propose_downstream + trigger: release + metadata: + dist_git_branch: fedora-all + - job: sync_from_downstream + trigger: commit + - job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-all + - job: tests + trigger: pull_request + metadata: + targets: + - fedora-stable # on rawhide we have problems with the new marshmallow diff --git a/README.packit b/README.packit index ce588f3..8e386a5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.7.1.dev29+g9f8a111. +The file was generated using packit 0.9.1.dev27+gfc732f9. diff --git a/packit.spec b/packit.spec index c5061f8..e0ac8ad 100644 --- a/packit.spec +++ b/packit.spec @@ -2,8 +2,8 @@ %global real_name packit Name: %{real_name} -Version: 0.7.1 -Release: 2%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A tool for integrating upstream projects with Fedora operating system License: MIT @@ -21,8 +21,11 @@ BuildRequires: python3-packaging BuildRequires: python3-pyyaml BuildRequires: python3-tabulate BuildRequires: python3-cccolutils +BuildRequires: python3-copr BuildRequires: python3-koji BuildRequires: python3-lazy-object-proxy +BuildRequires: python3-marshmallow +BuildRequires: python3-marshmallow-enum BuildRequires: rebase-helper BuildRequires: python3dist(setuptools) BuildRequires: python3dist(setuptools-scm) @@ -31,19 +34,17 @@ BuildRequires: python3dist(setuptools-scm-git-archive) Requires: fedpkg # bumpspec Requires: rpmdevtools -# doesn't have the python3dist provide -Requires: python3-koji -Requires: python3-bodhi-client Requires: python3-%{real_name} = %{version}-%{release} -%?python_enable_dependency_generator - %description This project provides tooling and automation to integrate upstream open source projects into Fedora operating system. %package -n python3-%{real_name} Summary: %{summary} +# See setup.cfg for details +Requires: python3-koji +Requires: python3-bodhi-client %{?python_provide:%python_provide python3-%{real_name}} %description -n python3-%{real_name} @@ -61,16 +62,18 @@ rm -rf %{pypi_name}.egg-info %install %py3_install -%if 0%{?fedora} >= 30 python3 setup.py --command-packages=click_man.commands man_pages --target %{buildroot}%{_mandir}/man1 -%endif + +# FIXME: workaround for setuptools installing it into bash_completion/ instead of bash-completion/ +install -d -m 755 %{buildroot}%{_datadir}/bash-completion/completions +mv %{buildroot}%{_datadir}/bash_completion/completions/packit %{buildroot}%{_datadir}/bash-completion/completions/packit %files %license LICENSE %{_bindir}/packit -%if 0%{?fedora} >= 30 %{_mandir}/man1/packit*.1* -%endif +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/%{real_name} %files -n python3-%{real_name} %license LICENSE @@ -78,6 +81,9 @@ python3 setup.py --command-packages=click_man.commands man_pages --target %{buil %{python3_sitelib}/* %changelog +* Tue Apr 14 2020 Jiri Popelka - 0.10.0-1 +- new upstream release: 0.10.0 + * Wed Jan 29 2020 Fedora Release Engineering - 0.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 611e846..a34379b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packitos-0.7.1.tar.gz) = 61e0a9fd9c6c90ecaac773c5017f446679ca209b7a2cd33a0dfd15083e9b0845782e15464fea0ff9441d571f6e75aec3e514967130a0aaec544bf0e3e46c6a4e +SHA512 (packitos-0.10.0.tar.gz) = 6f10c83a96c67c25c0e1ab5ef77ff719da5f035c852c189b031f9ad691addbe71eb836c4c08c3389a97e4a5db506a16ad129b0b30654165ad87245f768448920 diff --git a/tests/tests.yml b/tests/tests.yml index 6e98f44..cf6a8f7 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,23 +1,23 @@ --- - hosts: localhost roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - python3-packit - - python36 - - python3-tox - - python3-pytest - - python3-flexmock - - make - - krb5-devel - - rpm-libs - - redhat-rpm-config - tests: - - upstream: - dir: . - run: ./upstream.sh - - simple_app: - dir: . - run: ./simple.py + - role: standard-test-basic + tags: + - classic + required_packages: + - python3-packit + - python36 + - python3-tox + - python3-pytest + - python3-flexmock + - make + - krb5-devel + - rpm-libs + - redhat-rpm-config + tests: + - upstream: + dir: . + run: ./upstream.sh + - simple_app: + dir: . + run: ./simple.py