From 6eaf710111828395c9f7e9a57d41552a99f7e7ad Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:19:55 +0200 Subject: [PATCH 1/9] Made the location of the requirements for tox explicit --- README_DEV.md | 2 ++ tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) 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} From 6c2c7717fd10711593ebd4a6efdf121a460d2b4e Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:21:12 +0200 Subject: [PATCH 2/9] Updated gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) 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 From b8606e20e266af025cca204fc277f5e3d6cbadbe Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:25:42 +0200 Subject: [PATCH 3/9] Show which python being run --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) 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 """ From bf9a4c4f7e0d0a6e8b07305a9e25397d001bd32d Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:27:56 +0200 Subject: [PATCH 4/9] Debugging. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e83e56f..dabe286 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ builders = pipeline_builder.createBuilders { container -> export PATH=/opt/miniconda/bin:$PATH python --version which python + ls /opt/miniconda/bin/ python -m pip install --user -r ${project}/requirements.txt python -m pip install --user -r ${project}/requirements-dev.txt """ From c51851e46a8f59a9cf0a1da9e6f603df04e917cd Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:29:29 +0200 Subject: [PATCH 5/9] Explicitly install pip for conda --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index dabe286..e2362dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,6 +37,7 @@ builders = pipeline_builder.createBuilders { container -> pipeline_builder.stage("${container.key}: Dependencies") { container.sh """ /opt/miniconda/bin/conda init bash + conda install -c anaconda pip export PATH=/opt/miniconda/bin:$PATH python --version which python From 221e83e422a009945864b04a3ec0074f24b70edd Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:31:21 +0200 Subject: [PATCH 6/9] Changed order --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2362dc..a36a138 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,8 +37,8 @@ builders = pipeline_builder.createBuilders { container -> pipeline_builder.stage("${container.key}: Dependencies") { container.sh """ /opt/miniconda/bin/conda init bash - conda install -c anaconda pip export PATH=/opt/miniconda/bin:$PATH + conda install -c anaconda pip python --version which python ls /opt/miniconda/bin/ From 7f502d74e6f9247786dff9200d6fe7581b3edfc1 Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:35:17 +0200 Subject: [PATCH 7/9] Removed build debugging bits --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a36a138..e83e56f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,10 +38,8 @@ builders = pipeline_builder.createBuilders { container -> container.sh """ /opt/miniconda/bin/conda init bash export PATH=/opt/miniconda/bin:$PATH - conda install -c anaconda pip python --version which python - ls /opt/miniconda/bin/ python -m pip install --user -r ${project}/requirements.txt python -m pip install --user -r ${project}/requirements-dev.txt """ From 0972e1a83444120f017448d73f1f940e1b9fc670 Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Mon, 30 Aug 2021 08:42:16 +0200 Subject: [PATCH 8/9] Temporary workaround to install pip --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e83e56f..dd336af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,8 @@ builders = pipeline_builder.createBuilders { container -> export PATH=/opt/miniconda/bin:$PATH python --version which python + curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python get-pip.py python -m pip install --user -r ${project}/requirements.txt python -m pip install --user -r ${project}/requirements-dev.txt """ From 82e016168c22b301b6370467c2ece7210f41f6af Mon Sep 17 00:00:00 2001 From: Matt Clarke Date: Wed, 1 Sep 2021 04:59:55 +0000 Subject: [PATCH 9/9] Remove workaround --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dd336af..e83e56f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,8 +40,6 @@ builders = pipeline_builder.createBuilders { container -> export PATH=/opt/miniconda/bin:$PATH python --version which python - curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py - python get-pip.py python -m pip install --user -r ${project}/requirements.txt python -m pip install --user -r ${project}/requirements-dev.txt """