From 97ae90d13cfadf1907ae0073c97b5a2596a62c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 5 Oct 2018 10:44:25 -0400 Subject: [PATCH 1/2] Upgrade pytest-mock in requirements.dev.txt --- requirements.dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.dev.txt b/requirements.dev.txt index 9c82b0b..1f141cc 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -5,7 +5,7 @@ py==1.4.33 Pygments==2.2.0 pytest==3.0.7 pytest-cov==2.4.0 -pytest-mock==1.6.0 +pytest-mock==1.10.0 requests==2.13.0 six==1.10.0 urwid==1.3.1 -- GitLab From ee6a33a01f655428ad42e11eb7db948d8b8507e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 5 Oct 2018 10:51:17 -0400 Subject: [PATCH 2/2] Make separate requirements.txt for Py2.6 --- .gitlab-ci.yml | 15 +++++++++++++++ requirements.dev-2.6.txt | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 requirements.dev-2.6.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b4fc3e..3fa48b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,21 @@ Python 2.6: reports: junit: test/pytest.xml +Python 2.6: + script: + - py_version=2.6 + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - export REQUIREMENTS_TXT=requirements.dev-2.6.txt + - ". ./build-and-test-py-project.sh" + tags: + - python2.6 + - linux + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + Python 2.7: script: - py_version=2.7 diff --git a/requirements.dev-2.6.txt b/requirements.dev-2.6.txt new file mode 100644 index 0000000..9c82b0b --- /dev/null +++ b/requirements.dev-2.6.txt @@ -0,0 +1,11 @@ +codecov==2.0.5 +coverage==4.3.4 +pbr==2.0.0 +py==1.4.33 +Pygments==2.2.0 +pytest==3.0.7 +pytest-cov==2.4.0 +pytest-mock==1.6.0 +requests==2.13.0 +six==1.10.0 +urwid==1.3.1 -- GitLab