Skip to content
Snippets Groups Projects
Commit 8c4c8091 authored by pascal.mouquet_ird.fr's avatar pascal.mouquet_ird.fr
Browse files

bugfix get_(corrent)_sen2cor_version in xmlparser

parent 52e515bd
No related branches found
No related tags found
No related merge requests found
......@@ -217,85 +217,56 @@ class Sen2ChainMetadataParser:
def init_metadata(self):
self._root.find("SEN2CHAIN_VERSION").text = sen2chain.__version__
# <<<<<<< HEAD
# self._root.find("SEN2CHAIN_PROCESSING_VERSION").text = Config().get("sen2chain_processing_version")
# self._root.find("SEN2COR_VERSION").text = get_Sen2Cor_version()
# self._tree.write(str(self.xml_path), encoding="UTF-8", xml_declaration=True)
# def set_metadata(self,
# sen2chain_version: str = None,
# sen2chain_processing_version: str = None,
# sen2cor_version: str = None,
# ):
# self._root.find("SEN2CHAIN_VERSION").text = sen2chain_version or sen2chain.__version__
# self._root.find("SEN2CHAIN_PROCESSING_VERSION").text = sen2chain_processing_version or Config().get("sen2chain_processing_version")
# self._root.find("SEN2COR_VERSION").text = sen2cor_version or get_Sen2Cor_version()
# self._tree.write(str(self.xml_path), encoding="UTF-8", xml_declaration=True)
# =======
self._root.find("SEN2CHAIN_PROCESSING_VERSION").text = Config().get(
"sen2chain_processing_version"
)
self._root.find("SEN2COR_VERSION").text = get_current_Sen2Cor_version()
self._root.find("SEN2CHAIN_PROCESSING_VERSION").text = Config().get("sen2chain_processing_version")
self._root.find("SEN2COR_VERSION").text = get_Sen2Cor_version()
self._tree.write(
str(self.xml_path), encoding="UTF-8", xml_declaration=True
str(self.xml_path),
encoding="UTF-8",
xml_declaration=True
)
def set_metadata(
self,
sen2chain_version: str = None,
sen2chain_version: str = None,
sen2chain_processing_version: str = None,
sen2cor_version: str = None,
):
self._root.find("SEN2CHAIN_VERSION").text = (
sen2chain_version or sen2chain.__version__
)
self._root.find(
"SEN2CHAIN_PROCESSING_VERSION"
).text = sen2chain_processing_version or Config().get(
"sen2chain_processing_version"
)
self._root.find("SEN2COR_VERSION").text = (
sen2cor_version or get_current_Sen2Cor_version()
)
self._root.find("SEN2CHAIN_VERSION").text = sen2chain_version or sen2chain.__version__
self._root.find("SEN2CHAIN_PROCESSING_VERSION").text = sen2chain_processing_version or Config().get("sen2chain_processing_version")
self._root.find("SEN2COR_VERSION").text = sen2cor_version or get_Sen2Cor_version()
self._tree.write(
str(self.xml_path), encoding="UTF-8", xml_declaration=True
str(self.xml_path),
encoding="UTF-8",
xml_declaration=True
)
# >>>>>>> 571a1f934055bd9bc242e2f3dde14e38a7f4b5ca
# =======
# self._root.find("SEN2CHAIN_PROCESSING_VERSION").text = Config().get(
# "sen2chain_processing_version"
# )
# self._root.find("SEN2COR_VERSION").text = get_current_Sen2Cor_version()
# self._tree.write(
# str(self.xml_path), encoding="UTF-8", xml_declaration=True
# )
# def set_metadata(
# self,
# sen2chain_version: str = None,
# sen2chain_processing_version: str = None,
# sen2cor_version: str = None,
# ):
# self._root.find("SEN2CHAIN_VERSION").text = (
# sen2chain_version or sen2chain.__version__
# )
# self._root.find(
# "SEN2CHAIN_PROCESSING_VERSION"
# ).text = sen2chain_processing_version or Config().get(
# "sen2chain_processing_version"
# )
# self._root.find("SEN2COR_VERSION").text = (
# sen2cor_version or get_current_Sen2Cor_version()
# )
# self._tree.write(
# str(self.xml_path), encoding="UTF-8", xml_declaration=True
# )
# >>>>>>> 571a1f934055bd9bc242e2f3dde14e38a7f4b5ca
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment