Merge branch 'main' into membrane_tutorial

Author: hannahbaumann

environment.yaml

@@ -13,6 +13,7 @@ dependencies:
   - pytest-cov
   - pytest-xdist
   - python
+  - openff-interchange-base != 0.5.1  # https://github.com/openforcefield/openff-interchange/issues/1450
   - pip:
-    - git+https://github.com/OpenFreeEnergy/gufe@membrane_prototype
+    - git+https://github.com/OpenFreeEnergy/gufe@main
     - git+https://github.com/OpenFreeEnergy/openfe@membrane_prototype