diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46d6c2f57eb04c13d580e96b3786c541b9ec2356..1d21611a381de2e1563cd203890a0f5ce06784fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,22 +1,8 @@ -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 - 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 +18,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: diff --git a/.travis.yml b/.travis.yml index d94c83fcdf0e138b3eaecfe64b0fa038ee2f5b0d..fccb0b1d67225ecb32c3981cb8f9e663a5c5aa7e 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/pudb/var_view.py b/pudb/var_view.py index 76b868ecb5cee9d2f10f289fe2aea4b338e7da52..3f602fc36fb1fd56d48737cae0b8ad3bbfea711e 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: diff --git a/requirements.dev-2.6.txt b/requirements.dev-2.6.txt deleted file mode 100644 index 85b131b63dd1320df05f25822a0823be40ecbee3..0000000000000000000000000000000000000000 --- 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 06b576c02555760dcfaf054831591fcd8f28a4bf..3dbbe7e0831d1ff840e10d01da0740bcf177c231 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",