Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature web (a.k.a. BioSimSpace 2023.0.0) #356

Merged
merged 59 commits into from
Sep 26, 2022
Merged

Feature web (a.k.a. BioSimSpace 2023.0.0) #356

merged 59 commits into from
Sep 26, 2022

Commits on Jun 10, 2022

  1. That was easier than expected - it mostly works with very minimal cha…

    …nge :-)
    
    Just a few errors in the tests in test_somd.py and test_generalunit.py
    
    I suspect these may be because I haven't yet pulled in any changed from
    Sire devel to feat_web. I'll get around to this next week :-)
    Christopher Woods authored and Christopher Woods committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    688a57b View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2022

  1. Merge branch 'devel' of https://github.com/michellab/biosimspace into…

    … feature-web
    Christopher Woods authored and Christopher Woods committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    92500b4 View commit details
    Browse the repository at this point in the history
  2. Changes needed to adapt to the new API

    Christopher Woods authored and Christopher Woods committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    8b532fd View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. Fixes to catch the edge cases in the tests. Updated _search_result

    to cope with the new search code in Sire
    Christopher Woods authored and Christopher Woods committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    53e571e View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. All of the changes needed to get the BioSimSpace tests to pass agains…

    …t the new version of Sire
    Christopher Woods authored and Christopher Woods committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    f32e2db View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bbaa2b3 View commit details
    Browse the repository at this point in the history
  3. Allow parameters to be passed to setup.py on windows. Adapted tests t…

    …o run shlex.split properly on windows. Debugging unit errors
    chryswoods committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    b33060b View commit details
    Browse the repository at this point in the history
  4. Removing debugging print statements and making sure the sandpit has t…

    …he same version as core
    Christopher Woods authored and Christopher Woods committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    de38a5f View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Added a command_split function to support cross-platform splitting of…

    … command lines. Switched out shlex.split for this new function
    chryswoods committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    063f150 View commit details
    Browse the repository at this point in the history
  2. Continuing the commit

    chryswoods committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    39f38df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    01049b6 View commit details
    Browse the repository at this point in the history
  4. Forgot to import shlex on non-Windows platforms...

    Christopher Woods authored and Christopher Woods committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    b8df1fa View commit details
    Browse the repository at this point in the history
  5. Merge branch 'devel' of https://github.com/michellab/biosimspace into…

    … feature-web
    Christopher Woods authored and Christopher Woods committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    767449f View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Fixes to align with BioSimSpace code style and to remove debugging pr…

    …int statements
    Christopher Woods authored and Christopher Woods committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    b5d23f7 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'devel' of https://github.com/michellab/biosimspace into…

    … feature-web
    Christopher Woods authored and Christopher Woods committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    5665c6f View commit details
    Browse the repository at this point in the history
  3. Fixing new test failures. Still a failure from test_somd::test_pert_r…

    …es_num() as this is loading
    
    a system from a pickled file, and the residue number is not correct.
    Christopher Woods authored and Christopher Woods committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    fc8d541 View commit details
    Browse the repository at this point in the history
  4. Had to switch fully over to the new module names as there was a weird…

    … edge case bug
    
    caused by using both Sire.Mol and sire.legacy.Mol.
    
    Have some small edge cases to deal with now
    
    FAILED test/Process/test_somd.py::test_pert_file[test/input/morphs/morph01.pickle-test/input/morphs/morph01.pert] -
    ModuleNotFoundErr...
    FAILED test/Process/test_somd.py::test_pert_res_num - ModuleNotFoundError: No module named 'Sire'
    FAILED
    test/Sandpit/Exscientia/Process/test_somd.py::test_pert_file[test/Sandpit/Exscientia/input/morphs/morph01.pickle-test/Sandpit/Exscientia/input/morphs/morph01.pert]
    FAILED test/Sandpit/Exscientia/Process/test_somd.py::test_pert_res_num - ModuleNotFoundError: No module named 'Sire'
    FAILED test/Sandpit/Exscientia/_SireWrappers/test_molecule.py::test_makeCompatibleWith - ValueError: 'Invalid search query:
    'element F'
    FAILED test/_SireWrappers/test_molecule.py::test_makeCompatibleWith - ValueError: 'Invalid search query: 'element F'
    
    The test_somd failures are because we now can't unpickle a file that expects to load Sire instead of sire
    
    The 'element F' failure is unexpected and will be debugged later
    Christopher Woods authored and Christopher Woods committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    761968c View commit details
    Browse the repository at this point in the history
  5. Ok - the "F" error was because the code assumed that searches that re…

    …turned zero results
    
    would not raise an exception. I have fixed this for Molecule, but it will likely need
    fixing for others.
    
    I've marked the pickle tests in test_somd.py as XFAIL, as we will need to create a
    new pickle object for this to work with the new version of Sire.
    
    Otherwise, everything now passes.
    Christopher Woods authored and Christopher Woods committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    d612de9 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Updated to Python scripts so that the installation should work on Win…

    …dows.
    
    Updated to the same requirements system as sire, specifying all requirements
    in `requirements.txt` and `requirements_build.txt`. These are parsed
    by `update_recipe.py` to create the conda recipe.
    
    I have moved the sire version requirement into requirements.txt so that
    it is easier to specify the sire version on which a pull request or
    push depends. This way we don't need to be playing around with the
    tags or anything. This also lets us control the range of supported
    sire versions more easily, e.g. not having to use the major number
    as the pin.
    
    I have also updated the build process so that we don't need to
    clone the sire or biosimspace repositories again - for the tests
    we just copy the tests from the already-cloned repo.
    
    Note that this won't build an run now because it depends
    on sire >= 2023.0.0, < 2023.1.0
    Christopher Woods authored and Christopher Woods committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    9384f34 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'devel' of https://github.com/michellab/biosimspace into…

    … feature-web
    Christopher Woods authored and Christopher Woods committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    43b6b78 View commit details
    Browse the repository at this point in the history
  3. Forgot to save this file...

    Christopher Woods authored and Christopher Woods committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    c32ff16 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2022

  1. Forgot to include the bld.bat for windows conda builds.

    Christopher Woods authored and Christopher Woods committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    eb151c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2022

  1. Configuration menu
    Copy the full SHA
    04b1305 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Merge branch 'devel' of https://github.com/michellab/biosimspace into…

    … feature-web
    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    a81225d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature-web' of https://github.com/michellab/biosimspace

    …into feature-web
    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    d130133 View commit details
    Browse the repository at this point in the history
  3. Ignoring .lock files produced by the new trajectory tests

    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    972f6dc View commit details
    Browse the repository at this point in the history
  4. Beginning to add support fkcombu_bss

    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    3978bfa View commit details
    Browse the repository at this point in the history
  5. Merge branch 'feature-web' of https://github.com/michellab/biosimspace

    …into feature-kcombu
    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    5235ee1 View commit details
    Browse the repository at this point in the history
  6. Adding kcombu_bss as a dependency

    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    29e7d48 View commit details
    Browse the repository at this point in the history
  7. Adding in the pytest option to allow it to cope with duplicate test n…

    …ames
    Christopher Woods authored and Christopher Woods committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    b4ec58b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    391d120 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. Merge branch 'feature-kcombu' of https://github.com/michellab/biosims…

    …pace into feature-web
    Christopher Woods authored and Christopher Woods committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    0a244f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Configuration menu
    Copy the full SHA
    c14456c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1066e0c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab4aca3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5f0c7d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. Configuration menu
    Copy the full SHA
    3c0559a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ae69f1d View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Added '.atoms()', '.residues(), .molecules()` etc functions that

    allow the user to be explicit about what they are iterating over
    when iterating over a search result
    Christopher Woods authored and Christopher Woods committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    96d61c7 View commit details
    Browse the repository at this point in the history
  2. Fixed the .molecules() function to work when only a single molecule…

    … is returned.
    
    Added in the `.bonds()` function to show how to iterate over bonds (although
    we do need to add a BSS.Bond object).
    
    Fixed (I think) the perturbable search in the Exscientia sandpit
    Christopher Woods authored and Christopher Woods committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    6cc43e9 View commit details
    Browse the repository at this point in the history
  3. No - this was needed to fix the test in the sandpit. Also removed a f…

    …orgotten print debug
    Christopher Woods authored and Christopher Woods committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    1f7cc55 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. I've added in a wrapper around the new Sire Bond class so that this c…

    …an be
    
    properly handled as part of the return from a search query
    Christopher Woods authored and Christopher Woods committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    8c5f4d7 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. Merge branch 'devel' of https://github.com/michellab/biosimspace into…

    … feature-web
    Christopher Woods authored and Christopher Woods committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    d266fca View commit details
    Browse the repository at this point in the history
  2. Changes needed to fix tests locally. Pushing so that I can test these…

    … on another box
    Christopher Woods authored and Christopher Woods committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    4a1de9d View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2022

  1. Configuration menu
    Copy the full SHA
    113596e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d47a4ec View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    00549e1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0398901 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    76a37f1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2799d5e View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Configuration menu
    Copy the full SHA
    8b5852e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    807d509 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9aec451 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5152ad9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cf135b8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    df6495f View commit details
    Browse the repository at this point in the history
  7. Update docstrings. [ci skip]

    lohedges committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    33e9f84 View commit details
    Browse the repository at this point in the history
  8. Formatting tweaks. [ci skip]

    lohedges committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    fc89142 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c39cfdb View commit details
    Browse the repository at this point in the history