PR#1: WIP: Update to 2.8.2 (closes RHBZ#1988758) - rpms/jrnl

Benjamin A. Beasley • 2 years ago

6158b72

.gitignore

file modified

jrnl.spec

file modified

+5 -28

		`@@ -1,5 +1,5 @@`
		`Name: jrnl`
		`- Version: 2.8.1`
		`+ Version: 2.8.2`
		`Release: %autorelease`
		`Summary: A simple journal application for the command line`

		`@@ -13,10 +13,6 @@`
		`BuildRequires: python3-devel`
		`BuildRequires: pyproject-rpm-macros`

		`- # Test dependencies`
		`- BuildRequires: python3dist(behave)`
		`- BuildRequires: python3dist(pytest)`
		`-`
		`BuildRequires: help2man`

		`%description`
		`@@ -39,26 +35,9 @@`
		`%prep`
		`%autosetup -n %{name}-%{version}`

		`- # Upstream bug for Python 3.10 support:`
		`- # https://github.com/jrnl-org/jrnl/issues/1270`
		`- sed -r -i -e 's/(python = ">=3\.7\.0), <3\.10"/\1"/' pyproject.toml`
		`-`
		`- # https://github.com/jrnl-org/jrnl/pull/1283`
		`- # These do not need to be executable:`
		`- chmod -v a-x %{name}/Entry.py docs_theme/index.html`
		`- # Find non-executable files with shebang lines, and remove them`
		`- find %{name}/ -type f ! -perm /0111 \|`
		`- while read -r fn`
		`- do`
		`- if head "${fn}" \| grep -E '^#!' >/dev/null`
		`- then`
		`- sed -r -i '1{/#!/d}' "${fn}"`
		`- fi`
		`- done`
		`-`

		`%generate_buildrequires`
		`- %pyproject_buildrequires -r`
		`+ %pyproject_buildrequires -x testing`


		`%build`
		`@@ -79,11 +58,9 @@`


		`%check`
		`- %pytest`
		`- env PATH="%{buildroot}%{_bindir}:${PATH}" \`
		`- PYTHONPATH='%{buildroot}%{python3_sitelib}' \`
		`- PYTHONDONTWRITEBYTECODE=1 \`
		`- /usr/bin/behave --no-skipped --format progress2`
		`+ export PYTHONPATH="${PWD}:%{buildroot}%{python3_sitelib}"`
		`+ %pytest tests/unit`
		`+ %pytest tests/bdd --gherkin-terminal-reporter`


		`%files -f %{pyproject_files}`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (jrnl-2.8.1.tar.gz) = a41221bea7174a8fbcfa49d41ab19feb187ceb0a8a866d3cb308b6ce11c071b5429e7ac9384fe0b5a704a3ac4633be953f8b022dd527cf5e0b67f1ad2f7f4761`
		`+ SHA512 (jrnl-2.8.2.tar.gz) = c1b3188dde10ae5243d366afc89cc3dcbea60eaa3b9684706f26dc3699fe95658f70a4c54e7f87e1f9bd2ce96fd07db63bee70afd4f8760c7457605e874848b1`