mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 16:57:29 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
setup.py | 13 +++++++------
|
|
tables/req_versions.py | 2 +-
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 0f2f3f7..52cda49 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -25,6 +25,7 @@ from distutils.core import Extension
|
|
from distutils.dep_util import newer
|
|
from distutils.util import convert_path
|
|
from distutils.ccompiler import new_compiler
|
|
+from distutils.version import LooseVersion
|
|
|
|
cmdclass = {}
|
|
setuptools_kwargs = {}
|
|
@@ -106,7 +107,7 @@ def check_import(pkgname, pkgver):
|
|
"You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
|
|
% {'pkgname': pkgname, 'pkgver': pkgver})
|
|
else:
|
|
- if mod.__version__ < pkgver:
|
|
+ if mod.__version__ < LooseVersion(pkgver):
|
|
exit_with_error(
|
|
"You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
|
|
% {'pkgname': pkgname, 'pkgver': pkgver})
|
|
@@ -122,21 +123,21 @@ if not has_setuptools:
|
|
|
|
# Check if Cython is installed or not (requisite)
|
|
try:
|
|
+ from Cython import __version__ as cython_version
|
|
from Cython.Distutils import build_ext
|
|
- from Cython.Compiler.Main import Version
|
|
cmdclass['build_ext'] = build_ext
|
|
except ImportError:
|
|
exit_with_error(
|
|
"You need %(pkgname)s %(pkgver)s or greater to compile PyTables!"
|
|
% {'pkgname': 'Cython', 'pkgver': min_cython_version})
|
|
|
|
-if Version.version < min_cython_version:
|
|
+if LooseVersion(cython_version) < min_cython_version:
|
|
exit_with_error(
|
|
- "At least Cython %s is needed so as to generate extensions!"
|
|
- % (min_cython_version))
|
|
+ "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
|
|
+ % {'pkgname': 'Cython', 'pkgver': min_cython_version})
|
|
else:
|
|
print("* Found %(pkgname)s %(pkgver)s package installed."
|
|
- % {'pkgname': 'Cython', 'pkgver': Version.version})
|
|
+ % {'pkgname': 'Cython', 'pkgver': cython_version})
|
|
|
|
VERSION = open('VERSION').read().strip()
|
|
|
|
diff --git a/tables/req_versions.py b/tables/req_versions.py
|
|
index 2c9ca01..bd498c3 100644
|
|
--- a/tables/req_versions.py
|
|
+++ b/tables/req_versions.py
|
|
@@ -17,7 +17,7 @@
|
|
# Minimum recommended versions for mandatory packages
|
|
min_numpy_version = '1.4.1'
|
|
min_numexpr_version = '2.0.0'
|
|
-min_cython_version = '0.13'
|
|
+min_cython_version = '0.14'
|
|
|
|
# The THG team has decided to fix an API inconsistency in the definition
|
|
# of the H5Z_class_t structure in version 1.8.3
|