Skip to content

Commit

Permalink
Unpin pytest (#425)
Browse files Browse the repository at this point in the history
* Unpin pytest to allow honoring of junit_family and to address #372.

* Enforce a minimum pytest version

* Remove duplicate section heading
  • Loading branch information
rendinam authored Sep 17, 2019
1 parent 14f5d7e commit 2d7e582
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ bc1.conda_packages = ['python=3.6',
'ci-watson',
'cfitsio',
'pkg-config',
'pytest=3.8.2',
'pytest',
'requests',
'astropy']
bc1.build_cmds = ["${configure_cmd} --release-with-symbols",
Expand Down
2 changes: 1 addition & 1 deletion JenkinsfileRT
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ bc.conda_channels = ['http://ssb.stsci.edu/astroconda']
bc.conda_packages = ['python=3.6',
'cfitsio',
'pkg-config',
'pytest=3.8.2',
'pytest',
'requests',
'astropy',
'ci-watson']
Expand Down
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[pytest]
junit_family = xunit2
minversion = 4.0

0 comments on commit 2d7e582

Please sign in to comment.