Skip to content

Commit

Permalink
Try vaguely normal build.
Browse files Browse the repository at this point in the history
  • Loading branch information
T-Nicholls committed Apr 18, 2019
1 parent f224cee commit 03b8bf6
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 37 deletions.
2 changes: 0 additions & 2 deletions docs/conda_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ dependencies:
- python=3.6
- numpy>=1.10
- scipy>=0.16
- sphinx
- pip:
- -i https://test.pypi.org/simple/ at-python
- git+https://github.com/dls-controls/pytac.git
- cothread
- sphinx-rtd-theme
28 changes: 0 additions & 28 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

import os
import sys
import types
from mock import MagicMock

# -- Path setup --------------------------------------------------------------

Expand All @@ -18,32 +16,6 @@
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

# -- Mock modules ------------------------------------------------------------

# If we cannot import pytac prooperly or at then partially or fully mock them. # This is a temporary fix because the latest versions are not yet on pypi.
class DataSource(object):
pass

import pytac
try:
pytac.data_source
except AttributeError:
print("Partially mocking pytac")
pytac.exceptions.FieldException = Exception
pytac.exceptions.HandleException = Exception
pytac.__dict__['data_source'] = types.ModuleType('data_source')
pytac.data_source.DataSource = DataSource

class Mock(MagicMock):
@classmethod
def __getattr__(cls, name):
return MagicMock()
try:
import at
except ImportError:
print("Fully mocking at")
sys.modules.update({'at': Mock()})

# -- Project information -----------------------------------------------------

project = u'ATIP'
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ ATIP is intended to integrate a simulator, using the python implementation of
`Pytac <https://github.com/dls-controls/pytac>`_ so that it can be addressed
in the same manner as the live machine.

It is hosted on GitHub `here. <https://github.com/T-Nicholls/atip>`_

Contents:
=========

Expand Down
6 changes: 0 additions & 6 deletions docs/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

zip_safe=False,

install_requires=['pytac'],
install_requires=['pytac', 'at-python'],

python_requires='>=2.7.4',
)

0 comments on commit 03b8bf6

Please sign in to comment.