opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_22.01' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2022-03-28 19:05:48 +01:00
parent 9aaaa0d9a4 cee063511d
commit b25334ccae
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config/sample/datatypes_conf.xml.sample
+2 -1
View File
@@ -307,7 +307,8 @@
<datatype extension="uniprotxml" type="galaxy.datatypes.proteomics:UniProtXML" mimetype="application/xml" display_in_upload="true"/>
<datatype extension="xquest.xml" type="galaxy.datatypes.proteomics:XquestXML" mimetype="application/xml" display_in_upload="true"/>
<datatype extension="spec.xml" type="galaxy.datatypes.proteomics:XquestSpecXML" mimetype="application/xml" display_in_upload="true"/>
<datatype extension="qcml" type="galaxy.datatypes.proteomics:QCML" mimetype="application/xml" display_in_upload="true" description="Quality control data in XML format (https://code.google.com/p/qcml/)."/>
<datatype extension="qcml" type="galaxy.datatypes.proteomics:QCML" mimetype="application/xml" display_in_upload="true" description="Mass spectrometry quality control data in XML format (https://code.google.com/p/qcml/)."/>
<datatype extension="mzqc" type="galaxy.datatypes.text:Json" subclass="true" display_in_upload="true" description="Mass spectrometry quality control data in JSON format (https://github.com/HUPO-PSI/mzQC)."/>
<datatype extension="msp" type="galaxy.datatypes.proteomics:Msp" display_in_upload="true"/>
<datatype extension="splib_noindex" type="galaxy.datatypes.proteomics:SPLibNoIndex" display_in_upload="true"/>
<datatype extension="splib" type="galaxy.datatypes.proteomics:SPLib" display_in_upload="true"/>
lib/galaxy/model/store/__init__.py
+1 -2
View File
@@ -272,8 +272,7 @@ class ModelImportStore(metaclass=abc.ABCMeta):
if attribute in dataset_attrs["dataset"]:
setattr(dataset_instance.dataset, attribute, dataset_attrs["dataset"][attribute])
self._attach_dataset_hashes(dataset_attrs["dataset"], dataset_instance)
# TODO: Once we have a test...
# self._attach_dataset_sources(dataset_attrs["dataset"], dataset_instance)
self._attach_dataset_sources(dataset_attrs["dataset"], dataset_instance)
if "id" in dataset_attrs["dataset"] and self.import_options.allow_edit:
dataset_instance.dataset.id = dataset_attrs["dataset"]["id"]
if job:
test/integration_selenium/test_dataset_details_source_transforms.py
+7
View File
@@ -80,3 +80,10 @@ class DatasetSourceTransformSeleniumIntegrationTestCase(PosixFileSourceSetup, Se
def setUp(self):
super().setUp()
self._write_file_fixtures()
class DatasetSourceTransformInModelStoreSeleniumIntegrationTestCase(DatasetSourceTransformSeleniumIntegrationTestCase):
@classmethod
def handle_galaxy_config_kwds(cls, config):
super().handle_galaxy_config_kwds(config)
config["metadata_strategy"] = "extended"