More improvements with Pytest & reduce CI yml file #124

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

Jump to bottom

Merged

vsoch merged 12 commits into singularityhub:master from Flamefire:pytest

Jun 4, 2019

Contributor

Flamefire commented Jun 3, 2019

Use pytest.skipif to skip OCI tests on Singularity 2.
This allows to always run all tests with any singularity version reducing the CI yml file.
To further reduce the yml file dictionary refs are used and PYTHON_VERSION is introduced to install a specific python version

vsoch reviewed

View reviewed changes

.circleci/config.yml Outdated Show resolved Hide resolved

vsoch reviewed

View reviewed changes

.circleci/config.yml Outdated Show resolved Hide resolved

vsoch reviewed

View reviewed changes

.circleci/config.yml Outdated Show resolved Hide resolved

vsoch reviewed

View reviewed changes

spython/tests/test_base.py Show resolved Hide resolved

Member

vsoch commented Jun 3, 2019

Just missing a definition for singularity2:

#!/bin/sh -eo pipefail
# Unable to parse YAML
# found undefined alias singularity2
#  in 'string', line 116, column 32:
#       test-singularity-2-python-3: *singularity2
#                                    ^

If you download CircleCIs command line parser, you can validate before push,

$ circleci config validate .circleci/config.yml
Config file at .circleci/config.yml is valid.

vsoch reviewed

View reviewed changes

spython/tests/test_oci.py Outdated Show resolved Hide resolved

Flamefire force-pushed the pytest branch 8 times, most recently from 20c1e6f to de8e41f Compare

June 3, 2019 15:59

Flamefire added 5 commits

June 3, 2019 18:14


          Use pytest to exclude OCI tests

77f92ae


          Add test for Image

43099bd


          Fix version_info for old singularity 2

56dff97


          Reduce CI yml

4f8fd8c


          Use parametrized job in CI

6ae273c

Flamefire force-pushed the pytest branch from de8e41f to 6ae273c Compare

June 3, 2019 16:14

Member

vsoch commented Jun 3, 2019

All checks pass! For some reason there was a "no build output for 10 minutes" on the first try, so I restarted, and now all is well :)

Flamefire added 3 commits

June 4, 2019 08:21


          Remove some non-pythonisms

deae665


          Fix decoding of bytes to str

54b88ba

Python 2 str is bytes, so don't decode if it already is a str


          Pytestify test_utils

a6aa817

Flamefire force-pushed the pytest branch from 725e780 to a6aa817 Compare

June 4, 2019 08:05

Flamefire added 3 commits

June 4, 2019 15:41


          Convert all other tests to pytest

d5db7af


          Add ScopedEnvVar

70e7f4f


          Fix pull command not honoring ext & PULLFOLDER

3d39e80

Flamefire force-pushed the pytest branch from 8974066 to 3d39e80 Compare

June 4, 2019 14:58

Contributor Author

Flamefire commented Jun 4, 2019

Ready for merge

vsoch requested changes

View reviewed changes

spython/utils/misc.py Show resolved Hide resolved

spython/utils/misc.py Show resolved Hide resolved

spython/tests/test_utils.py Show resolved Hide resolved

spython/logger/compatibility.py Show resolved Hide resolved

vsoch reviewed

View reviewed changes

spython/logger/compatibility.py Outdated Show resolved Hide resolved


          Improve docstrings

a6ab9a4

Flamefire force-pushed the pytest branch from d7ca33d to a6ab9a4 Compare

June 4, 2019 15:43

vsoch approved these changes

View reviewed changes

Member

vsoch commented Jun 4, 2019

Looks great! Merging, and I will put together a release shortly.

vsoch merged commit 4f8c59e into singularityhub:master

Member

vsoch commented Jun 4, 2019

https://pypi.org/project/spython/0.0.64/

Flamefire deleted the pytest branch

June 4, 2019 15:53

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet