Skip to content
This repository has been archived by the owner on Apr 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #2 from simphony/common-update
Browse files Browse the repository at this point in the history
Updated simphony-common to recent commit id
  • Loading branch information
stefanoborini committed Nov 29, 2016
2 parents 84833dd + 53034a0 commit d6c62ea
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -9,9 +9,12 @@ cache:

env:
- SIMPHONY_VERSION=master
- SIMPHONY_VERSION=0.3.0
- SIMPHONY_VERSION=413eb6f5683c4733b943c300c3192265c79ac26b
matrix:
allow_failures:
- env: SIMPHONY_VERSION=master
- env: SIMPHONY_VERSION=0.3.0

before_install:
- sudo apt-get update -qq
Expand Down
2 changes: 1 addition & 1 deletion bench/wrapper_bench.py
Expand Up @@ -65,8 +65,8 @@ def describe(name, number_particles, number_steps, is_internal):
def run_test(func, wrapper):
func(wrapper)

if __name__ == '__main__':

if __name__ == '__main__':
run_wrapper_tests = [_Tests(method=run,
name="run"),
_Tests(method=run_iterate,
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Expand Up @@ -33,8 +33,8 @@ def __getattr__(cls, name):
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
print 'mocking modules {}'.format(MOCK_MODULES)

# -- General configuration ------------------------------------------------

# -- General configuration ------------------------------------------------
# check and mock missing modules
mock_modules()

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -33,6 +33,6 @@ def write_version_py(filename=None):
entry_points={
'simphony.engine': ['liggghts = simliggghts']},
packages=find_packages(),
install_requires=["simphony >= 0.2.0",
install_requires=["simphony >= 0.3.0",
"pyyaml >= 3.11"]
)
1 change: 1 addition & 0 deletions simliggghts/common/atom_style.py
Expand Up @@ -7,6 +7,7 @@ class AtomStyle(Enum):
"""
GRANULAR = 1


# mapping from liggghts style to AtomStyle
LIGGGHTS_STYLE = {'granular': AtomStyle.GRANULAR}

Expand Down
1 change: 1 addition & 0 deletions simliggghts/common/atom_style_description.py
Expand Up @@ -64,6 +64,7 @@ def __init__(self,
self.convert_to_cuba = convert_to_cuba
self.convert_from_cuba = convert_from_cuba


# description of each atom-style
ATOM_STYLE_DESCRIPTIONS = {
AtomStyle.GRANULAR:
Expand Down
1 change: 1 addition & 0 deletions simliggghts/io/tests/test_liggghts_simple_data_handler.py
Expand Up @@ -49,6 +49,7 @@ def _write_example_file(filename, contents):
with open(filename, "w") as text_file:
text_file.write(contents)


_data_file_contents = """LIGGGHTS data file via write_data, version 28 Jun 2014, timestep = 0
4 atoms
Expand Down

0 comments on commit d6c62ea

Please sign in to comment.