From 4621d44c006967529d58f9fc43c12c9147bc6a0e Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 28 May 2019 18:52:08 -0500 Subject: [PATCH 1/5] Show callable attributes in variables view (Closes gh-342) --- pudb/var_view.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pudb/var_view.py b/pudb/var_view.py index 76b868e..3f602fc 100644 --- a/pudb/var_view.py +++ b/pudb/var_view.py @@ -31,6 +31,7 @@ THE SOFTWARE. # {{{ constants and imports import urwid +import inspect try: import numpy @@ -462,7 +463,7 @@ class ValueWalker: try: attr_value = getattr(value, key) - if callable(attr_value) and not iinfo.show_methods: + if inspect.ismethod(attr_value) and not iinfo.show_methods: cnt_omitted_methods += 1 continue except Exception: -- GitLab From ccafc1a442b8f697d34df29e06946f15d3b30005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 29 May 2019 02:01:30 +0200 Subject: [PATCH 2/5] Install numpy for Gitlab CI --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46d6c2f..5d2ed1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ Python 2.6: - 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 + - export EXTRA_INSTALL="numpy<1.13" - ". ./build-and-test-py-project.sh" tags: - python2.6 @@ -17,6 +18,7 @@ Python 2.7: script: - py_version=2.7 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - export EXTRA_INSTALL="numpy" - export REQUIREMENTS_TXT=requirements.dev.txt - ". ./build-and-test-py-project.sh" tags: @@ -32,6 +34,7 @@ Python 3: script: - py_version=3 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - export EXTRA_INSTALL="numpy" - export REQUIREMENTS_TXT=requirements.dev.txt - ". ./build-and-test-py-project.sh" tags: -- GitLab From 9a0b24716917e36c0d87be76524865f24f29ee7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 29 May 2019 02:01:57 +0200 Subject: [PATCH 3/5] Placate flake8 --- test/test_var_view.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_var_view.py b/test/test_var_view.py index 8d4f385..06fde3c 100644 --- a/test/test_var_view.py +++ b/test/test_var_view.py @@ -28,4 +28,5 @@ def test_get_stringifier(): s = strifier(value) assert isinstance(s, text_type) + test_get_stringifier() -- GitLab From 5240a4935b615c7c73eb08fae4aa71e719a8d369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 29 May 2019 02:03:07 +0200 Subject: [PATCH 4/5] Bump 2.6 numpy requirement even further back --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d2ed1d..6e7e8a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ Python 2.6: - 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 - - export EXTRA_INSTALL="numpy<1.13" + - export EXTRA_INSTALL="numpy<1.12" - ". ./build-and-test-py-project.sh" tags: - python2.6 -- GitLab From c490f072607ef5539887d8349da7809bdb5c243e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Wed, 29 May 2019 02:08:18 +0200 Subject: [PATCH 5/5] Drop Python 2.6 support --- .gitlab-ci.yml | 16 ---------------- .travis.yml | 9 +-------- requirements.dev-2.6.txt | 14 -------------- setup.py | 1 - 4 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 requirements.dev-2.6.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e7e8a4..1d21611 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,3 @@ -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 - - export EXTRA_INSTALL="numpy<1.12" - - ". ./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/.travis.yml b/.travis.yml index d94c83f..fccb0b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,12 @@ language: python python: - - "2.6" - "2.7" - "3.5" - "3.6" # command to install dependencies install: - - | - PY_VER=$(python -c 'import sys; sys.stdout.write("%d.%d" % sys.version_info[:2])') ; \ - if test "$PY_VER" = "2.6"; then \ - pip install -r requirements.dev-2.6.txt; \ - else \ - pip install -r requirements.dev.txt; \ - fi + - pip install -r requirements.dev.txt - "pip install -e ." # command to run tests diff --git a/requirements.dev-2.6.txt b/requirements.dev-2.6.txt deleted file mode 100644 index 85b131b..0000000 --- a/requirements.dev-2.6.txt +++ /dev/null @@ -1,14 +0,0 @@ -# required by codecov. requests 2.20 dropped 2.6 support -requests<2.20 - -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 -six==1.10.0 -urwid==1.3.1 diff --git a/setup.py b/setup.py index 06b576c..3dbbe7e 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,6 @@ setup(name='pudb', "Operating System :: Unix", "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", -- GitLab