diff --git a/emgapi/views_relations.py b/emgapi/views_relations.py index 34cc5f9ba..1c6215ec7 100644 --- a/emgapi/views_relations.py +++ b/emgapi/views_relations.py @@ -340,7 +340,7 @@ def get_queryset(self): queryset = emg_models.AnalysisJob.objects \ .available(self.request) \ .filter(*emg_utils.related_study_accession_query( - self.kwargs['accession'])) + self.kwargs['accession'])) return queryset def list(self, request, *args, **kwargs): @@ -358,7 +358,6 @@ class SuperStudyFlagshipStudiesViewSet( emg_mixins.ListModelMixin, emg_viewsets.BaseStudyGenericViewSet ): - lookup_field = 'super_study_id' def get_queryset(self): @@ -382,7 +381,6 @@ class SuperStudyRelatedStudiesViewSet( emg_mixins.ListModelMixin, emg_viewsets.BaseStudyGenericViewSet ): - lookup_field = 'super_study_id' def get_queryset(self): @@ -406,7 +404,6 @@ class SuperStudyGenomeCataloguesViewSet( emg_mixins.ListModelMixin, emg_viewsets.BaseGenomeCatalogueGenericViewSet ): - lookup_field = 'super_study_id' def get_queryset(self): @@ -965,7 +962,7 @@ def get_queryset(self): return emg_models.SampleAnn.objects \ .filter(sample__accession=accession) \ .prefetch_related( - Prefetch('sample', queryset=emg_models.Sample.objects.available(self.request))) \ + Prefetch('sample', queryset=emg_models.Sample.objects.available(self.request))) \ .order_by('var') def list(self, request, *args, **kwargs): @@ -1070,7 +1067,6 @@ def list(self, request, *args, **kwargs): class AssemblyRunsViewSet(emg_mixins.ListModelMixin, viewsets.GenericViewSet): - serializer_class = emg_serializers.RunSerializer filterset_class = emg_filters.RunFilter @@ -1114,6 +1110,7 @@ def list(self, request, *args, **kwargs): return super(AssemblyRunsViewSet, self) \ .list(request, *args, **kwargs) + class GenomeCogsRelationshipsViewSet(emg_mixins.ListModelMixin, viewsets.GenericViewSet): serializer_class = emg_serializers.CogCountSerializer @@ -1184,7 +1181,6 @@ class GenomeKeggModuleRelationshipsViewSet(emg_mixins.ListModelMixin, ordering_fields = ( 'class_id', - 'name', 'genome_count', ) @@ -1205,7 +1201,6 @@ def get_queryset(self): class GenomeAntiSmashGeneClustersRelationshipsViewSet(emg_mixins.ListModelMixin, viewsets.GenericViewSet): - serializer_class = emg_serializers.AntiSmashCountSerializer filter_backends = ( diff --git a/emgapi/viewsets.py b/emgapi/viewsets.py index 9e9217fa5..a6ebf5e73 100644 --- a/emgapi/viewsets.py +++ b/emgapi/viewsets.py @@ -252,7 +252,6 @@ class BaseGenomeGenericViewSet(viewsets.GenericViewSet): 'num_contigs', 'completeness', 'contamination', - 'num_genomes', 'num_genomes_total', 'num_proteins', 'last_update', diff --git a/emgcli/__init__.py b/emgcli/__init__.py index 31dfb7928..d550e808a 100644 --- a/emgcli/__init__.py +++ b/emgcli/__init__.py @@ -1 +1 @@ -__version__: str = "2.4.35" +__version__: str = "2.4.36" diff --git a/pyproject.toml b/pyproject.toml index 569182588..b0298d798 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ # log handler "concurrent-log-handler~=0.9.24", # django - "Django==3.2.18", + "Django==3.2.23", "djangorestframework==3.12", "django-filter==23.1", "djangorestframework-jwt~=1.11.0", @@ -36,7 +36,7 @@ dependencies = [ "django-mysql==4.3.0", "mysqlclient==2.1.1", "mysql-connector-python~=8.0.23", - "sqlparse==0.4.3", + "sqlparse==0.4.4", # assembly contig viewer "pysam==0.21.0", # sourmash search @@ -117,7 +117,7 @@ max-line-length = 119 """ [tool.bumpversion] -current_version = "2.4.35" +current_version = "2.4.36" [[tool.bumpversion.files]] filename = "emgcli/__init__.py"