- updated to 0.9.7

- removed outdated test-deps patch

diff --git a/python-httpretty.spec b/python-httpretty.spec
index 1b6426e13604607bac6eb2d50e16a652e2273869..94b42628d99e2ba961d5ab936c42fa1b3b57df98 100644 (file)
--- a/python-httpretty.spec
+++ b/python-httpretty.spec
@@ -1,69 +1,97 @@
 #
 # Conditional build:
-%bcond_with    tests   # do not perform "make test"
+%bcond_with    tests   # unit/functional tests
+%bcond_with    doc     # build Sphinx documentation (already built docs included in dist as of 0.9.7)
 %bcond_without python2 # CPython 2.x module
-# Python3 note:
-# Due to big API incompatibility between python 3.3, 3.4 and 3.5, the
-# author of HTTPretty is **not** supporting python3 officially.  You
-# will notice that the travis build for python 3 might be broken, and
-# while pull requests fixing py3 support are most welcome, it is still
-# not official at least *for now*.
 %bcond_without python3 # CPython 3.x module
 
 %define        module  httpretty
 Summary:       HTTP client mock for Python
+Summary(pl.UTF-8):     Atrapa klienta HTTP dla Pythona
 Name:          python-%{module}
-Version:       0.8.14
-Release:       4
+# note: keep 0.9.x here for python2 support
+Version:       0.9.7
+Release:       1
 License:       MIT
 Group:         Libraries/Python
-Source0:       https://pypi.python.org/packages/source/h/httpretty/httpretty-%{version}.tar.gz
-# Source0-md5: 2a6bbf270fafc77647b0479d95d0544c
-Patch0:                test-deps.patch
-URL:           http://httpretty.readthedocs.io/
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.710
+#Source0Download: https://pypi.org/simple/httpretty/
+Source0:       https://files.pythonhosted.org/packages/source/h/httpretty/httpretty-%{version}.tar.gz
+# Source0-md5: 2fc3d0dc986200be95ce8ad3ef56bc04
+URL:           https://httpretty.readthedocs.io/
 %if %{with python2}
-BuildRequires: python-distribute
-BuildRequires: python-sure >= 1.2.24
+BuildRequires: python-modules >= 1:2.7
+BuildRequires: python-setuptools
 %if %{with tests}
+BuildRequires: python-coverage
 BuildRequires: python-httplib2
+BuildRequires: python-mock
 BuildRequires: python-nose
+BuildRequires: python-nose_randomly
+BuildRequires: python-rednose
 BuildRequires: python-requests
+BuildRequires: python-six >= 1.11.0
+BuildRequires: python-sure >= 1.2.24
 BuildRequires: python-tornado
+BuildRequires: python3-urllib3
 %endif
 %endif
 %if %{with python3}
-BuildRequires: python3-distribute
-BuildRequires: python3-modules
-BuildRequires: python3-sure >= 1.2.24
+BuildRequires: python3-modules >= 1:3.6
+BuildRequires: python3-setuptools
 %if %{with tests}
+BuildRequires: python3-coverage
 BuildRequires: python3-httplib2
 BuildRequires: python3-nose
+BuildRequires: python3-nose_randomly
+BuildRequires: python3-rednose
 BuildRequires: python3-requests
+BuildRequires: python3-six >= 1.11.0
+BuildRequires: python3-sure >= 1.2.24
 BuildRequires: python3-tornado
-# AUTO: -- ImportError: No module named 'urllib3'
 BuildRequires: python3-urllib3
 %endif
 %endif
-Requires:      python-modules
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.714
+%if %{with doc}
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: sphinx-pdg-3
+%endif
+Requires:      python-modules >= 1:2.7
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 HTTP client mock for Python.
 
+%description -l pl.UTF-8
+Atrapa klienta HTTP dla Pythona.
+
 %package -n python3-%{module}
 Summary:       HTTP client mock for Python
+Summary(pl.UTF-8):     Atrapa klienta HTTP dla Pythona
 Group:         Libraries/Python
-Requires:      python3-modules
+Requires:      python3-modules >= 1:3.6
 
 %description -n python3-%{module}
 HTTP client mock for Python.
 
+%description -n python3-%{module} -l pl.UTF-8
+Atrapa klienta HTTP dla Pythona.
+
+%package apidocs
+Summary:       API documentation for Python httpretty module
+Summary(pl.UTF-8):     Dokumentacja API modułu Pythona httpretty
+Group:         Documentation
+
+%description apidocs
+API documentation for Python httpretty module.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API modułu Pythona httpretty.
+
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 %if %{with python2}
@@ -74,10 +102,16 @@ HTTP client mock for Python.
 %py3_build %{?with_tests:test}
 %endif
 
+%if %{with doc}
+sphinx-build-3 -b html -d docs/build/doctrees docs/source docs/build/html
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %if %{with python2}
 %py_install
+
 %py_postclean
 %endif
 
@@ -91,16 +125,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc README*
-%dir %{py_sitescriptdir}/%{module}
-%{py_sitescriptdir}/%{module}/*.py[co]
-%{py_sitescriptdir}/%{module}-%{version}-py*.egg-info
+%doc COPYING README.rst
+%{py_sitescriptdir}/httpretty
+%{py_sitescriptdir}/httpretty-%{version}-py*.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc README*
-%{py3_sitescriptdir}/%{module}
-%{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info
+%doc COPYING README.rst
+%{py3_sitescriptdir}/httpretty
+%{py3_sitescriptdir}/httpretty-%{version}-py*.egg-info
 %endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc docs/build/html/{_modules,_static,*.html,*.js}

diff --git a/test-deps.patch b/test-deps.patch
deleted file mode 100644 (file)
index 8902ccd..0000000
--- a/test-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-test deps are too conrete or irrelevant (doc build deps)
-
---- httpretty-0.8.14/development.txt   2016-09-06 18:59:59.745675091 +0300
-+++ httpretty-0.8.14/development.txt   2016-09-06 19:01:36.844074805 +0300
-@@ -2,16 +2,16 @@
--flake8==2.5.1
--httplib2==0.9.2
--ipdb==0.8.1
--misaka==2.0.0
--mock==1.3.0
--nose==1.3.7
--nose-randomly==1.2.0
--rednose==0.4.3
--requests==2.8.1
--steadymark==0.7.2
--sure==1.2.24
--urllib3==1.12
--tornado==4.3
--coverage==4.0.3
--Sphinx==1.3.3
--sphinx-rtd-theme==0.1.9
-+#flake8==2.5.1
-+#httplib2==0.9.2
-+#ipdb==0.8.1
-+#misaka==2.0.0
-+#mock==1.3.0
-+#nose==1.3.7
-+#nose-randomly==1.2.0
-+#rednose==0.4.3
-+#requests==2.8.1
-+#steadymark==0.7.2
-+sure>=1.2.24
-+#urllib3==1.12
-+#tornado==4.3
-+#coverage==4.0.3
-+#Sphinx==1.3.3
-+#sphinx-rtd-theme==0.1.9