diff --git a/.gitignore b/.gitignore index b6e4761..50af712 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,6 @@ dmypy.json # Pyre type checker .pyre/ + +# PyCharm +.idea diff --git a/Jenkinsfile b/Jenkinsfile index e1b5721..e83e56f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 """ diff --git a/README_DEV.md b/README_DEV.md index 57e904c..2b99dca 100644 --- a/README_DEV.md +++ b/README_DEV.md @@ -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). diff --git a/tox.ini b/tox.ini index ea5302e..04457fc 100644 --- a/tox.ini +++ b/tox.ini @@ -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}