Skip to content
Snippets Groups Projects
Commit 87554107 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'python36'

parents 00fb7ab8 4bdb8195
Branches
Tags
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 45
− 45
View file @ 87554107
...@@ -142,31 +142,6 @@ deploy_linux_27: ...@@ -142,31 +142,6 @@ deploy_linux_27:
- conda-linux - conda-linux
# Linux + Python 3.4: Builds and tests
build_linux_34:
<<: *build_job
variables: &linux_34_build_variables
PYTHON_VERSION: "3.4"
tags:
- conda-linux
test_linux_34:
<<: *test_job
variables: *linux_34_build_variables
dependencies:
- build_linux_34
tags:
- conda-linux
wheels_linux_34:
<<: *wheels_job
variables: *linux_34_build_variables
dependencies:
- build_linux_34
tags:
- conda-linux
# Linux + Python 3.5: Builds, tests and uploads wheel # Linux + Python 3.5: Builds, tests and uploads wheel
build_linux_35: build_linux_35:
<<: *build_job <<: *build_job
...@@ -200,6 +175,31 @@ docs_linux_35: ...@@ -200,6 +175,31 @@ docs_linux_35:
- conda-linux - conda-linux
# Linux + Python 3.6: Builds and tests
build_linux_36:
<<: *build_job
variables: &linux_36_build_variables
PYTHON_VERSION: "3.6"
tags:
- conda-linux
test_linux_36:
<<: *test_job
variables: *linux_36_build_variables
dependencies:
- build_linux_36
tags:
- conda-linux
wheels_linux_36:
<<: *wheels_job
variables: *linux_36_build_variables
dependencies:
- build_linux_36
tags:
- conda-linux
# Mac OSX + Python 2.7: Builds and tests # Mac OSX + Python 2.7: Builds and tests
build_macosx_27: build_macosx_27:
<<: *build_job <<: *build_job
...@@ -225,51 +225,51 @@ wheels_macosx_27: ...@@ -225,51 +225,51 @@ wheels_macosx_27:
- conda-macosx - conda-macosx
# Mac OSX + Python 3.4: Builds and tests # Mac OSX + Python 3.5: Builds and tests
build_macosx_34: build_macosx_35:
<<: *build_job <<: *build_job
variables: &macosx_34_build_variables variables: &macosx_35_build_variables
PYTHON_VERSION: "3.4" PYTHON_VERSION: "3.5"
tags: tags:
- conda-macosx - conda-macosx
test_macosx_34: test_macosx_35:
<<: *test_job <<: *test_job
variables: *macosx_34_build_variables variables: *macosx_35_build_variables
dependencies: dependencies:
- build_macosx_34 - build_macosx_35
tags: tags:
- conda-macosx - conda-macosx
wheels_macosx_34: wheels_macosx_35:
<<: *wheels_job <<: *wheels_job
variables: *macosx_34_build_variables variables: *macosx_35_build_variables
dependencies: dependencies:
- build_macosx_34 - build_macosx_35
tags: tags:
- conda-macosx - conda-macosx
# Mac OSX + Python 3.5: Builds and tests # Mac OSX + Python 3.6: Builds and tests
build_macosx_35: build_macosx_36:
<<: *build_job <<: *build_job
variables: &macosx_35_build_variables variables: &macosx_36_build_variables
PYTHON_VERSION: "3.5" PYTHON_VERSION: "3.6"
tags: tags:
- conda-macosx - conda-macosx
test_macosx_35: test_macosx_36:
<<: *test_job <<: *test_job
variables: *macosx_35_build_variables variables: *macosx_36_build_variables
dependencies: dependencies:
- build_macosx_35 - build_macosx_36
tags: tags:
- conda-macosx - conda-macosx
wheels_macosx_35: wheels_macosx_36:
<<: *wheels_job <<: *wheels_job
variables: *macosx_35_build_variables variables: *macosx_36_build_variables
dependencies: dependencies:
- build_macosx_35 - build_macosx_36
tags: tags:
- conda-macosx - conda-macosx
MANIFEST.in
+ 1
− 1
View file @ 87554107
include LICENSE README.rst bootstrap-buildout.py buildout.cfg develop.cfg requirements.txt version.txt include LICENSE README.rst buildout.cfg develop.cfg requirements.txt version.txt
recursive-include doc conf.py *.rst recursive-include doc conf.py *.rst
recursive-include bob *.cpp *.h recursive-include bob *.cpp *.h
README.rst
+ 5
− 4
View file @ 87554107
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
:target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.math/master/index.html :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.math/master/index.html
.. image:: https://gitlab.idiap.ch/bob/bob.math/badges/master/build.svg .. image:: https://gitlab.idiap.ch/bob/bob.math/badges/master/build.svg
:target: https://gitlab.idiap.ch/bob/bob.math/commits/master :target: https://gitlab.idiap.ch/bob/bob.math/commits/master
.. image:: https://gitlab.idiap.ch/bob/bob.math/badges/master/coverage.svg
:target: https://gitlab.idiap.ch/bob/bob.math/commits/master
.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
:target: https://gitlab.idiap.ch/bob/bob.math :target: https://gitlab.idiap.ch/bob/bob.math
.. image:: http://img.shields.io/pypi/v/bob.math.svg .. image:: http://img.shields.io/pypi/v/bob.math.svg
...@@ -26,11 +28,10 @@ Bob_. This package contains Bob's math functionality. ...@@ -26,11 +28,10 @@ Bob_. This package contains Bob's math functionality.
Installation Installation
------------ ------------
Follow our `installation`_ instructions. Then, using the Python interpreter Complete Bob's `installation`_ instructions. Then, to install this pacakge,
provided by the distribution, bootstrap and buildout this package:: run::
$ python bootstrap-buildout.py $ conda install bob.math
$ ./bin/buildout
Contact Contact
......
bootstrap-buildout.py deleted 100644 → 0
+ 0
− 210
View file @ 00fb7ab8
##############################################################################
#
# Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""Bootstrap a buildout-based project
Simply run this script in a directory containing a buildout.cfg.
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
"""
import os
import shutil
import sys
import tempfile
from optparse import OptionParser
__version__ = '2015-07-01'
# See zc.buildout's changelog if this version is up to date.
tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
usage = '''\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
Bootstraps a buildout-based project.
Simply run this script in a directory containing a buildout.cfg, using the
Python that you want bin/buildout to use.
Note that by using --find-links to point to local resources, you can keep
this script from going over the network.
'''
parser = OptionParser(usage=usage)
parser.add_option("--version",
action="store_true", default=False,
help=("Return bootstrap.py version."))
parser.add_option("-t", "--accept-buildout-test-releases",
dest='accept_buildout_test_releases',
action="store_true", default=False,
help=("Normally, if you do not specify a --version, the "
"bootstrap script and buildout gets the newest "
"*final* versions of zc.buildout and its recipes and "
"extensions for you. If you use this flag, "
"bootstrap and buildout will get the newest releases "
"even if they are alphas or betas."))
parser.add_option("-c", "--config-file",
help=("Specify the path to the buildout configuration "
"file to be used."))
parser.add_option("-f", "--find-links",
help=("Specify a URL to search for buildout releases"))
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
parser.add_option("--buildout-version",
help="Use a specific zc.buildout version")
parser.add_option("--setuptools-version",
help="Use a specific setuptools version")
parser.add_option("--setuptools-to-dir",
help=("Allow for re-use of existing directory of "
"setuptools versions"))
options, args = parser.parse_args()
if options.version:
print("bootstrap.py version %s" % __version__)
sys.exit(0)
######################################################################
# load/install setuptools
try:
from urllib.request import urlopen
except ImportError:
from urllib2 import urlopen
ez = {}
if os.path.exists('ez_setup.py'):
exec(open('ez_setup.py').read(), ez)
else:
exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
if not options.allow_site_packages:
# ez_setup imports site, which adds site packages
# this will remove them from the path to ensure that incompatible versions
# of setuptools are not in the path
import site
# inside a virtualenv, there is no 'getsitepackages'.
# We can't remove these reliably
if hasattr(site, 'getsitepackages'):
for sitepackage_path in site.getsitepackages():
# Strip all site-packages directories from sys.path that
# are not sys.prefix; this is because on Windows
# sys.prefix is a site-package directory.
if sitepackage_path != sys.prefix:
sys.path[:] = [x for x in sys.path
if sitepackage_path not in x]
setup_args = dict(to_dir=tmpeggs, download_delay=0)
if options.setuptools_version is not None:
setup_args['version'] = options.setuptools_version
if options.setuptools_to_dir is not None:
setup_args['to_dir'] = options.setuptools_to_dir
ez['use_setuptools'](**setup_args)
import setuptools
import pkg_resources
# This does not (always?) update the default working set. We will
# do it.
for path in sys.path:
if path not in pkg_resources.working_set.entries:
pkg_resources.working_set.add_entry(path)
######################################################################
# Install buildout
ws = pkg_resources.working_set
setuptools_path = ws.find(
pkg_resources.Requirement.parse('setuptools')).location
# Fix sys.path here as easy_install.pth added before PYTHONPATH
cmd = [sys.executable, '-c',
'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
'from setuptools.command.easy_install import main; main()',
'-mZqNxd', tmpeggs]
find_links = os.environ.get(
'bootstrap-testing-find-links',
options.find_links or
('http://downloads.buildout.org/'
if options.accept_buildout_test_releases else None)
)
if find_links:
cmd.extend(['-f', find_links])
requirement = 'zc.buildout'
version = options.buildout_version
if version is None and not options.accept_buildout_test_releases:
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
_final_parts = '*final-', '*final'
def _final_version(parsed_version):
try:
return not parsed_version.is_prerelease
except AttributeError:
# Older setuptools
for part in parsed_version:
if (part[:1] == '*') and (part not in _final_parts):
return False
return True
index = setuptools.package_index.PackageIndex(
search_path=[setuptools_path])
if find_links:
index.add_find_links((find_links,))
req = pkg_resources.Requirement.parse(requirement)
if index.obtain(req) is not None:
best = []
bestv = None
for dist in index[req.project_name]:
distv = dist.parsed_version
if _final_version(distv):
if bestv is None or distv > bestv:
best = [dist]
bestv = distv
elif distv == bestv:
best.append(dist)
if best:
best.sort()
version = best[-1].version
if version:
requirement = '=='.join((requirement, version))
cmd.append(requirement)
import subprocess
if subprocess.call(cmd) != 0:
raise Exception(
"Failed to execute command:\n%s" % repr(cmd)[1:-1])
######################################################################
# Import and run buildout
ws.add_entry(tmpeggs)
ws.require(requirement)
import zc.buildout.buildout
if not [a for a in args if '=' not in a]:
args.append('bootstrap')
# if -c was provided, we push it back into args for buildout' main function
if options.config_file is not None:
args[0:0] = ['-c', options.config_file]
zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
doc/conf.py
+ 0
− 1
View file @ 87554107
...@@ -231,7 +231,6 @@ autodoc_member_order = 'bysource' ...@@ -231,7 +231,6 @@ autodoc_member_order = 'bysource'
autodoc_default_flags = [ autodoc_default_flags = [
'members', 'members',
'undoc-members', 'undoc-members',
'inherited-members',
'show-inheritance', 'show-inheritance',
] ]
......
doc/py_api.rst
+ 3
− 2
View file @ 87554107
...@@ -22,8 +22,8 @@ Summary ...@@ -22,8 +22,8 @@ Summary
bob.math.kullback_leibler bob.math.kullback_leibler
bob.math.linsolve bob.math.linsolve
bob.math.linsolve_cg_sympos bob.math.linsolve_cg_sympos
bob.math.linsolve_sympos bob.math.linsolve_sympos
bob.math.norminv bob.math.norminv
bob.math.pavx bob.math.pavx
bob.math.pavxWidth bob.math.pavxWidth
bob.math.pavxWidthHeight bob.math.pavxWidthHeight
...@@ -35,3 +35,4 @@ Details ...@@ -35,3 +35,4 @@ Details
.. automodule:: bob.math .. automodule:: bob.math
:members: :members:
:inherited-members:
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment