Skip to content

Commit

Permalink
Merge pull request #35 from ragavvenkatesan/master
Browse files Browse the repository at this point in the history
Updaing conf to not import any modules.
  • Loading branch information
Ragav Venkatesan committed Feb 27, 2017
2 parents 0d2d208 + f87734d commit 3b1c9cb
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
12 changes: 8 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env python2.7
# -*- coding: utf-8 -*-
#
# yann documentation build configuration file, created by
Expand Down Expand Up @@ -29,8 +30,11 @@
except ImportError:
from mock import Mock

import theano
# import theano.sandbox.cuda
# Don't build or import any modules.
MOCK_MODULES = ['numpy', 'scipy', 'networkx', 'theano', 'progressbar', 'skdata', 'pillow',
'matplotlib']
for mod_name in MOCK_MODULES:
sys.modules[mod_name] = mock.Mock()

theano.config = Mock(device='gpu')
# theano.sandbox.cuda.cuda_enabled = True
Expand Down Expand Up @@ -70,7 +74,7 @@

# General substitutions.
project = u'Yann'
copyright = u'2015-2016, Ragav Venkatesan'
copyright = u'2015-2017, Ragav Venkatesan'
author = u'Ragav Venkatesan'
license = u'MIT License'

Expand All @@ -85,7 +89,7 @@
# The full version, including alpha/beta/rc tags.
release = yann.__version__

copyright = u'2015–2016, Ragav Venkatesan'
copyright = u'2015–2017, Ragav Venkatesan'


# There are two options for replacing |today|: either, you set today to some
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ scipy>=0.18
progressbar>=2
skdata>=0.0.4
pillow>=4.0
matplotlib
matplotlib
networkx
3 changes: 1 addition & 2 deletions requirements_full.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ pyparsing
pydot-ng
pydotplus
pygraphviz
graphviz
networkx
graphviz
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
],
keywords='convolutional neural networks deep learning',
packages=find_packages(exclude=['docs', 'tests', 'pantry']),
install_requires=['theano','numpy','scipy','skdata','progressbar','pillow','matplotlib'],
install_requires=['theano','numpy','scipy','skdata','progressbar','pillow','matplotlib',
'networkx'],
extras_require={
'dev': ['progressbar', 'skdata', 'scipy', 'sphinx', 'sphinx_rtd_theme', 'pydot',
'pydot-ng','graphviz','networkx'],
'dev': ['sphinx', 'sphinx_rtd_theme', 'pydot',
'pydot-ng','graphviz'],
'test': ['mock','pytest-cov','pytest-pep8','pytest'],
},
# data_files=['_datasets/'],
Expand Down

0 comments on commit 3b1c9cb

Please sign in to comment.