Fix dependencies and tests.

python-service-identity.spec

@@ -4,7 +4,7 @@
 
 Name:           python-service-identity
 Version:        16.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Service identity verification for pyOpenSSL
 
 License:        MIT
@@ -32,7 +32,7 @@ BuildRequires:  python3-setuptools
 %if 0%{?fedora} > 20
 # For tests
 BuildRequires:  python3-pytest >= 2.5
-BuildRequires:  python3-characteristic
+BuildRequires:  python3-attrs
 BuildRequires:  python3-pyasn1
 BuildRequires:  python3-pyasn1-modules
 BuildRequires:  python3-pyOpenSSL >= 0.12
@@ -40,7 +40,7 @@ BuildRequires:  python3-idna
 %endif # fedora > 20
 %endif # with_python3
 
-Requires:       python-characteristic
+Requires:       python-attrs
 Requires:       python-pyasn1
 Requires:       python-pyasn1-modules
 Requires:       pyOpenSSL >= 0.12
@@ -50,7 +50,7 @@ Requires:       python-idna
 %package -n python3-service-identity
 Summary:        Logging as Storytelling
 Requires:       python3-six
-Requires:       python3-characteristic
+Requires:       python3-attrs
 Requires:       python3-pyasn1
 Requires:       python3-pyasn1-modules
 Requires:       python3-pyOpenSSL >= 0.12
@@ -114,7 +114,7 @@ PYTHONPATH="%{buildroot}/%{python2_sitelib}" py.test --doctest-modules --doctest
 pushd %{py3dir}
 # https://bitbucket.org/hpk42/pytest/issue/539/pytest-doctest-modules-fails-if-python
 echo "collect_ignore = ['build']" >> conftest.py
-PYTHONPATH="%{buildroot}/%{python3_sitelib}" py.test --doctest-modules --doctest-glob='*.rst'
+PYTHONPATH="%{buildroot}/%{python3_sitelib}" py.test-3 --doctest-modules --doctest-glob='*.rst'
 popd
 %endif # with_python3
 %endif # fedora > 20
@@ -143,6 +143,10 @@ popd
 %endif # with_python3
 
 %changelog
+* Mon Oct 17 2016 Tom Prince <tom.prince@twistedmatrix.com> - 16.0.0-2
+- Use python3 to test python3 package.
+- Fix dependencies.
+
 * Mon Oct 17 2016 Tom Prince <tom.prince@twistedmatrix.com> - 16.0.0-1
 - Update source URL for pypi migration. (#1361604)
 - Build new version