14
0

Accepting request 852998 from devel:languages:python

- Update to version 0.9.0+git.1597423678.4e34d1f:
  * Don't use open, but more compatible io.open
- Remove py2.patch, which has been included upstream.
- Add fix_entry_point.patch
- We don't need any stinking pytest.

OBS-URL: https://build.opensuse.org/request/show/852998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-screenplain?expand=0&rev=2
This commit is contained in:
2020-12-04 20:29:07 +00:00
committed by Git OBS Bridge
7 changed files with 48 additions and 38 deletions

View File

@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/mcepl/screenplain.git</param>
<param name="changesrevision">0ff963d98eba7faf573ac425d03d8371e88c7e66</param></service></servicedata>
<param name="changesrevision">4e34d1f78f6006d40933d744e61ae968f349f95d</param></service></servicedata>

19
fix_entry_point.patch Normal file
View File

@@ -0,0 +1,19 @@
--- a/screenplain/main.py
+++ b/screenplain/main.py
@@ -30,7 +30,7 @@ def invalid_format(parser, message):
)
-def main(args):
+def main(args=sys.argv[1:]):
parser = OptionParser(usage=usage)
parser.add_option(
'-f', '--format', dest='output_format',
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
[metadata]
license_files = LICENSE.txt
+
+[pycodestyle]
+ignore = E402,W504

View File

@@ -1,19 +0,0 @@
diff --git a/setup.py b/setup.py
index fdc9b53..5db7014 100755
--- a/setup.py
+++ b/setup.py
@@ -3,9 +3,11 @@
from setuptools import setup
# read the contents of your README file
-from os import path
-this_directory = path.abspath(path.dirname(__file__))
-with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
+import os.path
+import io
+
+this_directory = os.path.abspath(os.path.dirname(__file__))
+with io.open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
setup(

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Dec 03 21:34:14 UTC 2020 - mcepl@cepl.eu
- Update to version 0.9.0+git.1597423678.4e34d1f:
* Don't use open, but more compatible io.open
- Remove py2.patch, which has been included upstream.
- Add fix_entry_point.patch
- We don't need any stinking pytest.
-------------------------------------------------------------------
Fri Aug 14 16:29:32 UTC 2020 - mcepl@cepl.eu

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-screenplain
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,9 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%if 0%{?suse_version} > 1500
%bcond_with python2
@@ -21,24 +23,23 @@
%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-screenplain
Version: 0.9.0+git.1597420829.0ff963d
Version: 0.9.0+git.1597423678.4e34d1f
Release: 0
License: MIT
Summary: Convert text file to viewable screenplay
Url: http://www.screenplain.com/
License: MIT
Group: Development/Languages/Python
URL: http://www.screenplain.com/
# Source: https://files.pythonhosted.org/packages/source/s/screenplain/screenplain-%%{version}.tar.gz
# Tarball generated from gh#vilcans/screenplain#62
Source: screenplain-%{version}.tar.gz
# PATCH-FIX-UPSTREAM py2.patch mcepl@suse.com
# Don't use open(), but more compatible io.open()
Patch0: py2.patch
BuildRequires: python-rpm-macros
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module reportlab}
BuildRequires: %{python_module pytest}
# PATCH-FIX-UPSTREAM fix_entry_point.patch mcepl@suse.com
# entry point lead to incorrect function.
Patch0: fix_entry_point.patch
BuildRequires: %{python_module pycodestyle}
BuildRequires: %{python_module reportlab}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
Requires: python-reportlab
Requires(post): update-alternatives
@@ -77,9 +78,9 @@ sed -i '1{/^#!.*env python/d}' screenplain/main.py
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
export PYTEST_ADDOPTS="--doctest-modules"
%pytest
python3 -mpycodestyle -v --ignore=E402,W504 screenplain tests
%pyunittest discover -v -p '*test*.py'
%python_exec -mdoctest -v screenplain/*.py
%python_exec -mpycodestyle -v screenplain tests
%post
%python_install_alternative screenplain

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b02872b346f4730d7539e056b3a44ecfc2f556081914c032214ce6d3cdbc4fa5
size 24496

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58b75c58ed06a2b3495f254e768fa1033ed26d655d9a7b73185ae7f23f0b7cf1
size 24431