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

Jump to bottom

Port lib/test_util.py to pytest #1413

Merged
merged 10 commits into from Jun 21, 2017
Merged

Port lib/test_util.py to pytest #1413

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b88dc82
Inital attempt to port lib/test_util.py
utkbansal Jun 20, 2017
46e2a0c
Add pytest to travis
utkbansal Jun 20, 2017
6d8816d
Merge nose & pytest coverage data
utkbansal Jun 20, 2017
9798e7a
Add pytest as a pip dependency
utkbansal Jun 20, 2017
1140018
Force install & upgrade pytest
utkbansal Jun 20, 2017
8ed78d0
Execute the pytest suite first
utkbansal Jun 20, 2017
6437b95
Add full path to the lib module
utkbansal Jun 20, 2017
c3cc804
Suppress pytest warnings
utkbansal Jun 20, 2017
d8a7ba9
Fix coverage file variable names
utkbansal Jun 21, 2017
a345f00
Convert pytest & pytest-cov to conda dependencies.
utkbansal Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -31,10 +31,10 @@ env:
- MAIN_CMD="pytest ${PYTEST_LIST} ${PYTEST_FLAGS}; python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST} ${NOSE_FLAGS}"
- SETUP_CMD=""
- BUILD_CMD="pip install -v package/ && pip install testsuite/"
- CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer"
- CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy seaborn coveralls clustalw=2.1"
- CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer pytest=3.1.2 pytest-cov=2.5.1"
- CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy seaborn coveralls clustalw=2.1 pytest=3.1.2 pytest-cov=2.5.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the version pinning?

Copy link
Member Author

@utkbansal utkbansal Jun 21, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conda already says that it has pytest installed and still it did not work. Also, the version it has is 2.7, so there has been a major release after that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be able to do conda upgrade pytest?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@richardjgowers after the source ci-helpers/travis/setup_conda.sh step?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the older version comes from astropy. They specifically install an older version of pytest for themselves. Leave the pinning for now. I'm asking what they use as a preferred way to use a newer pytest version.

# Install griddataformats from PIP so that scipy is only installed in the full build (#1147)
- PIP_DEPENDENCIES='griddataformats pytest pytest-cov'
- PIP_DEPENDENCIES='griddataformats'
- CONDA_CHANNELS='biobuilds conda-forge'
- CONDA_CHANNEL_PRIORITY=True
- NUMPY_VERSION=stable
Expand Down Expand Up @@ -99,7 +99,6 @@ install:
export PATH=${PATH}:${HOLE_BINDIR}; \
fi
- eval $BUILD_CMD
- pip install --upgrade pytest pytest-cov

script:
- cd ${TRAVIS_BUILD_DIR}
Expand Down