- Remove online tests:

* remove-online-tests.patch
- Work with new pycountry:
  * new-pycountry.patch
- Run tests

- Fix fdupes call
- Update to 1.3.1:
  * no obvious changelog

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-FormEncode?expand=0&rev=20

python-FormEncode.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-FormEncode
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,21 +19,22 @@
 %define oldpython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-FormEncode
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
 Summary:        HTML form validation, generation, and conversion package
 License:        Python-2.0
 Group:          Development/Languages/Python
-Url:            http://formencode.org
-Source:         https://files.pythonhosted.org/packages/source/F/FormEncode/FormEncode-%{version}.zip
-Source1:        FormEncode-doc-infrastructure.tar.gz
-# Documentation requirements:
+URL:            http://formencode.org
+Source:         https://files.pythonhosted.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz
+Patch0:         remove-online-tests.patch
+Patch1:         new-pycountry.patch
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module pycountry}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-Sphinx
-BuildRequires:  unzip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python2-dnspython
 BuildArch:      noarch
 %ifpython2
 Provides:       %{oldpython}-formencode = %{version}
@@ -46,40 +47,30 @@ FormEncode validates and converts nested structures. It allows for
 a declarative form of defining the validation, and decoupled processes
 for filling and generating forms.
 
-%package -n %{name}-doc
-Summary:        HTML form validation, generation, and conversion package
-Group:          Development/Libraries/Python
-Provides:       %{python_module FormEncode-doc = %{version}}
-
-%description -n %{name}-doc
-This package contains documentation files for %{name}.
-
 %prep
-%setup -q -n FormEncode-%{version} -a1
-find . -name \*.txt -exec sed -i 's/\r$//g' {} \;
-sed -i 's/\r$//g' PKG-INFO README.rst
-sed -i '/^:date:/d' docs/*.txt # fix build-compare
+%setup -q -n FormEncode-%{version}
+%patch0 -p1
+%patch1 -p1
+dos2unix README.rst
 
 %build
 %python_build
-%{_python_use_flavor python3}
-python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo && mv build/sphinx/html html
 
 %install
 %python_install
 
-# install documentation
-rm -r %{buildroot}%{python_sitelib}/docs # remove misplaced documentation
+# remove misplaced documentation
+%python_expand rm -r %{buildroot}%{$python_sitelib}/docs
 
-%fdupes %{buildroot}%{_prefix}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+
+%check
+export LANG=en_US.UTF-8
+# excluded tests poll dns
+%python_expand PYTHONPATH=%{buildroot}%{python_sitelib} nosetests-%{python_bin_suffix} -v -e '(test_cyrillic_email|test_unicode_ascii_subgroup)' formencode/tests
 
 %files %{python_files}
-%defattr(-,root,root,-)
 %doc README.rst
 %{python_sitelib}/*
 
-%files -n %{name}-doc
-%defattr(-,root,root,-)
-%doc html
-
 %changelog