diff --git a/.gitignore b/.gitignore index 2cb279d..5246f07 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /django-filter-0.6.tar.gz /django-filter-0.7.tar.gz /django-filter-0.10.0.tar.gz +/django-filter-1.0.1.tar.gz diff --git a/0001-Fully-exclude-tests-modules-in-setup.py.patch b/0001-Fully-exclude-tests-modules-in-setup.py.patch new file mode 100644 index 0000000..15c335d --- /dev/null +++ b/0001-Fully-exclude-tests-modules-in-setup.py.patch @@ -0,0 +1,29 @@ +From 756c40e27c3de74fdab603ade4b580ec81968fd0 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 12 Jan 2017 20:05:24 -0800 +Subject: [PATCH] Fully exclude tests modules in setup.py + +Just excluding 'tests' doesn't seem to be enough: it results in +tests/rest_framework being installed systemwide when you run +`python setup.py install`. Excluding 'tests*' seems to do the +trick. +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 80a64a2..82f6af3 100644 +--- a/setup.py ++++ b/setup.py +@@ -33,7 +33,7 @@ setup( + maintainer='Carlton Gibson', + maintainer_email='carlton.gibson@noumenal.es', + url='http://github.com/carltongibson/django-filter/tree/master', +- packages=find_packages(exclude=['tests']), ++ packages=find_packages(exclude=['tests*']), + include_package_data=True, + license='BSD', + classifiers=[ +-- +2.11.0 + diff --git a/python-django-filter.spec b/python-django-filter.spec index 80befa3..bde021c 100644 --- a/python-django-filter.spec +++ b/python-django-filter.spec @@ -3,29 +3,33 @@ %global with_python3 1 Name: python-%{pypi_name} -Version: 0.10.0 -Release: 5%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: A Django application for allowing users to filter queryset dynamically Group: Development/Languages License: BSD -URL: http://github.com/alex/django-filter -Source0: http://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +URL: https://github.com/carltongibson/django-filter +Source0: https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +# https://github.com/carltongibson/django-filter/pull/602 +# Fully exclude tests modules in setup.py +Patch0: 0001-Fully-exclude-tests-modules-in-setup.py.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-django -BuildRequires: python-django-discover-runner BuildRequires: python-mock BuildRequires: python-setuptools +BuildRequires: python-django-rest-framework Requires: python-django +Requires: python-django-rest-framework %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-django -BuildRequires: python3-django-discover-runner BuildRequires: python3-mock BuildRequires: python3-setuptools +BuildRequires: python3-django-rest-framework %endif Provides: django-filter = %{version}-%{release} @@ -35,19 +39,19 @@ Obsoletes: django-filter < %{obs_ver} %package -n python3-django-filter Summary: A Django application for allowing users to filter queryset dynamically Requires: python3-django +Requires: python3-django-rest-framework %description -n python3-django-filter -Django-filter provides a simple way to filter down a queryset based on -parameters a user provides. -This is a Python 3 build of django-filter. +Django-filter is a reusable Django application for allowing users to filter +querysets dynamically. This is a Python 3 build of django-filter. %endif %description -Django-filter provides a simple way to filter down a queryset based on -parameters a user provides. +Django-filter is a reusable Django application for allowing users to filter +querysets dynamically. %prep -%setup -q -n %{pypi_name}-%{version} +%autosetup -n %{pypi_name}-%{version} -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -94,7 +98,11 @@ popd %endif %changelog -* Mon Dec 19 2016 Miro Hrončok - 0.10.0-5 +* Thu Jan 12 2017 Adam Williamson - 1.0.1-1 +- Update to latest release (Django 1.10-compatible) +- Update dependencies + +* Mon Dec 19 2016 Miro Hrončok - Rebuild for Python 3.6 * Tue Jul 19 2016 Fedora Release Engineering - 0.10.0-4 diff --git a/sources b/sources index 97ff207..37e1ba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e29998b15eff06a6366aa8cc76c1c2a django-filter-0.10.0.tar.gz +SHA512 (django-filter-1.0.1.tar.gz) = 545b6e7f13801ddd2f21890098558765f259ffc04cbded9ee484b1ae9c1e46cf8908581fbb05bd37bee604125cc379676c6779891c42452ac4c6db2dcd015f1b