Update to 2.5.1
Avoid unpackaged dependencies: functools32, vcversioner.
This commit is contained in:
parent
a8b41ca9ae
commit
50816cf022
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/jsonschema-2.0.0.tar.gz
|
||||
/jsonschema-2.3.0.tar.gz
|
||||
/jsonschema-2.4.0.tar.gz
|
||||
/jsonschema-2.5.1.tar.gz
|
||||
|
||||
54
avoid-unpackaged.patch
Normal file
54
avoid-unpackaged.patch
Normal file
@ -0,0 +1,54 @@
|
||||
diff -ru jsonschema-2.5.1.orig/jsonschema/compat.py jsonschema-2.5.1/jsonschema/compat.py
|
||||
--- jsonschema-2.5.1.orig/jsonschema/compat.py 2015-04-13 17:23:46.000000000 +0200
|
||||
+++ jsonschema-2.5.1/jsonschema/compat.py 2016-02-27 16:33:40.938583562 +0100
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
PY3 = sys.version_info[0] >= 3
|
||||
PY26 = sys.version_info[:2] == (2, 6)
|
||||
+PY27 = sys.version_info[:2] == (2, 7)
|
||||
|
||||
if PY3:
|
||||
zip = zip
|
||||
@@ -33,7 +34,7 @@
|
||||
int_types = int, long
|
||||
iteritems = operator.methodcaller("iteritems")
|
||||
|
||||
- if PY26:
|
||||
+ if PY26 or PY27:
|
||||
from repoze.lru import lru_cache
|
||||
else:
|
||||
from functools32 import lru_cache
|
||||
diff -ru jsonschema-2.5.1.orig/setup.py jsonschema-2.5.1/setup.py
|
||||
--- jsonschema-2.5.1.orig/setup.py 2015-06-08 18:04:36.000000000 +0200
|
||||
+++ jsonschema-2.5.1/setup.py 2016-02-27 16:34:40.462446660 +0100
|
||||
@@ -1,6 +1,7 @@
|
||||
import os
|
||||
|
||||
from setuptools import setup
|
||||
+from jsonschema import _version
|
||||
|
||||
|
||||
with open(os.path.join(os.path.dirname(__file__), "README.rst")) as readme:
|
||||
@@ -24,14 +25,14 @@
|
||||
extras_require = {
|
||||
"format" : ["rfc3987", "strict-rfc3339", "webcolors"],
|
||||
":python_version=='2.6'": ["argparse", "repoze.lru"],
|
||||
- ":python_version=='2.7'": ["functools32"],
|
||||
+ ":python_version=='2.7'": ["repoze.lru"],
|
||||
}
|
||||
|
||||
setup(
|
||||
name="jsonschema",
|
||||
+ version=_version.__version__,
|
||||
packages=["jsonschema", "jsonschema.tests"],
|
||||
package_data={"jsonschema": ["schemas/*.json"]},
|
||||
- setup_requires=["vcversioner"],
|
||||
extras_require=extras_require,
|
||||
author="Julian Berman",
|
||||
author_email="Julian@GrayVines.com",
|
||||
@@ -41,5 +42,4 @@
|
||||
long_description=long_description,
|
||||
url="http://github.com/Julian/jsonschema",
|
||||
entry_points={"console_scripts": ["jsonschema = jsonschema.cli:main"]},
|
||||
- vcversioner={"version_module_paths" : ["jsonschema/_version.py"]},
|
||||
)
|
||||
@ -8,8 +8,8 @@
|
||||
%endif
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 2.4.0
|
||||
Release: 4%{?dist}
|
||||
Version: 2.5.1
|
||||
Release: 1%{?dist}
|
||||
Summary: An implementation of JSON Schema validation for Python
|
||||
|
||||
License: MIT
|
||||
@ -24,12 +24,22 @@ BuildRequires: python-argparse
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-nose
|
||||
BuildRequires: python-mock
|
||||
# Avoid unpackaged deps:
|
||||
#BuildRequires: python-vcversioner
|
||||
#BuildRequires: python-functools32
|
||||
# Alternative for functools32.lru_cache
|
||||
BuildRequires: python-repoze-lru
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-nose
|
||||
BuildRequires: python3-mock
|
||||
%endif
|
||||
|
||||
#Requires: python-functools32
|
||||
Requires: python-repoze-lru
|
||||
|
||||
# avoid functools32, vcversioner
|
||||
Patch0: avoid-unpackaged.patch
|
||||
|
||||
%description
|
||||
jsonschema is JSON Schema validator currently based on
|
||||
@ -45,6 +55,7 @@ http://tools.ietf.org/html/draft-zyp-json-schema-03
|
||||
|
||||
%prep
|
||||
%setup -q -n %{pypi_name}-%{version}
|
||||
%patch0 -p1
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
@ -91,9 +102,13 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 26 2016 Lon Hohberger <lhh@redhat.com> 2.5.1-1
|
||||
- Update to 2.5.1
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
||||
* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 2.4.0-3
|
||||
- Rebuilt for Python3.5 rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user