From 1120d8a3b782ff581ea0b661f83a65290bcee381 Mon Sep 17 00:00:00 2001 From: Dan Rollo Date: Mon, 8 Nov 2021 14:11:16 -0500 Subject: [PATCH] happy headers, now the build... --- Dockerfile | 10 +++------- Jenkinsfile | 8 +++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 91e93b8..18c43f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,12 +28,8 @@ WORKDIR /home/jenkins ENV PATH=/home/jenkins/.local/bin:/home/jenkins/bin:$PATH -COPY requirements.txt . - -RUN pip install -r requirements.txt - -RUN pip install pylint - -RUN pip install unittest-xml-reporting +RUN python -m ensurepip --default-pip +RUN pip install --upgrade pip +RUN pip install poetry CMD ["/bin/bash"] diff --git a/Jenkinsfile b/Jenkinsfile index 3a90c00..e35eaee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,11 +19,9 @@ dockerizedBuildPipeline( buildAndTest: { sh ''' - # development only requirements - pip3 install -r requirements-dev.txt - python -m xmlrunner discover -o test-results/ - # hot mess to uninstall dev requirements before we self scan. probably should move to pipenv - pip3 uninstall -r requirements-dev.txt -y + poetry install + poetry build + poetry run tox ''' }, deployBranch: 'main',