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.

Sign up for GitHub

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

FIx module path #430

Merged
merged 5 commits into from
Jul 19, 2019
Merged

FIx module path #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d04d416
FIx module path
andrrizzi Jul 19, 2019
c16fc7d
Update releasehistory.rst
andrrizzi Jul 19, 2019
c641385
Temporarily allow macOS tests to fail
andrrizzi Jul 19, 2019
1cc66de
Temporarily allow macOS tests to fail
andrrizzi Jul 19, 2019
7712c07
Fix YAML dict -> list
andrrizzi Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ matrix:
language: generic
env: PYTHON_VER=3.7


- os: linux
language: generic # No need to set Python version since its conda
env: PYTHON_VER=3.6
- os: linux
language: generic
env: PYTHON_VER=3.7

# TODO: Reactivate macOS tests if they stop segfaulting after switching from nose to pytest (see also #402 and #430).
allow_failures:
- os: osx

env:
global:
- OPENMM_CPU_THREADS="1" # only use one CPU thread for determinism
Expand Down
7 changes: 7 additions & 0 deletions docs/releasehistory.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Release History
***************

Current development
===================

Bugfixes
--------
- Fixed a bug in ``multistateanalyzer.py`` where a function was imported from ``openmmtools.utils`` instead of ``openmmtools.multistate.utils`` (`#430 <https://github.com/choderalab/openmmtools/pull/430>`_).

0.18.2 - Bugfix release
=======================

Expand Down
6 changes: 3 additions & 3 deletions openmmtools/multistate/multistateanalyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ def _combine_phases(self, other, operator='+'):
# Reset self._sign
self._sign = '+'
if self.name is None:
names.append(utils.generate_phase_name(self.name, []))
names.append(multistate.utils.generate_phase_name(self.name, []))
else:
names.append(self.name)
if isinstance(other, MultiPhaseAnalyzer):
Expand All @@ -1077,7 +1077,7 @@ def _combine_phases(self, other, operator='+'):
final_new_names = []
for name in new_names:
other_names = [n for n in new_names if n != name]
final_new_names.append(utils.generate_phase_name(name, other_names + names))
final_new_names.append(multistate.utils.generate_phase_name(name, other_names + names))
names.extend(final_new_names)
for new_sign in new_signs:
if operator != '+' and new_sign == '+':
Expand All @@ -1086,7 +1086,7 @@ def _combine_phases(self, other, operator='+'):
signs.append('+')
phases.extend(new_phases)
elif isinstance(other, PhaseAnalyzer):
names.append(utils.generate_phase_name(other.name, names))
names.append(multistate.utils.generate_phase_name(other.name, names))
if operator != '+' and other._sign == '+':
signs.append('-')
else:
Expand Down