From 751b7e9f06be7e78983ea7939da15c98b420f188 Mon Sep 17 00:00:00 2001 From: Mehdi Sadeghi Date: Tue, 26 Sep 2017 18:13:02 +0200 Subject: [PATCH 1/4] Merge deps into one file --- dev_requirements.txt | 6 ------ doc_requirements.txt | 6 ------ latest_requirements.txt | 1 - requirements.txt | 13 +++++++++++++ stable_requirements.txt | 1 - 5 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 dev_requirements.txt delete mode 100644 doc_requirements.txt delete mode 100644 latest_requirements.txt create mode 100644 requirements.txt delete mode 100644 stable_requirements.txt diff --git a/dev_requirements.txt b/dev_requirements.txt deleted file mode 100644 index a9c2a96..0000000 --- a/dev_requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -enum34 >= 1.0.4 -pyyaml >= 3.11 -coverage -flake8 -numpy >= 1.4.1 -click \ No newline at end of file diff --git a/doc_requirements.txt b/doc_requirements.txt deleted file mode 100644 index 5fa8178..0000000 --- a/doc_requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -sphinx >= 1.2.3 -sphinxcontrib-napoleon >= 0.2.10 -git+https://github.com/simphony/simphony-common.git@0.2.0#egg=simphony -enum34 >= 1.0.4 -stevedore >= 1.2.0 -mock diff --git a/latest_requirements.txt b/latest_requirements.txt deleted file mode 100644 index 2373f0e..0000000 --- a/latest_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --e git+https://github.com/simphony/simphony-common.git@master#egg=simphony diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6fb5fb6 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,13 @@ +git+https://github.com/simphony/simphony-common.git +enum34 +coverage +flake8 +numpy +click +sphinx +sphinxcontrib-napoleon +stevedore +mock +#pyyaml >= 3.11 +#sphinxcontrib-napoleon >= 0.2.10 +mock diff --git a/stable_requirements.txt b/stable_requirements.txt deleted file mode 100644 index bf900fb..0000000 --- a/stable_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --e git+https://github.com/simphony/simphony-common.git@0.1.5#egg=simphony From 7caa5a4ff97a42e408485b07aa9e947c6796c342 Mon Sep 17 00:00:00 2001 From: Mehdi Sadeghi Date: Tue, 26 Sep 2017 18:24:02 +0200 Subject: [PATCH 2/4] Update copyright header --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index b4520f6..6673fee 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014, simphony +Copyright (c) 2014-2017 SimPhoNy All rights reserved. Redistribution and use in source and binary forms, with or without From 060c646bf3068e3839fcd7ca7e51a41451bfcd2f Mon Sep 17 00:00:00 2001 From: Mehdi Sadeghi Date: Tue, 26 Sep 2017 18:27:41 +0200 Subject: [PATCH 3/4] remove garbage --- requirements.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6fb5fb6..81bc5da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,9 @@ git+https://github.com/simphony/simphony-common.git -enum34 -coverage -flake8 numpy -click +enum34 +stevedore sphinx sphinxcontrib-napoleon -stevedore -mock -#pyyaml >= 3.11 -#sphinxcontrib-napoleon >= 0.2.10 +pytest +coverage mock From b45e943cba5ce48e7bc40945633906f2de11a4ab Mon Sep 17 00:00:00 2001 From: Mehdi Sadeghi Date: Tue, 26 Sep 2017 18:27:55 +0200 Subject: [PATCH 4/4] Simplify imports --- examples/simple_nve/simple_nve.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/simple_nve/simple_nve.py b/examples/simple_nve/simple_nve.py index 9b3c702..50b3e8b 100644 --- a/examples/simple_nve/simple_nve.py +++ b/examples/simple_nve/simple_nve.py @@ -2,13 +2,10 @@ from __future__ import print_function import numpy -import simphony.engine # noqa -from simphony.api import CUDS, Simulation -from simphony.core.cuba import CUBA +from simphony import CUBA, CUDS, Simulation from simphony.cuds.meta import api from simphony.cuds.particles import Particle, Particles - from simphony.engine import EngineInterface # ########################################################