Support 3.12 and drop 3.7 (#99)

.github/workflows/build_test.yaml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
@@ -38,14 +38,14 @@ jobs:
     - name: Build dist and test with unittest
       if: matrix.os != 'windows-latest'
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         if [ -f requirements-test.txt ]; then pip install -r requirements-test.txt; fi
         pip install dist/*.whl
         python -m unittest
     - name: Build dist and test with unittest on Windows
       if: matrix.os == 'windows-latest'
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         if (Test-Path -Path '.\requirements-test.txt' -PathType Leaf) {pip install -r requirements-test.txt}
         pip install (Get-ChildItem dist/*.whl)
         python -m unittest

.github/workflows/lint.yaml

@@ -7,14 +7,17 @@ on:
     branches: [ master ]
 
 jobs:
-  flake8-lint:
+  lint:
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: ${{ matrix.python-version }}
       - name: Install flake8
         run: pip install flake8
       - name: Run flake8

.github/workflows/release.yaml

@@ -16,10 +16,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install twine setuptools wheel
+        pip install build twine setuptools wheel
     - name: Build source tar
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
     - name: Publish wheels to PyPI
       continue-on-error: true
       env:

Makefile

@@ -1,14 +1,14 @@
 refresh: clean build install lint
 
 build:
-	python setup.py build
+	python -m build	
 
 install: 
-	python setup.py install
+	pip install .	
 
 build_dist:
 	make clean
-	python setup.py sdist bdist_wheel
+	python -m build
 	pip install dist/*.whl
 	make test
 

NOTICE.txt

@@ -1,4 +1,4 @@
-Copyright 2020-2021 Tian Gao 
+Copyright 2020-2023 Tian Gao 
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -449,6 +449,6 @@ Please send bug reports and feature requests through [github issue tracker](http
 
 ## License
 
-Copyright Tian Gao, 2020-2021.
+Copyright 2020-2023 Tian Gao.
 
 Distributed under the terms of the  [Apache 2.0 license](https://github.com/gaogaotiantian/objprint/blob/master/LICENSE).

pyproject.toml

@@ -0,0 +1,29 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "objprint"
+authors = [{name = "Tian Gao", email = "[email protected]"}]
+description = "A library that can print Python objects in human readable format"
+readme = "README.md"
+requires-python = ">=3.6"
+license = {file = "LICENSE"}
+dynamic = ["version"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "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",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent"
+]
+
+[project.urls]
+Homepage = "https://github.com/gaogaotiantian/objprint"
+
+[tool.setuptools.dynamic]
+version = {attr = "objprint.__version__"}

requirements-dev.txt

@@ -1,3 +1,4 @@
+build
 flake8
 setuptools
 wheel

src/objprint/frame_analyzer.py

@@ -4,7 +4,6 @@
 import ast
 import inspect
 import io
-import sys
 import tokenize
 from types import FrameType
 from typing import List, Optional
@@ -60,48 +59,7 @@ def get_executing_function_call_str(self, frame: FrameType) -> Optional[str]:
         except OSError:
             return None
 
-        if sys.version_info < (3, 8):
-            return self.get_source_segment3637(source, node)
-        else:
-            return ast.get_source_segment(source, node)
-
-    def get_source_segment3637(self, source: str, node: ast.AST) -> str:
-        if node.lineno is None or node.col_offset is None:  # pragma: no cover
-            return None
-        lineno = node.lineno - 1
-        lines = self._splitlines_no_ff(source)
-        first_line = lines[lineno].encode()[node.col_offset:].decode()
-        lines = lines[lineno + 1:]
-        lines.insert(0, first_line)
-        return "".join(lines)
-
-    def _splitlines_no_ff(self, source: str) -> List[str]:  # pragma: no cover
-        """Split a string into lines ignoring form feed and other chars.
-        This mimics how the Python parser splits source code.
-
-        :copyright: Copyright 2008 by Armin Ronacher.
-        :license: Python License.
-        from https://github.com/python/cpython/blob/main/Lib/ast.py
-        license: https://github.com/python/cpython/blob/main/LICENSE
-        """
-        idx = 0
-        lines = []
-        next_line = ''
-        while idx < len(source):
-            c = source[idx]
-            next_line += c
-            idx += 1
-            # Keep \r\n together
-            if c == '\r' and idx < len(source) and source[idx] == '\n':
-                next_line += '\n'
-                idx += 1
-            if c in '\r\n':
-                lines.append(next_line)
-                next_line = ''
-
-        if next_line:
-            lines.append(next_line)
-        return lines
+        return ast.get_source_segment(source, node)
 
     def return_object(self, frame: Optional[FrameType]) -> bool:
         if frame is None:

src/objprint/objprint.py

@@ -231,7 +231,7 @@ def _get_line(key: str) -> str:
             if cfg.label and any(re.fullmatch(pattern, key) is not None for pattern in cfg.label):
                 return set_color(f".{key} = {val}", COLOR.YELLOW)
             elif cfg.color:
-                return f"{set_color('.'+key, COLOR.GREEN)} = {val}"
+                return f"{set_color('.' + key, COLOR.GREEN)} = {val}"
             else:
                 return f".{key} = {val}"
 

tests/test_basic.py

@@ -71,7 +71,7 @@ def test_formatter(self):
             op(a)
             self.assertEqual(buf.getvalue(), "[0xa, 0xd, 0x10]\n")
 
-        op.register_formatter(float, lambda x: f"Float: {round(x,3)}")
+        op.register_formatter(float, lambda x: f"Float: {round(x, 3)}")
         with io.StringIO() as buf, redirect_stdout(buf):
             op(3.14159)
             self.assertEqual(buf.getvalue(), "Float: 3.142\n")