From 34c422832bd3ecf3b10cbd6dd1c77a1709855232 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 1 Feb 2019 09:13:47 -0600 Subject: [PATCH 1/3] Fix overindentation --- pudb/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pudb/settings.py b/pudb/settings.py index 2f2f1f6..98a9f5b 100644 --- a/pudb/settings.py +++ b/pudb/settings.py @@ -159,7 +159,7 @@ def edit_config(ui, conf_dict): def _update_line_numbers(): for sl in ui.source: - sl._invalidate() + sl._invalidate() def _update_prompt_on_quit(): pass -- GitLab From 930ba0e7e319f8365b62a625bf622a1feb1dd2a4 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 1 Feb 2019 09:14:03 -0600 Subject: [PATCH 2/3] Garden CI config, do not specify Py3 version --- .gitlab-ci.yml | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32f8a27..53fcc16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,21 +13,6 @@ 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 @@ -43,29 +28,14 @@ Python 2.7: reports: junit: test/pytest.xml -Python 3.6: - script: - - py_version=3.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.txt - - ". ./build-and-test-py-project.sh" - tags: - - python3.6 - - linux - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 3.7: +Python 3: script: - - py_version=3.7 + - py_version=3 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - export REQUIREMENTS_TXT=requirements.dev.txt - ". ./build-and-test-py-project.sh" tags: - - python3.7 + - python3 - linux except: - tags @@ -78,7 +48,7 @@ Flake8: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh - ". ./prepare-and-run-flake8.sh pudb test" tags: - - python3.5 + - python3 except: - tags @@ -88,6 +58,6 @@ Documentation: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh - ". ./build-docs.sh" tags: - - python3.5 + - python3 only: - master -- GitLab From e8a2fedc2527a34a1d6cf2863596eddabef2ddca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 1 Feb 2019 16:52:29 +0100 Subject: [PATCH 3/3] Fix Py2.6 build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53fcc16..46d6c2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ 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.txt + - export REQUIREMENTS_TXT=requirements.dev-2.6.txt - ". ./build-and-test-py-project.sh" tags: - python2.6 -- GitLab