Conflicts in electrodes.py

[kmu]

emmet/emmet/materials/electrodes.py

Lines 182 to 186 in f17eccf

	<<<<<<< HEAD
	docs = [] # results
	=======
	docs = [] # results
	>>>>>>> master

emmet/emmet/materials/electrodes.py

Lines 215 to 229 in f17eccf

	<<<<<<< HEAD
	group_sbx = list(
	filter(
	lambda ent: (isbx in ent.data["_sbxn"])
	or (ent.data["_sbxn"] == ["core"]),
	group,
	)
	)
	self.logger.debug(
	f"Grouped entries in sandbox {', '.join([en.name for en in group_sbx])}"
	)
	=======
	group_sbx = list(filter(lambda ent : (isbx in ent.data['_sbxn']) or (ent.data['_sbxn']==['core']), group))
	self.logger.debug(f"Grouped entries in sandbox {isbx} -- {', '.join([en.name for en in group_sbx])}")
	>>>>>>> master

emmet/emmet/materials/electrodes.py

Lines 254 to 266 in f17eccf

	<<<<<<< HEAD
	d["battid"] = lowest_id + "_" + self.working_ion
	# Only allow one sandbox value for each electrode
	if isbx != "core":
	d["_sbxn"] = isbx
	=======
	if isbx == 'core':
	d['battid'] = lowest_id+'_'+self.working_ion
	else:
	d['battid'] = lowest_id+'_'+self.working_ion+'_'+isbx
	# Only allow one sandbox value for each electrode
	d['_sbxn'] = [isbx]
	>>>>>>> master

emmet/emmet/materials/electrodes.py

Lines 276 to 280 in f17eccf

	<<<<<<< HEAD
	self.electro.update(docs=items, key="battid")
	=======
	self.electro.update(docs=items, key=['battid'])
	>>>>>>> master

emmet/emmet/materials/electrodes.py

Lines 362 to 382 in f17eccf

	<<<<<<< HEAD
	struct = Structure.from_dict(d["structure"])
	en = ComputedStructureEntry(
	structure=struct,
	energy=d["thermo"]["energy"],
	parameters=d["calc_settings"],
	entry_id=d["task_id"],
	)
	if "_sbxn" in d:
	en.data["_sbxn"] = d["_sbxn"]
	else:
	en.data["_sbxn"] = ["core"]
	=======
	struct = Structure.from_dict(d['structure'])
	en = ComputedStructureEntry(structure=struct,
	energy=d['thermo']['energy'],
	parameters=d['calc_settings'],
	entry_id=d['task_id'],
	)
	en.data['_sbxn'] = d['_sbxn']
	>>>>>>> master

[shyamd]

Thanks! Fixed in d6e7f03