Skip to content
This repository was archived by the owner on Apr 23, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ def populate_data(self, contents):
self.methods.append('''
@property
def data(self):
return DataContainer(self._data)
return self._data
''')

self.methods.append('''
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ exclude = doc/*

[build_meta]
repotag=555be66fc307899a5a9bcd8fe91760f58c487115

6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def run(self):
"cuba.yml")

if not (os.path.exists(cuba_yml) and os.path.exists(metadata_yml)):
print (textwrap.dedent("""
print(textwrap.dedent("""
Cannot open simphony-metadata YAML files.
Please specify an appropriate path to the simphony-metadata
git repository in setup.cfg.
Expand Down Expand Up @@ -122,7 +122,7 @@ def run(self):
check_call(cmd_args + ["simphony/core/keywords.py"])
check_call(cmd_args + ["--recursive", "simphony/cuds/meta/"])
except OSError:
print (textwrap.dedent("""
print(textwrap.dedent("""
Failed to run yapf. Make sure it is installed in your
python environment, by running

Expand All @@ -143,6 +143,8 @@ def write_version_py(filename=None):
fh.write(ver % VERSION)
finally:
fh.close()


write_version_py()

# main setup configuration class
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/atom.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/atomistic.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/base_centered_monoclinic_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/base_centered_orthorhombic_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/basis.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/berendsen.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/bird_carreau_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/body_centered_cubic_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/body_centered_orthorhombic_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/body_centered_tetragonal_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/bond.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/boundary.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/box.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/bravais_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/cell.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/cfd.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/compressibility_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/computational_method.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/computational_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/condition.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/constant_electrostatic_field_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/continuum.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/coulomb.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/coulomb_friction_force.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/cross_power_law_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/cubic_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def models(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/cuds_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/cuds_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/data_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/dem.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/dirichlet.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/dissipation_force.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/edge.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/electronic.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/electrostatic_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def variables(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/empty.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def engine_feature(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/engine_feature.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def computational_method(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
2 changes: 1 addition & 1 deletion simphony/cuds/meta/face.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def definition(self):

@property
def data(self):
return DataContainer(self._data)
return self._data

@data.setter
def data(self, new_data):
Expand Down
Loading