Merge pull request #118 from jscotka/new_spec

repair specfile to be same as possible as in ogr and packit.yaml fix

Author: jscotka

.packit.yaml

@@ -1,22 +1,47 @@
-specfile_path: python-requre.spec
+---
+specfile_path: fedora/python-requre.spec
 synced_files:
-  - python-requre.spec
-  - .packit.yaml
-# package project name what correspond to package name in setup.py
-upstream_package_name: requre
-# name what you used as name in specfile (for python packages it starts with python-)
+  - fedora/changelog
+# https://packit.dev/docs/configuration/#top-level-keys
 downstream_package_name: python-requre
-
+upstream_project_url: https://github.com/packit/requre
+# we are setting this so we can use packit from requre's dist-git
+# packit can't know what's the upstream name when running from distgit
+upstream_package_name: requre
 actions:
+  # we need this b/c `git archive` doesn't put all the metadata in the tarball:
+  #   LookupError: setuptools-scm was unable to detect version for '/builddir/build/BUILD/requre-0.11.1'.
+  #   Make sure you're either building from a fully intact git repository or PyPI tarballs.
   create-archive:
-    - "python3 setup.py sdist --dist-dir ."
-    - "sh -c 'echo requre-$(python3 setup.py --version).tar.gz'"
-  get-current-version:
-    - "python3 setup.py --version"
-
+    - python3 setup.py sdist --dist-dir ./fedora/
+    - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1"
+  get-current-version: python3 setup.py --version
 jobs:
-  - job: tests
+  - job: sync_from_downstream
+    trigger: commit
+  - job: propose_downstream
+    trigger: release
+    metadata:
+      dist_git_branches: fedora-all
+  - job: copr_build
     trigger: pull_request
+    metadata:
+      targets:
+        - fedora-all
+  - job: copr_build
+    trigger: commit
+    metadata:
+      branch: master
+      targets:
+        - fedora-stable
+      project: packit-master
+      list_on_homepage: True
+      preserve_project: True
+  - job: copr_build
+    trigger: release
     metadata:
       targets:
         - fedora-stable
+      project: packit-releases
+      list_on_homepage: True
+      preserve_project: True

python-requre.spec renamed to fedora/python-requre.spec

@@ -1,13 +1,12 @@
-# Created by pyp2rpm-3.3.3
-%global pypi_name requre
+%global srcname requre
 
-Name:           python-%{pypi_name}
-Version:        0.2.4
+Name:           python-%{srcname}
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Python library what allows re/store output of various objects for testing
 
 License:        MIT
-URL:            https://github.com/packit-service/requre
+URL:            https://github.com/packit/requre
 Source0:        %{pypi_source}
 BuildArch:      noarch
 
@@ -26,46 +25,39 @@ REQUest REcordingRequre [rekure] - Is Library for storing output of various
 function and methods to persistent storage and be able to replay the stored
 output to functions.
 
-%package -n     python3-%{pypi_name}
+%package -n     python3-%{srcname}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
 
-%description -n python3-%{pypi_name}
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_provides
+%if 0%{?fedora} < 33
+%{?python_provide:%python_provide python3-%{srcname}}
+%endif
+
+%description -n python3-%{srcname}
 REQUest REcordingRequre [rekure] - Is Library for storing output of various
 function and methods to persistent storage and be able to replay the stored
 output to functions.
 
-%package -n python-%{pypi_name}-doc
-Summary:        requre documentation
-%description -n python-%{pypi_name}-doc
-Documentation for requre
-
-%check
-make check
-
 %prep
-%autosetup -n %{pypi_name}-%{version}
-rm -rf %{pypi_name}.egg-info
+%autosetup -n %{srcname}-%{version}
+# Remove bundled egg-info
+rm -rf %{srcname}.egg-info
 
 %build
 %py3_build
-PYTHONPATH=${PWD} sphinx-build-3 docs html
-rm -rf html/.{doctrees,buildinfo}
 
 %install
 %py3_install
 
-%files -n python3-%{pypi_name}
+%files -n python3-%{srcname}
 %license LICENSE
 %doc README.md
 %{_bindir}/requre-patch
-%{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
-
-%files -n python-%{pypi_name}-doc
-%doc html
-%license LICENSE
+%{python3_sitelib}/%{srcname}
+%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Wed Sep 22 2020 Jan Ščotka <[email protected]> - 0.4.0-1
+- New upstream release 0.4.0
 * Wed Jan 15 2020 Jan Ščotka <[email protected]> - 0.2.0-1
 - Initial package.