Skip to content

Commit

Permalink
Merge pull request #52 from ess-dmsc/fix_build_issues
Browse files Browse the repository at this point in the history
Fix build issues with tox
  • Loading branch information
mattclarke authored Sep 1, 2021
2 parents cd5a8dc + 82e0161 commit e537f8d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,6 @@ dmypy.json

# Pyre type checker
.pyre/

# PyCharm
.idea
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ builders = pipeline_builder.createBuilders { container ->
/opt/miniconda/bin/conda init bash
export PATH=/opt/miniconda/bin:$PATH
python --version
which python
python -m pip install --user -r ${project}/requirements.txt
python -m pip install --user -r ${project}/requirements-dev.txt
"""
Expand Down
2 changes: 2 additions & 0 deletions README_DEV.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ Finally, create a tag on the GitHub repository with the appropriate name, e.g. `
The conda package is used by ESS DMSC DRAM group for the Scipp library.
Please create the release version tag on github before creating the conda package as it gets the version number from the tag.

Note: anecdotal evidence suggests that this works better on Linux than on MacOS.

#### Steps

You must first have a conda installation, for example `conda` via pip, or [miniconda](https://docs.conda.io/en/latest/miniconda.html).
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ skipsdist=true

[testenv]
deps =
-r requirements.txt
-r requirements-dev.txt
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements-dev.txt
commands =
python -m pytest {posargs}

Expand Down

0 comments on commit e537f8d

Please sign in to comment.