From ef9d2ffd8499bf7b1d813a44c1309f77d036c0dd Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 11 Nov 2020 17:16:24 -0500 Subject: [PATCH 1/6] add pandasdmx --- k8/images/pandaSDMX/Dockerfile | 23 +++++++++++++++++++++++ k8/images/pandaSDMX/version | 1 + 2 files changed, 24 insertions(+) create mode 100644 k8/images/pandaSDMX/Dockerfile create mode 100644 k8/images/pandaSDMX/version diff --git a/k8/images/pandaSDMX/Dockerfile b/k8/images/pandaSDMX/Dockerfile new file mode 100644 index 0000000..566c658 --- /dev/null +++ b/k8/images/pandaSDMX/Dockerfile @@ -0,0 +1,23 @@ +# syntax = docker/dockerfile:1.1.7-experimental +ARG FROM +FROM ${FROM} + +WORKDIR /usr/src/app + +# Must build from source to be able to run tests +# https://github.com/dr-leo/pandaSDMX/blob/master/.travis.yml +RUN git clone \ + --branch 1.0.0 \ + --depth 1 \ + https://github.com/dr-leo/pandaSDMX.git \ + . + +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install -r requirements.txt \ + pip install . \ + pytest-custom_exit_code + +RUN python -c "import pandasdmx" + +ENV PYTHON_RECORD_API_FROM_MODULES=pandasdmx +CMD [ "pytest", "-ra", "-m \"not experimental\"", "--verbose", "--suppress-tests-failed-exit-code"] diff --git a/k8/images/pandaSDMX/version b/k8/images/pandaSDMX/version new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/k8/images/pandaSDMX/version @@ -0,0 +1 @@ +1 \ No newline at end of file From 96fad3ea7febed47eab017eb6117723505187735 Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 11 Nov 2020 17:25:17 -0500 Subject: [PATCH 2/6] change to lowecase --- k8/images/pandaSDMX/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8/images/pandaSDMX/Dockerfile b/k8/images/pandaSDMX/Dockerfile index 566c658..8f41c53 100644 --- a/k8/images/pandaSDMX/Dockerfile +++ b/k8/images/pandaSDMX/Dockerfile @@ -4,7 +4,7 @@ FROM ${FROM} WORKDIR /usr/src/app -# Must build from source to be able to run tests +# Instructions taken from: # https://github.com/dr-leo/pandaSDMX/blob/master/.travis.yml RUN git clone \ --branch 1.0.0 \ From 0906dc3fd160f8f673725d36e0f8e19dd8dae9e1 Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 11 Nov 2020 17:26:35 -0500 Subject: [PATCH 3/6] empty commit --- k8/images/{pandaSDMX => pandasdmx2}/Dockerfile | 0 k8/images/{pandaSDMX => pandasdmx2}/version | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename k8/images/{pandaSDMX => pandasdmx2}/Dockerfile (100%) rename k8/images/{pandaSDMX => pandasdmx2}/version (100%) diff --git a/k8/images/pandaSDMX/Dockerfile b/k8/images/pandasdmx2/Dockerfile similarity index 100% rename from k8/images/pandaSDMX/Dockerfile rename to k8/images/pandasdmx2/Dockerfile diff --git a/k8/images/pandaSDMX/version b/k8/images/pandasdmx2/version similarity index 100% rename from k8/images/pandaSDMX/version rename to k8/images/pandasdmx2/version From b40927e7ca299000f0cc98ea06390e7e9379158f Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 11 Nov 2020 17:27:04 -0500 Subject: [PATCH 4/6] force lowercase in directory name --- k8/images/{pandasdmx2 => pandasdmx}/Dockerfile | 0 k8/images/{pandasdmx2 => pandasdmx}/version | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename k8/images/{pandasdmx2 => pandasdmx}/Dockerfile (100%) rename k8/images/{pandasdmx2 => pandasdmx}/version (100%) diff --git a/k8/images/pandasdmx2/Dockerfile b/k8/images/pandasdmx/Dockerfile similarity index 100% rename from k8/images/pandasdmx2/Dockerfile rename to k8/images/pandasdmx/Dockerfile diff --git a/k8/images/pandasdmx2/version b/k8/images/pandasdmx/version similarity index 100% rename from k8/images/pandasdmx2/version rename to k8/images/pandasdmx/version From 3faac03a9285acb901865567259af24494edc375 Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 11 Nov 2020 17:34:45 -0500 Subject: [PATCH 5/6] add requests-mock --- k8/images/pandasdmx/Dockerfile | 1 + k8/images/pandasdmx/version | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/k8/images/pandasdmx/Dockerfile b/k8/images/pandasdmx/Dockerfile index 8f41c53..e32c06f 100644 --- a/k8/images/pandasdmx/Dockerfile +++ b/k8/images/pandasdmx/Dockerfile @@ -15,6 +15,7 @@ RUN git clone \ RUN --mount=type=cache,target=/root/.cache/pip \ pip install -r requirements.txt \ pip install . \ + requests-mock \ pytest-custom_exit_code RUN python -c "import pandasdmx" diff --git a/k8/images/pandasdmx/version b/k8/images/pandasdmx/version index 56a6051..8cfbc90 100644 --- a/k8/images/pandasdmx/version +++ b/k8/images/pandasdmx/version @@ -1 +1 @@ -1 \ No newline at end of file +1.1.1 \ No newline at end of file From 447d5fd46da7c53a7c01294e2ceb5964f87b65c3 Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 11 Nov 2020 17:49:11 -0500 Subject: [PATCH 6/6] fix arguments of pytest --- k8/images/pandasdmx/Dockerfile | 2 +- k8/images/pandasdmx/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k8/images/pandasdmx/Dockerfile b/k8/images/pandasdmx/Dockerfile index e32c06f..ebf2dbe 100644 --- a/k8/images/pandasdmx/Dockerfile +++ b/k8/images/pandasdmx/Dockerfile @@ -21,4 +21,4 @@ RUN --mount=type=cache,target=/root/.cache/pip \ RUN python -c "import pandasdmx" ENV PYTHON_RECORD_API_FROM_MODULES=pandasdmx -CMD [ "pytest", "-ra", "-m \"not experimental\"", "--verbose", "--suppress-tests-failed-exit-code"] +CMD [ "pytest", "-ra", "--verbose", "--suppress-tests-failed-exit-code", "-m", "not experimental"] diff --git a/k8/images/pandasdmx/version b/k8/images/pandasdmx/version index 8cfbc90..8428158 100644 --- a/k8/images/pandasdmx/version +++ b/k8/images/pandasdmx/version @@ -1 +1 @@ -1.1.1 \ No newline at end of file +1.1.2 \ No newline at end of file