alexmojaki · alexmojaki · Oct 12, 2024 · Oct 12, 2024 · Oct 12, 2024 · Oct 12, 2024
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -0,0 +1,31 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ 3.8, 3.9, '3.10', 3.11, 3.12, 3.13 ]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
+    - name: Set up Node
+      uses: actions/setup-node@v4
+    - name: Install chromedriver
+      uses: nanasess/setup-chromedriver@master
+    - name: run tests
+      run: |
+        pip install --upgrade pip
+        pip install .[tests]
+        ./misc/test.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 |logo| birdseye
 ===============
 
-|Build Status| |Supports Python versions 2.7 and 3.5+|
+|Supports Python versions 3.8+|
 
 birdseye is a Python debugger which records the values of expressions in a
 function call and lets you easily view them after the function exits.
@@ -43,9 +43,7 @@ ordered by time, letting you see what happens at a glance:
    :alt: List of function calls
 
 .. |logo| image:: https://i.imgur.com/i7uaJDO.png
-.. |Build Status| image:: https://travis-ci.com/alexmojaki/birdseye.svg?branch=master
-   :target: https://travis-ci.com/alexmojaki/birdseye
-.. |Supports Python versions 2.7 and 3.5+| image:: https://img.shields.io/pypi/pyversions/birdseye.svg
+.. |Supports Python versions 3.8+| image:: https://img.shields.io/pypi/pyversions/birdseye.svg
    :target: https://pypi.python.org/pypi/birdseye
 
 .. inclusion-end-marker

diff --git a/birdseye/bird.py b/birdseye/bird.py
@@ -1,4 +1,5 @@
 import ast
+import builtins
 import hashlib
 import inspect
 import json
@@ -1130,6 +1131,11 @@ def _sample_indices(length, max_length):
                            length))
 
 
+@try_register_repr('numpy', 'int64')
+def _repr_numpy_int(x, _helper):
+    return repr(int(x))
+
+
 @try_register_repr('pandas', 'Series')
 def _repr_series_one_line(x, helper):
     n = len(x)
@@ -1154,20 +1160,18 @@ def is_interesting_expression(node):
     return True. Put differently, return False if this is just a literal.
     """
     return (isinstance(node, ast.expr) and
-            not (isinstance(node, (ast.Num, ast.Str, getattr(ast, 'NameConstant', ()))) or
+            not (isinstance(node, ast.Constant) or
                  isinstance(getattr(node, 'ctx', None),
                             (ast.Store, ast.Del)) or
                  (isinstance(node, ast.UnaryOp) and
                   isinstance(node.op, (ast.UAdd, ast.USub)) and
-                  isinstance(node.operand, ast.Num)) or
+                  isinstance(node.operand, ast.Constant) and
+                  isinstance(node.operand.value, (int, float, complex))) or
                  (isinstance(node, (ast.List, ast.Tuple, ast.Dict)) and
                   not any(is_interesting_expression(n) for n in ast.iter_child_nodes(node)))))
 
 
-# noinspection PyUnresolvedReferences
-builtins_dict = __builtins__
-if not isinstance(builtins_dict, dict):
-    builtins_dict = builtins_dict.__dict__
+builtins_dict: dict = builtins.__dict__  # type: ignore
 
 
 def is_obvious_builtin(node, value):
@@ -1179,4 +1183,4 @@ def is_obvious_builtin(node, value):
     return ((isinstance(node, ast.Name) and
              node.id in builtins_dict and
              builtins_dict[node.id] is value) or
-            isinstance(node, getattr(ast, 'NameConstant', ())))
+            isinstance(node, ast.Constant) and node.value is value)
diff --git a/birdseye/db.py b/birdseye/db.py
@@ -3,6 +3,7 @@
 import os
 import sys
 from contextlib import contextmanager
+from typing import List
 
 from humanize import naturaltime
 from littleutils import select_attrs, retry
@@ -11,23 +12,23 @@
     Index
 from sqlalchemy.dialects.mysql import LONGTEXT
 from sqlalchemy.exc import OperationalError, InterfaceError, InternalError, ProgrammingError, ArgumentError
-from sqlalchemy.ext.declarative import declarative_base, declared_attr
+from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import backref, relationship, sessionmaker
 
 from birdseye.utils import IPYTHON_FILE_PATH, is_ipython_cell
 
-# noinspection PyUnreachableCode
-if False:
-    from typing import List
-
-
 try:
     from sqlalchemy.dialects.mysql.base import RESERVED_WORDS
 except ImportError:
     pass
 else:
     RESERVED_WORDS.add('function')
 
+try:
+    from sqlalchemy.orm import declarative_base
+except ImportError:
+    f
F438
rom sqlalchemy.ext.declarative import declarative_base
+
 
 DB_VERSION = 1
 

diff --git a/birdseye/server.py b/birdseye/server.py
@@ -182,15 +182,6 @@ def ipython_iframe_view(call_id):
                            call_id=call_id)
 
 
-@app.route('/kill', methods=['POST'])
-def kill():
-    func = request.environ.get('werkzeug.server.shutdown')
-    if func is None:
-        raise RuntimeError('Not running with the Werkzeug Server')
-    func()
-    return 'Server shutting down...'
-
-
 @app.route('/api/call/<call_id>')
 @db.provide_session
 def api_call_view(session, call_id):

diff --git a/birdseye/tracer.py b/birdseye/tracer.py
@@ -559,7 +559,7 @@ def _create_simple_marker_call(self, node, func):
         """
         return ast.Call(
             func=ast.Name(id=self.traced_file.trace_methods[func], ctx=ast.Load()),
-            args=[ast.Num(node._tree_index)],
+            args=[ast.Constant(node._tree_index)],
             keywords=[],
         )
 

diff --git a/birdseye/utils.py b/birdseye/utils.py
@@ -248,6 +248,9 @@ def format_pandas_index(index):
     Supports different versions of pandas
     """
     try:
-        return index.format(sparsify=False)
-    except TypeError:
-        return index.format()
+        return index.astype(str)
+    except Exception:
+        try:
+            return index.format(sparsify=False)
+        except TypeError:
+            return index.format()
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -127,19 +127,14 @@ When a function runs
 Testing
 -------
 
-Run ``python setup.py test`` to install test requirements and run all
+Run ``./misc/test.sh`` to install test requirements and run all
 tests with a single Python interpreter. You will need to have
-`phantomjs`_ installed, e.g. via::
-
-    npm install --global phantomjs
+`chromedriver` installed.
 
 Run `tox`_ (``pip install tox``) to run tests on all supported
-versions of Python: 2.7, 3.5, and 3.6. You must install the interpreters
+versions of Python. You must install the interpreters
 separately yourself.
 
-Pushes to GitHub will trigger a build on Travis to run tests
-automatically. This will run ``misc/travis_test.sh``.
-
 ``test_against_files``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -159,13 +154,10 @@ interpreters, so tox is recommended.
 Browser screenshots for test failures
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``test_interface.py`` runs a test using selenium and phantomjs. If it
+``test_interface.py`` runs a test using selenium and headless Chrome. If it
 fails, it produces a file ``error_screenshot.png`` which is helpful for
-debugging the failure locally. If the test only fails on travis, you can
-use the ``misc/travis_screenshot.py`` script to obtain the screenshot. See
-the module docstring for details.
+debugging the failure locally.
 
-.. _phantomjs: http://phantomjs.org/download.html
 .. _tox: https://tox.readthedocs.io/en/latest/
 
 

diff --git a/misc/travis_test.sh → misc/test.sh b/misc/travis_test.sh → misc/test.sh
@@ -2,9 +2,9 @@
 
 set -eux
 
-sudo cp node_modules/chromedriver/lib/chromedriver/chromedriver /usr/local/bin/chromedriver
-
-pip install -e .
+which python
+python --version
+python -m gunicorn --version
 
 export DB=${DB:-sqlite}
 
@@ -24,12 +24,11 @@ else
     exit 1
 fi
 
-export BIRDSEYE_SERVER_RUNNING=true
-gunicorn -b 127.0.0.1:7777 birdseye.server:app &
+python -m gunicorn -b 127.0.0.1:7777 birdseye.server:app &
 
 set +e
 
-pytest -vv
+python -m pytest -vv
 result=$?
 kill $(ps aux | grep birdseye.server:app | grep -v grep | awk '{print $2}')
 exit ${result}
diff --git a/misc/travis_screenshot.py b/misc/travis_screenshot.py
diff --git a/setup.cfg b/setup.cfg
@@ -10,14 +10,13 @@ long_description_content_type = text/x-rst
 classifiers =
     Intended Audience :: Developers
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
     Topic :: Software Development :: Debuggers
@@ -33,32 +32,24 @@ install_requires =
     cheap_repr
     outdated
     cached_property
-    backports.functools_lru_cache; python_version == "2.7"
 
 setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3
+python_requires = >=3.8
 include_package_data = True
-tests_require =
-    bs4
-    selenium
-    requests
-    pytest
-    numpy>=1.16.5
-    pandas
 
 test_suite = tests
 
 [options.extras_require]
 tests =
     bs4
     selenium
-    requests
     pytest
-    numpy>=1.16.5
+    numpy
     pandas
+    gunicorn
+    twine
+    build
 
 [options.entry_points]
 console_scripts =
     birdseye = birdseye.server:main
-
-[bdist_wheel]
-universal=1