wwpdb.apps.seqmodule 0.30.0__tar.gz → 0.30.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/PKG-INFO +2 -2
  2. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/setup.py +1 -1
  3. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/__init__.py +1 -1
  4. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SequenceDataAssembleTests.py +0 -4
  5. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SequenceDataAssemble_v2.py +21 -2
  6. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SequenceDataPrepTests.py +0 -2
  7. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SummaryViewTests.py +0 -2
  8. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/ModelSequenceUtilsTests.py +0 -2
  9. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/SequenceDataExportTests.py +0 -2
  10. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/LocalBlastSearchUtils.py +4 -4
  11. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb.apps.seqmodule.egg-info/PKG-INFO +2 -2
  12. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb.apps.seqmodule.egg-info/requires.txt +1 -1
  13. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/README.md +0 -0
  14. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/setup.cfg +0 -0
  15. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/__init__.py +0 -0
  16. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/__init__.py +0 -0
  17. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentBackEndEditingTools.py +0 -0
  18. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentDepictionTools.py +0 -0
  19. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentExport.py +0 -0
  20. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentFrontEndUIEditor.py +0 -0
  21. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentStatistics.py +0 -0
  22. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentStatisticsTests.py +0 -0
  23. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentToolUtils.py +0 -0
  24. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/AlignmentTools.py +0 -0
  25. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/align/__init__.py +0 -0
  26. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/DataImporter.py +0 -0
  27. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SequenceDataAssembleExample.py +0 -0
  28. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SummaryViewDepiction.py +0 -0
  29. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/SummaryView_v2.py +0 -0
  30. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/control/__init__.py +0 -0
  31. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/AlignmentDataStore.py +0 -0
  32. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/BlastPlusReader.py +0 -0
  33. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/FetchSeqInfoUtils.py +0 -0
  34. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/ModelSequenceUtils.py +0 -0
  35. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/PdbxIoUtils.py +0 -0
  36. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/SequenceDataExport_v2.py +0 -0
  37. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/SequenceDataStore.py +0 -0
  38. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/SequenceDataStoreTests.py +0 -0
  39. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/SequenceEditStore.py +0 -0
  40. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/SequenceEditStoreTests.py +0 -0
  41. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/TaxonomyDbUtils.py +0 -0
  42. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/TaxonomyUtils.py +0 -0
  43. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/TaxonomyUtilsTests.py +0 -0
  44. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/__init__.py +0 -0
  45. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/io/testAuto.py +0 -0
  46. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/link/PolymerLinkageDepict.py +0 -0
  47. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/link/__init__.py +0 -0
  48. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/update/UpdatePolymerEntityPartitions.py +0 -0
  49. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/update/UpdatePolymerEntityReference_v2.py +0 -0
  50. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/update/UpdatePolymerEntitySourceDetails.py +0 -0
  51. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/update/__init__.py +0 -0
  52. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/Autodict.py +0 -0
  53. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/FetchReferenceSequenceUtils.py +0 -0
  54. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/GetSameSeqAnnotationWithTaxIdOnly.py +0 -0
  55. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/MultiProcLimit.py +0 -0
  56. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SearchEntityPolySeqs.py +0 -0
  57. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SeqReferenceSearchUtils.py +0 -0
  58. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SequenceAssign.py +0 -0
  59. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SequenceExamples.py +0 -0
  60. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SequenceFeatureDepict.py +0 -0
  61. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SequenceLabel.py +0 -0
  62. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/SequenceReferenceData.py +0 -0
  63. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/UpdateSequenceDataStoreUtils.py +0 -0
  64. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/util/__init__.py +0 -0
  65. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/view3d/ModelViewer3D.py +0 -0
  66. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/view3d/__init__.py +0 -0
  67. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/webapp/SeqModWebApp_v2.py +0 -0
  68. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/webapp/SeqModWebRequest.py +0 -0
  69. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb/apps/seqmodule/webapp/__init__.py +0 -0
  70. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb.apps.seqmodule.egg-info/SOURCES.txt +0 -0
  71. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb.apps.seqmodule.egg-info/dependency_links.txt +0 -0
  72. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb.apps.seqmodule.egg-info/not-zip-safe +0 -0
  73. {wwpdb_apps_seqmodule-0.30.0 → wwpdb_apps_seqmodule-0.30.2}/wwpdb.apps.seqmodule.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: wwpdb.apps.seqmodule
3
- Version: 0.30.0
3
+ Version: 0.30.2
4
4
  Summary: wwPDB sequence module
5
5
  Home-page: https://github.com/wwPDB/py-wwpdb_apps_seqmodule
6
6
  Author: Ezra Peisach
@@ -22,7 +22,7 @@ Requires-Dist: wwpdb.utils.wf>=0.30
22
22
  Requires-Dist: wwpdb.utils.seqdb_v2~=0.11
23
23
  Requires-Dist: wwpdb.utils.align>=0.11
24
24
  Requires-Dist: wwpdb.utils.detach>=0.4.2
25
- Requires-Dist: wwpdb.utils.dp~=0.48
25
+ Requires-Dist: wwpdb.utils.dp>=0.48
26
26
  Requires-Dist: wwpdb.utils.db>=0.28
27
27
  Requires-Dist: rcsb.utils.multiproc
28
28
  Provides-Extra: dev
@@ -49,7 +49,7 @@ setup(
49
49
  "wwpdb.utils.seqdb_v2 ~= 0.11",
50
50
  "wwpdb.utils.align >= 0.11",
51
51
  "wwpdb.utils.detach >= 0.4.2",
52
- "wwpdb.utils.dp ~= 0.48",
52
+ "wwpdb.utils.dp >= 0.48",
53
53
  "wwpdb.utils.db >= 0.28",
54
54
  "rcsb.utils.multiproc",
55
55
  ],
@@ -2,4 +2,4 @@ __docformat__ = "restructuredtext en"
2
2
  __author__ = "Ezra Peisach"
3
3
  __email__ = "ezra.peisach@rcsb.org"
4
4
  __license__ = "Apache 2.0"
5
- __version__ = "0.30.0"
5
+ __version__ = "0.30.2"
@@ -106,11 +106,9 @@ class SequenceDataAssembleTests(unittest.TestCase):
106
106
  if not os.access(inpFilePath, os.F_OK):
107
107
  self.__lfh.write("+testSearchAndAssembleFromUpload() input file missing %s\n" % inpFilePath)
108
108
  self.fail()
109
- break
110
109
  if not os.access(pdbxFilePath, os.F_OK):
111
110
  self.__lfh.write("+testSearchAndAssembleFromUpload() format conversion failed for %s\n" % idCode)
112
111
  self.fail()
113
- break
114
112
  #
115
113
  sda = SequenceDataAssemble(reqObj=self.__reqObj, verbose=self.__verbose, log=self.__lfh)
116
114
  # sda.doAssemble(fileSource="local-upload")
@@ -151,11 +149,9 @@ class SequenceDataAssembleTests(unittest.TestCase):
151
149
  if not os.access(inpFilePath, os.F_OK):
152
150
  self.__lfh.write("+testSearchAndAssembleFromUpload() input file missing %s\n" % inpFilePath)
153
151
  self.fail()
154
- break
155
152
  if not os.access(pdbxFilePath, os.F_OK):
156
153
  self.__lfh.write("+testSearchAndAssembleFromUpload() format conversion failed for %s\n" % idCode)
157
154
  self.fail()
158
- break
159
155
  #
160
156
  c0 = PdbxFileIo(verbose=self.__verbose, log=self.__lfh).getContainer(pdbxFilePath)
161
157
  msu = ModelSequenceUtils(dataContainer=c0, verbose=self.__verbose, log=self.__lfh)
@@ -135,8 +135,10 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
135
135
  #
136
136
  if doAutoProcess:
137
137
  self.__autoProcessFlag = no_coord_issue
138
+ self._lfh.write("\n+SequenceDataAssemble.doAssemble() autoProcessFlag=%r no_coord_issue=%r\n" % (self.__autoProcessFlag, no_coord_issue))
138
139
  if len(seqSimilarityInfoList) > 0:
139
140
  self.__autoProcessFlag = False
141
+ self._lfh.write("\n+SequenceDataAssemble.doAssemble() autoProcessFlag=%r seqSimilarityInfoList=%d\n" % (self.__autoProcessFlag, len(seqSimilarityInfoList)))
140
142
  #
141
143
  #
142
144
  self.__getAuthDefinedRefD(depSeqAssign)
@@ -211,7 +213,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
211
213
  startTime = time.time()
212
214
  if self._verbose:
213
215
  self._lfh.write(
214
- "+SequenceDataAssemble loadSequenceDataStore for sessionId %s started at %s \n" % (self.__sessionObj.getId(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()))
216
+ "+SequenceDataAssemble.doAssemble() for sessionId %s started at %s \n" % (self.__sessionObj.getId(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()))
215
217
  )
216
218
  #
217
219
  if ("PDB_ID" in entryD["PDB_ID"]) and (len(entryD["PDB_ID"]) == 4):
@@ -242,6 +244,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
242
244
  #
243
245
  dataExport = SequenceDataExport(reqObj=self._reqObj, exportList=defaultSelectedIdList, verbose=self._verbose, log=self._lfh)
244
246
  ok, numConflicts, _conflictList, _warningMsg = dataExport.exportAssignments()
247
+ self._lfh.write("+SequenceDataAssemble.doAssemble() autoProcessFlag=%r ok=%r numConflicts=%d\n" % (self.__autoProcessFlag, ok, numConflicts))
245
248
  if (not ok) or (numConflicts > 0):
246
249
  assignFilePath = self.__pI.getSequenceAssignmentFilePath(self.__dataSetId, fileSource="session", versionId="latest")
247
250
  if assignFilePath and os.access(assignFilePath, os.R_OK):
@@ -252,7 +255,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
252
255
  if self._verbose:
253
256
  endTime = time.time()
254
257
  self._lfh.write(
255
- "+SequenceDataAssemble loadSequenceDataStore completed at %s (%.2f seconds)\n" % (time.strftime("%Y %m %d %H:%M:%S", time.localtime()), endTime - startTime)
258
+ "+SequenceDataAssemble.doAssemble() completed at %s (%.2f seconds)\n" % (time.strftime("%Y %m %d %H:%M:%S", time.localtime()), endTime - startTime)
256
259
  )
257
260
  self._lfh.write("+SequenceDataAssemble.doAssemble() COMPLETED for %r\n\n" % self.__dataSetId)
258
261
  #
@@ -667,6 +670,10 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
667
670
  """
668
671
  try:
669
672
  startTime = time.time()
673
+ if self._verbose:
674
+ self._lfh.write(
675
+ "+SequenceDataAssemble.__doReferenceSearch() for sessionId %s started at %s \n" % (self.__sessionObj.getId(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()))
676
+ )
670
677
  #
671
678
  entityTupList = []
672
679
  for eId in entityIdList:
@@ -698,6 +705,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
698
705
  #
699
706
  # Stop autoProcess for poly-ALA Seq per ticket# DAOTHER-8256
700
707
  if (10 * countALA) > (9 * seqLen):
708
+ self._lfh.write("+SequenceDataAssemble.__doReferenceSearch() poly-ALA Seq case autoProcessFlag=%r\n" % self.__autoProcessFlag)
701
709
  self.__autoProcessFlag = False
702
710
  #
703
711
  #
@@ -737,6 +745,7 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
737
745
  if self.__reRunBlastSearchFlag:
738
746
  blastList = entityTupList
739
747
  self.__autoProcessFlag = False
748
+ self._lfh.write("+SequenceDataAssemble.__doReferenceSearch() rerun Blast search case autoProcessFlag=%r\n" % self.__autoProcessFlag)
740
749
  else:
741
750
  for entityTup in entityTupList:
742
751
  hasOwnRef = False
@@ -776,12 +785,14 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
776
785
  autoMatchStatus, refD = self.__runSeqBlastSearch(blastList)
777
786
  if (not autoMatchStatus) or (not refD):
778
787
  self.__autoProcessFlag = False
788
+ self._lfh.write("+SequenceDataAssemble.__doReferenceSearch() No reference case autoProcessFlag=%r\n" % self.__autoProcessFlag)
779
789
  #
780
790
  #
781
791
  if refD:
782
792
  for k, _v in refD.items():
783
793
  if k in naList:
784
794
  self.__autoProcessFlag = False
795
+ self._lfh.write("+SequenceDataAssemble.__doReferenceSearch() DNA entity case autoProcessFlag=%r\n" % self.__autoProcessFlag)
785
796
  #
786
797
  #
787
798
  #
@@ -814,6 +825,10 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
814
825
  """Search same sequence annotation information from processed entries"""
815
826
  try:
816
827
  startTime = time.time()
828
+ if self._verbose:
829
+ self._lfh.write(
830
+ "+SequenceDataAssemble.__runSameSeqAnnotationSearch() for sessionId %s started at %s \n" % (self.__sessionObj.getId(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()))
831
+ )
817
832
  #
818
833
  if self.__cI.get("USE_COMPUTE_CLUSTER"):
819
834
  numProc = len(entityTupList)
@@ -867,6 +882,10 @@ class SequenceDataAssemble(UpdateSequenceDataStoreUtils):
867
882
  """Perform blast reference sequence search"""
868
883
  try:
869
884
  startTime = time.time()
885
+ if self._verbose:
886
+ self._lfh.write(
887
+ "+SequenceDataAssemble.__runSeqBlastSearch() for sessionId %s started at %s \n" % (self.__sessionObj.getId(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()))
888
+ )
870
889
  #
871
890
  if self.__cI.get("USE_COMPUTE_CLUSTER"):
872
891
  numProc = len(entityTupList)
@@ -300,11 +300,9 @@ class SequenceDataPrepTests(unittest.TestCase):
300
300
  if not os.access(inpFilePath, os.F_OK):
301
301
  self.__lfh.write("+testSearchAndAssembleFromUpload() input file missing %s\n" % inpFilePath)
302
302
  self.fail()
303
- break
304
303
  if not os.access(pdbxFilePath, os.F_OK):
305
304
  self.__lfh.write("+testSearchAndAssembleFromUpload() format conversion failed for %s\n" % idCode)
306
305
  self.fail()
307
- break
308
306
  #
309
307
  sda = SequenceDataAssemble(reqObj=self.__reqObj, verbose=self.__verbose, log=self.__lfh)
310
308
  # sda.doAssemble(fileSource="local-upload")
@@ -102,11 +102,9 @@ class SummaryViewTests(unittest.TestCase):
102
102
  if not os.access(inpFilePath, os.F_OK):
103
103
  self.__lfh.write("+testSearchAndAssembleFromUpload() input file missing %s\n" % inpFilePath)
104
104
  self.fail()
105
- break
106
105
  if not os.access(pdbxFilePath, os.F_OK):
107
106
  self.__lfh.write("+testSearchAndAssembleFromUpload() format conversion failed for %s\n" % idCode)
108
107
  self.fail()
109
- break
110
108
  #
111
109
  sda = SequenceDataAssemble(reqObj=self.__reqObj, verbose=self.__verbose, log=self.__lfh)
112
110
  # sda.doAssemble(fileSource="local-upload")
@@ -102,11 +102,9 @@ class ModelSequenceUtilsTests(unittest.TestCase):
102
102
  if not os.access(inpFilePath, os.F_OK):
103
103
  self.__lfh.write("+testSearchAndAssembleFromUpload() input file missing %s\n" % inpFilePath)
104
104
  self.fail()
105
- break
106
105
  if not os.access(pdbxFilePath, os.F_OK):
107
106
  self.__lfh.write("+testSearchAndAssembleFromUpload() format conversion failed for %s\n" % idCode)
108
107
  self.fail()
109
- break
110
108
 
111
109
  c0 = PdbxFileIo(verbose=self.__verbose, log=self.__lfh).getContainer(pdbxFilePath)
112
110
  msu = ModelSequenceUtils(dataContainer=c0, verbose=self.__verbose, log=self.__lfh)
@@ -100,11 +100,9 @@ class SequenceDataExportTests(unittest.TestCase):
100
100
  if not os.access(inpFilePath, os.F_OK):
101
101
  self.__lfh.write("+testSearchAndAssembleFromUpload() input file missing %s\n" % inpFilePath)
102
102
  self.fail()
103
- break
104
103
  if not os.access(pdbxFilePath, os.F_OK):
105
104
  self.__lfh.write("+testSearchAndAssembleFromUpload() format conversion failed for %s\n" % idCode)
106
105
  self.fail()
107
- break
108
106
  #
109
107
  sda = SequenceDataAssemble(reqObj=self.__reqObj, verbose=self.__verbose, log=self.__lfh)
110
108
  sda.doAssemble()
@@ -714,7 +714,7 @@ class LocalBlastSearchUtils(object):
714
714
  def __runSingleLocalBlast(self, oneLetterCodeSeq, searchResultFile, partNum, taxId, dbName):
715
715
  """Internal method to execute the sequence search according to input polymer type."""
716
716
  if self.__verbose:
717
- self.__lfh.write("+LocalBlastSearchUtils.__runSingleLocalBlast() STARTING %s Launch search for %s sequence = %s\n" % (self.__siteId, self.__seqType, oneLetterCodeSeq))
717
+ self.__lfh.write("+LocalBlastSearchUtils.__runSingleLocalBlast() STARTING %s Launch search with %s for %s sequence = %s\n" % (self.__siteId, dbName, self.__seqType, oneLetterCodeSeq))
718
718
  self.__lfh.flush()
719
719
  #
720
720
  timeBegin = time.time()
@@ -739,9 +739,9 @@ class LocalBlastSearchUtils(object):
739
739
  if self.__cleanUp and not self.__debug:
740
740
  dp.cleanup()
741
741
  #
742
- # elif self.__seqType == 'polyribonucleotide':
743
- # for DAOTHER-6304
744
- elif self.__seqType in ["polydeoxyribonucleotide", "polyribonucleotide"]:
742
+ elif self.__seqType == 'polyribonucleotide':
743
+ # Added DNA for DAOTHER-6304 and removed by DAOTHER-10682
744
+ # elif self.__seqType in ["polydeoxyribonucleotide", "polyribonucleotide"]:
745
745
  if len(oneLetterCodeSeq) > self.__minRnaSequenceSearchLength:
746
746
  dp = RcsbDpUtility(tmpPath=tmpPathAbs, siteId=self.__siteId, verbose=True)
747
747
  dp.addInput(name="one_letter_code_sequence", value=oneLetterCodeSeq)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: wwpdb.apps.seqmodule
3
- Version: 0.30.0
3
+ Version: 0.30.2
4
4
  Summary: wwPDB sequence module
5
5
  Home-page: https://github.com/wwPDB/py-wwpdb_apps_seqmodule
6
6
  Author: Ezra Peisach
@@ -22,7 +22,7 @@ Requires-Dist: wwpdb.utils.wf>=0.30
22
22
  Requires-Dist: wwpdb.utils.seqdb_v2~=0.11
23
23
  Requires-Dist: wwpdb.utils.align>=0.11
24
24
  Requires-Dist: wwpdb.utils.detach>=0.4.2
25
- Requires-Dist: wwpdb.utils.dp~=0.48
25
+ Requires-Dist: wwpdb.utils.dp>=0.48
26
26
  Requires-Dist: wwpdb.utils.db>=0.28
27
27
  Requires-Dist: rcsb.utils.multiproc
28
28
  Provides-Extra: dev
@@ -5,7 +5,7 @@ wwpdb.utils.wf>=0.30
5
5
  wwpdb.utils.seqdb_v2~=0.11
6
6
  wwpdb.utils.align>=0.11
7
7
  wwpdb.utils.detach>=0.4.2
8
- wwpdb.utils.dp~=0.48
8
+ wwpdb.utils.dp>=0.48
9
9
  wwpdb.utils.db>=0.28
10
10
  rcsb.utils.multiproc
11
11