Fixes for asapdiscovery 0.2.4 (#29)

* Fixes for `asapdiscovery` 0.2.4

* Update forms.py

* Update test_oe_license.py

argos/argos_viewer/forms.py

@@ -2,7 +2,7 @@
 from django.core.exceptions import ValidationError
 import codecs
 from pathlib import Path
-from asapdiscovery.data.postera.manifold_data_validation import TargetTags
+from asapdiscovery.data.services.postera.manifold_data_validation import TargetTags
 
 
 def validate_pdb_extn(value):
@@ -21,4 +21,4 @@ class DocumentForm(forms.Form):
     pdb_file = forms.FileField(label='Select a file', validators=[validate_pdb_extn, is_utf8_file])
     options = list(zip(TargetTags.get_values(), TargetTags.get_values()))
     dropdown_menu = forms.ChoiceField(choices=options, label='Select a Target')
-
+

argos/argos_viewer/tests/test_oe_license.py

@@ -2,5 +2,5 @@
 
 class OELicenseTests(TestCase):
     def test_oechem_is_licensed(self):
-        from asapdiscovery.data.openeye import oechem
-        self.assertTrue(oechem.OEChemIsLicensed())
+        from asapdiscovery.data.backend.openeye import oechem
+        self.assertTrue(oechem.OEChemIsLicensed())

argos/argos_viewer/views.py

@@ -9,8 +9,8 @@
 from django.contrib.auth.decorators import login_required
 
 
-from asapdiscovery.data.openeye import load_openeye_pdb
-from asapdiscovery.data.schema_v2.complex import Complex
+from asapdiscovery.data.backend.openeye import load_openeye_pdb
+from asapdiscovery.data.schema.complex import Complex
 from asapdiscovery.dataviz.html_viz import HTMLVisualizer
 from asapdiscovery.data.fitness import target_has_fitness_data
 import tempfile
@@ -97,4 +97,4 @@ def failed(request):
 @login_required
 def no_fitness_data(request, target):
     context = {"target": target}
-    return render(request, "argos_viewer/no_fitness_data.html", context)
+    return render(request, "argos_viewer/no_fitness_data.html", context)