diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 02fd6ef..2024805 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.7.1 +current_version = 1.11.0 commit = True tag = True @@ -22,3 +22,7 @@ replace = version = release = '{new_version}' [bumpversion:file:src/lazy_object_proxy/__init__.py] search = __version__ = '{current_version}' replace = __version__ = '{new_version}' + +[bumpversion:file:.cookiecutterrc] +search = version: {current_version} +replace = version: {new_version} diff --git a/.cookiecutterrc b/.cookiecutterrc index 0957031..94d8547 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -1,55 +1,47 @@ # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher) default_context: - allow_tests_inside_package: no - appveyor: no - c_extension_function: '-' - c_extension_module: '-' - c_extension_optional: yes - c_extension_support: yes - c_extension_test_pypi: yes - c_extension_test_pypi_username: ionel - codacy: no + c_extension_optional: 'yes' + c_extension_support: 'yes' + codacy: 'no' codacy_projectid: 862e7946eabb4112be6503a667381b71 - codeclimate: no - codecov: yes - command_line_interface: no + codeclimate: 'no' + codecov: 'yes' + command_line_interface: 'no' command_line_interface_bin_name: '-' - coveralls: yes + coveralls: 'yes' distribution_name: lazy-object-proxy email: contact@ionelmc.ro + formatter_quote_style: single full_name: Ionel Cristian Mărieș - github_actions: yes - legacy_python: no + function_name: compute + github_actions: 'yes' + github_actions_osx: 'yes' + github_actions_windows: 'yes' license: BSD 2-Clause License - linter: flake8 + module_name: cext package_name: lazy_object_proxy - pre_commit: yes + pre_commit: 'yes' project_name: lazy-object-proxy project_short_description: A fast and thorough lazy object proxy. - pypi_badge: yes - pypi_disable_upload: no - release_date: '2021-03-22' + pypi_badge: 'yes' + pypi_disable_upload: 'no' + release_date: '2023-12-15' repo_hosting: github.com repo_hosting_domain: github.com repo_main_branch: master repo_name: python-lazy-object-proxy repo_username: ionelmc - requiresio: yes - scrutinizer: no - setup_py_uses_setuptools_scm: yes - setup_py_uses_test_runner: no - sphinx_docs: yes + scrutinizer: 'no' + setup_py_uses_setuptools_scm: 'yes' + sphinx_docs: 'yes' sphinx_docs_hosting: https://python-lazy-object-proxy.readthedocs.io/ - sphinx_doctest: no - sphinx_theme: sphinx-py3doc-enhanced-theme - test_matrix_configurator: no - test_matrix_separate_coverage: yes - test_runner: pytest - travis: no - travis_osx: no - version: 1.6.0 + sphinx_doctest: 'no' + sphinx_theme: furo + test_matrix_separate_coverage: 'yes' + tests_inside_package: 'no' + version: 1.11.0 version_manager: bump2version website: https://blog.ionelmc.ro year_from: '2014' - year_to: '2021' + year_to: '2024' diff --git a/.git-archival.txt b/.git-archival.txt new file mode 100644 index 0000000..8fb235d --- /dev/null +++ b/.git-archival.txt @@ -0,0 +1,4 @@ +node: $Format:%H$ +node-date: $Format:%cI$ +describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ +ref-names: $Format:%D$ diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a94cb2f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.git_archival.txt export-subst diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 28a4b2c..29983d8 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -1,5 +1,5 @@ name: build -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: test: name: ${{ matrix.name }} @@ -10,526 +10,702 @@ jobs: matrix: include: - name: 'check' - python: '3.9' - toxpython: 'python3.9' + python: '3.11' + toxpython: 'python3.11' tox_env: 'check' os: 'ubuntu-latest' - name: 'docs' - python: '3.9' - toxpython: 'python3.9' + python: '3.11' + toxpython: 'python3.11' tox_env: 'docs' os: 'ubuntu-latest' - - name: 'py36-cover (ubuntu/x86_64)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-cover,codecov' - cibw_arch: 'x86_64' - cibw_build: false - os: 'ubuntu-latest' - - name: 'py36-cover (windows/AMD64)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-cover,codecov' - cibw_arch: 'AMD64' - cibw_build: false - os: 'windows-latest' - - name: 'py36-cover (macos/x86_64)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-cover,codecov' - cibw_arch: 'x86_64' - cibw_build: false - os: 'macos-latest' - - name: 'py36-nocov (ubuntu/x86_64/manylinux)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp36-*manylinux*' - os: 'ubuntu-latest' - - name: 'py36-nocov (ubuntu/x86_64/musllinux)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp36-*musllinux*' - os: 'ubuntu-latest' - - name: 'py36-nocov (ubuntu/aarch64/manylinux)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-nocov' - cibw_arch: 'aarch64' - cibw_build: 'cp36-*manylinux*' - os: 'ubuntu-latest' - - name: 'py36-nocov (ubuntu/aarch64/musllinux)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-nocov' - cibw_arch: 'aarch64' - cibw_build: 'cp36-*musllinux*' - os: 'ubuntu-latest' - - name: 'py36-nocov (windows/AMD64)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-nocov' - cibw_arch: 'AMD64' - cibw_build: 'cp36-*' - os: 'windows-latest' - - name: 'py36-nocov (windows/x86)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x86' - tox_env: 'py36-nocov' - cibw_arch: 'x86' - cibw_build: 'cp36-*' - os: 'windows-latest' - - name: 'py36-nocov (macos/x86_64)' - python: '3.6' - toxpython: 'python3.6' - python_arch: 'x64' - tox_env: 'py36-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp36-*' - os: 'macos-latest' - - name: 'py37-cover (ubuntu/x86_64)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-cover,codecov' - cibw_arch: 'x86_64' - cibw_build: false - os: 'ubuntu-latest' - - name: 'py37-cover (windows/AMD64)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-cover,codecov' - cibw_arch: 'AMD64' - cibw_build: false - os: 'windows-latest' - - name: 'py37-cover (macos/x86_64)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-cover,codecov' - cibw_arch: 'x86_64' - cibw_build: false - os: 'macos-latest' - - name: 'py37-nocov (ubuntu/x86_64/manylinux)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp37-*manylinux*' - os: 'ubuntu-latest' - - name: 'py37-nocov (ubuntu/x86_64/musllinux)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp37-*musllinux*' - os: 'ubuntu-latest' - - name: 'py37-nocov (ubuntu/aarch64/manylinux)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-nocov' - cibw_arch: 'aarch64' - cibw_build: 'cp37-*manylinux*' - os: 'ubuntu-latest' - - name: 'py37-nocov (ubuntu/aarch64/musllinux)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-nocov' - cibw_arch: 'aarch64' - cibw_build: 'cp37-*musllinux*' - os: 'ubuntu-latest' - - name: 'py37-nocov (windows/AMD64)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-nocov' - cibw_arch: 'AMD64' - cibw_build: 'cp37-*' - os: 'windows-latest' - - name: 'py37-nocov (windows/x86)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x86' - tox_env: 'py37-nocov' - cibw_arch: 'x86' - cibw_build: 'cp37-*' - os: 'windows-latest' - - name: 'py37-nocov (macos/x86_64)' - python: '3.7' - toxpython: 'python3.7' - python_arch: 'x64' - tox_env: 'py37-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp37-*' - os: 'macos-latest' - - name: 'py38-cover (ubuntu/x86_64)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-cover,codecov' - cibw_arch: 'x86_64' - cibw_build: false - os: 'ubuntu-latest' - - name: 'py38-cover (windows/AMD64)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-cover,codecov' - cibw_arch: 'AMD64' - cibw_build: false - os: 'windows-latest' - - name: 'py38-cover (macos/x86_64)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-cover,codecov' - cibw_arch: 'x86_64' - cibw_build: false - os: 'macos-latest' - - name: 'py38-nocov (ubuntu/x86_64/manylinux)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp38-*manylinux*' - os: 'ubuntu-latest' - - name: 'py38-nocov (ubuntu/x86_64/musllinux)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp38-*musllinux*' - os: 'ubuntu-latest' - - name: 'py38-nocov (ubuntu/aarch64/manylinux)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - cibw_arch: 'aarch64' - cibw_build: 'cp38-*manylinux*' - os: 'ubuntu-latest' - - name: 'py38-nocov (ubuntu/aarch64/musllinux)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - cibw_arch: 'aarch64' - cibw_build: 'cp38-*musllinux*' - os: 'ubuntu-latest' - - name: 'py38-nocov (windows/AMD64)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - cibw_arch: 'AMD64' - cibw_build: 'cp38-*' - os: 'windows-latest' - - name: 'py38-nocov (windows/x86)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x86' - tox_env: 'py38-nocov' - cibw_arch: 'x86' - cibw_build: 'cp38-*' - os: 'windows-latest' - - name: 'py38-nocov (macos/x86_64)' - python: '3.8' - toxpython: 'python3.8' - python_arch: 'x64' - tox_env: 'py38-nocov' - cibw_arch: 'x86_64' - cibw_build: 'cp38-*' - os: 'macos-latest' - name: 'py39-cover (ubuntu/x86_64)' + artifact: 'py39-ubuntu-x86_64' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' - tox_env: 'py39-cover,codecov' + tox_env: 'py39-cover' + cover: true cibw_arch: 'x86_64' cibw_build: false os: 'ubuntu-latest' - name: 'py39-cover (windows/AMD64)' + artifact: 'py39-windows-AMD64' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' - tox_env: 'py39-cover,codecov' + tox_env: 'py39-cover' + cover: true cibw_arch: 'AMD64' cibw_build: false os: 'windows-latest' - - name: 'py39-cover (macos/x86_64)' + - name: 'py39-cover (macos/arm64)' + artifact: 'py39-macos-arm64' python: '3.9' toxpython: 'python3.9' - python_arch: 'x64' - tox_env: 'py39-cover,codecov' - cibw_arch: 'x86_64' + python_arch: 'arm64' + tox_env: 'py39-cover' + cover: true + cibw_arch: 'arm64' cibw_build: false os: 'macos-latest' - name: 'py39-nocov (ubuntu/x86_64/manylinux)' + artifact: 'py39-ubuntu-x86_64-manylinux' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-nocov' cibw_arch: 'x86_64' cibw_build: 'cp39-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (ubuntu/x86_64/musllinux)' + artifact: 'py39-ubuntu-x86_64-musllinux' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-nocov' cibw_arch: 'x86_64' cibw_build: 'cp39-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (ubuntu/aarch64/manylinux)' + artifact: 'py39-ubuntu-aarch64-manylinux' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-nocov' cibw_arch: 'aarch64' cibw_build: 'cp39-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (ubuntu/aarch64/musllinux)' + artifact: 'py39-ubuntu-aarch64-musllinux' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-nocov' cibw_arch: 'aarch64' cibw_build: 'cp39-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py39-nocov (windows/AMD64)' + artifact: 'py39-windows-AMD64' python: '3.9' toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39-nocov' cibw_arch: 'AMD64' cibw_build: 'cp39-*' + cibw_ft: 'false' os: 'windows-latest' - - name: 'py39-nocov (windows/x86)' + - name: 'py39-nocov (macos/arm64)' + artifact: 'py39-macos-arm64' python: '3.9' toxpython: 'python3.9' - python_arch: 'x86' + python_arch: 'arm64' tox_env: 'py39-nocov' - cibw_arch: 'x86' - cibw_build: 'cp39-*' - os: 'windows-latest' - - name: 'py39-nocov (macos/x86_64)' - python: '3.9' - toxpython: 'python3.9' - python_arch: 'x64' - tox_env: 'py39-nocov' - cibw_arch: 'x86_64' + cibw_arch: 'arm64' cibw_build: 'cp39-*' + cibw_ft: 'false' os: 'macos-latest' - name: 'py310-cover (ubuntu/x86_64)' + artifact: 'py310-ubuntu-x86_64' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' - tox_env: 'py310-cover,codecov' + tox_env: 'py310-cover' + cover: true cibw_arch: 'x86_64' cibw_build: false os: 'ubuntu-latest' - name: 'py310-cover (windows/AMD64)' + artifact: 'py310-windows-AMD64' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' - tox_env: 'py310-cover,codecov' + tox_env: 'py310-cover' + cover: true cibw_arch: 'AMD64' cibw_build: false os: 'windows-latest' - - name: 'py310-cover (macos/x86_64)' + - name: 'py310-cover (macos/arm64)' + artifact: 'py310-macos-arm64' python: '3.10' toxpython: 'python3.10' - python_arch: 'x64' - tox_env: 'py310-cover,codecov' - cibw_arch: 'x86_64' + python_arch: 'arm64' + tox_env: 'py310-cover' + cover: true + cibw_arch: 'arm64' cibw_build: false os: 'macos-latest' - name: 'py310-nocov (ubuntu/x86_64/manylinux)' + artifact: 'py310-ubuntu-x86_64-manylinux' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-nocov' cibw_arch: 'x86_64' cibw_build: 'cp310-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (ubuntu/x86_64/musllinux)' + artifact: 'py310-ubuntu-x86_64-musllinux' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-nocov' cibw_arch: 'x86_64' cibw_build: 'cp310-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (ubuntu/aarch64/manylinux)' + artifact: 'py310-ubuntu-aarch64-manylinux' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-nocov' cibw_arch: 'aarch64' cibw_build: 'cp310-*manylinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (ubuntu/aarch64/musllinux)' + artifact: 'py310-ubuntu-aarch64-musllinux' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-nocov' cibw_arch: 'aarch64' cibw_build: 'cp310-*musllinux*' + cibw_ft: 'false' os: 'ubuntu-latest' - name: 'py310-nocov (windows/AMD64)' + artifact: 'py310-windows-AMD64' python: '3.10' toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310-nocov' cibw_arch: 'AMD64' cibw_build: 'cp310-*' + cibw_ft: 'false' os: 'windows-latest' - - name: 'py310-nocov (windows/x86)' + - name: 'py310-nocov (macos/arm64)' + artifact: 'py310-macos-arm64' python: '3.10' toxpython: 'python3.10' - python_arch: 'x86' + python_arch: 'arm64' tox_env: 'py310-nocov' - cibw_arch: 'x86' + cibw_arch: 'arm64' cibw_build: 'cp310-*' + cibw_ft: 'false' + os: 'macos-latest' + - name: 'py311-cover (ubuntu/x86_64)' + artifact: 'py311-ubuntu-x86_64' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-cover' + cover: true + cibw_arch: 'x86_64' + cibw_build: false + os: 'ubuntu-latest' + - name: 'py311-cover (windows/AMD64)' + artifact: 'py311-windows-AMD64' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-cover' + cover: true + cibw_arch: 'AMD64' + cibw_build: false os: 'windows-latest' - - name: 'py310-nocov (macos/x86_64)' - python: '3.10' - toxpython: 'python3.10' + - name: 'py311-cover (macos/arm64)' + artifact: 'py311-macos-arm64' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'arm64' + tox_env: 'py311-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'py311-nocov (ubuntu/x86_64/manylinux)' + artifact: 'py311-ubuntu-x86_64-manylinux' + python: '3.11' + toxpython: 'python3.11' python_arch: 'x64' - tox_env: 'py310-nocov' + tox_env: 'py311-nocov' cibw_arch: 'x86_64' - cibw_build: 'cp310-*' + cibw_build: 'cp311-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py311-nocov (ubuntu/x86_64/musllinux)' + artifact: 'py311-ubuntu-x86_64-musllinux' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp311-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py311-nocov (ubuntu/aarch64/manylinux)' + artifact: 'py311-ubuntu-aarch64-manylinux' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp311-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py311-nocov (ubuntu/aarch64/musllinux)' + artifact: 'py311-ubuntu-aarch64-musllinux' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp311-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py311-nocov (windows/AMD64)' + artifact: 'py311-windows-AMD64' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'x64' + tox_env: 'py311-nocov' + cibw_arch: 'AMD64' + cibw_build: 'cp311-*' + cibw_ft: 'false' + os: 'windows-latest' + - name: 'py311-nocov (macos/arm64)' + artifact: 'py311-macos-arm64' + python: '3.11' + toxpython: 'python3.11' + python_arch: 'arm64' + tox_env: 'py311-nocov' + cibw_arch: 'arm64' + cibw_build: 'cp311-*' + cibw_ft: 'false' os: 'macos-latest' - - name: 'pypy37-cover (ubuntu/x86_64)' - python: 'pypy-3.7' - toxpython: 'pypy3.7' + - name: 'py312-cover (ubuntu/x86_64)' + artifact: 'py312-ubuntu-x86_64' + python: '3.12' + toxpython: 'python3.12' python_arch: 'x64' - tox_env: 'pypy37-cover,codecov' + tox_env: 'py312-cover' + cover: true cibw_arch: 'x86_64' cibw_build: false os: 'ubuntu-latest' - - name: 'pypy37-cover (windows/AMD64)' - python: 'pypy-3.7' - toxpython: 'pypy3.7' + - name: 'py312-cover (windows/AMD64)' + artifact: 'py312-windows-AMD64' + python: '3.12' + toxpython: 'python3.12' python_arch: 'x64' - tox_env: 'pypy37-cover,codecov' + tox_env: 'py312-cover' + cover: true cibw_arch: 'AMD64' cibw_build: false os: 'windows-latest' - - name: 'pypy37-cover (macos/x86_64)' - python: 'pypy-3.7' - toxpython: 'pypy3.7' + - name: 'py312-cover (macos/arm64)' + artifact: 'py312-macos-arm64' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'arm64' + tox_env: 'py312-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'py312-nocov (ubuntu/x86_64/manylinux)' + artifact: 'py312-ubuntu-x86_64-manylinux' + python: '3.12' + toxpython: 'python3.12' python_arch: 'x64' - tox_env: 'pypy37-cover,codecov' + tox_env: 'py312-nocov' cibw_arch: 'x86_64' - cibw_build: false + cibw_build: 'cp312-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py312-nocov (ubuntu/x86_64/musllinux)' + artifact: 'py312-ubuntu-x86_64-musllinux' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'x64' + tox_env: 'py312-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp312-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py312-nocov (ubuntu/aarch64/manylinux)' + artifact: 'py312-ubuntu-aarch64-manylinux' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'x64' + tox_env: 'py312-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp312-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py312-nocov (ubuntu/aarch64/musllinux)' + artifact: 'py312-ubuntu-aarch64-musllinux' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'x64' + tox_env: 'py312-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp312-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py312-nocov (windows/AMD64)' + artifact: 'py312-windows-AMD64' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'x64' + tox_env: 'py312-nocov' + cibw_arch: 'AMD64' + cibw_build: 'cp312-*' + cibw_ft: 'false' + os: 'windows-latest' + - name: 'py312-nocov (macos/arm64)' + artifact: 'py312-macos-arm64' + python: '3.12' + toxpython: 'python3.12' + python_arch: 'arm64' + tox_env: 'py312-nocov' + cibw_arch: 'arm64' + cibw_build: 'cp312-*' + cibw_ft: 'false' os: 'macos-latest' - - name: 'pypy37-nocov (ubuntu/x86_64/manylinux)' - python: 'pypy-3.7' - toxpython: 'pypy3.7' + - name: 'py313-cover (ubuntu/x86_64)' + artifact: 'py313-ubuntu-x86_64' + python: '3.13' + toxpython: 'python3.13' python_arch: 'x64' - tox_env: 'pypy37-nocov' + tox_env: 'py313-cover' + cover: true cibw_arch: 'x86_64' cibw_build: false os: 'ubuntu-latest' - - name: 'pypy37-nocov (windows/AMD64)' - python: 'pypy-3.7' - toxpython: 'pypy3.7' + - name: 'py313-cover (windows/AMD64)' + artifact: 'py313-windows-AMD64' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-cover' + cover: true + cibw_arch: 'AMD64' + cibw_build: false + os: 'windows-latest' + - name: 'py313-cover (macos/arm64)' + artifact: 'py313-macos-arm64' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'arm64' + tox_env: 'py313-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'py313-nocov (ubuntu/x86_64/manylinux)' + artifact: 'py313-ubuntu-x86_64-manylinux' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (ubuntu/x86_64/musllinux)' + artifact: 'py313-ubuntu-x86_64-musllinux' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (ubuntu/aarch64/manylinux)' + artifact: 'py313-ubuntu-aarch64-manylinux' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313-*manylinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (ubuntu/aarch64/musllinux)' + artifact: 'py313-ubuntu-aarch64-musllinux' + python: '3.13' + toxpython: 'python3.13' python_arch: 'x64' - tox_env: 'pypy37-nocov' + tox_env: 'py313-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313-*musllinux*' + cibw_ft: 'false' + os: 'ubuntu-latest' + - name: 'py313-nocov (windows/AMD64)' + artifact: 'py313-windows-AMD64' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'x64' + tox_env: 'py313-nocov' + cibw_arch: 'AMD64' + cibw_build: 'cp313-*' + cibw_ft: 'false' + os: 'windows-latest' + - name: 'py313-nocov (macos/arm64)' + artifact: 'py313-macos-arm64' + python: '3.13' + toxpython: 'python3.13' + python_arch: 'arm64' + tox_env: 'py313-nocov' + cibw_arch: 'arm64' + cibw_build: 'cp313-*' + cibw_ft: 'false' + os: 'macos-latest' + - name: 'py313-ft-cover (ubuntu/x86_64)' + artifact: 'py313-ft-ubuntu-x86_64' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-cover' + cover: true + cibw_arch: 'x86_64' + cibw_build: false + os: 'ubuntu-latest' + - name: 'py313-ft-cover (windows/AMD64)' + artifact: 'py313-ft-windows-AMD64' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-cover' + cover: true cibw_arch: 'AMD64' cibw_build: false os: 'windows-latest' - - name: 'pypy37-nocov (macos/x86_64)' - python: 'pypy-3.7' - toxpython: 'pypy3.7' + - name: 'py313-ft-cover (macos/arm64)' + artifact: 'py313-ft-macos-arm64' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'arm64-freethreaded' + tox_env: 'py313-ft-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'py313-ft-nocov (ubuntu/x86_64/manylinux)' + artifact: 'py313-ft-ubuntu-x86_64-manylinux' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313t-*manylinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313-ft-nocov (ubuntu/x86_64/musllinux)' + artifact: 'py313-ft-ubuntu-x86_64-musllinux' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-nocov' + cibw_arch: 'x86_64' + cibw_build: 'cp313t-*musllinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313-ft-nocov (ubuntu/aarch64/manylinux)' + artifact: 'py313-ft-ubuntu-aarch64-manylinux' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313t-*manylinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313-ft-nocov (ubuntu/aarch64/musllinux)' + artifact: 'py313-ft-ubuntu-aarch64-musllinux' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-nocov' + cibw_arch: 'aarch64' + cibw_build: 'cp313t-*musllinux*' + cibw_ft: 'true' + os: 'ubuntu-latest' + - name: 'py313-ft-nocov (windows/AMD64)' + artifact: 'py313-ft-windows-AMD64' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'x64-freethreaded' + tox_env: 'py313-ft-nocov' + cibw_arch: 'AMD64' + cibw_build: 'cp313t-*' + cibw_ft: 'true' + os: 'windows-latest' + - name: 'py313-ft-nocov (macos/arm64)' + artifact: 'py313-ft-macos-arm64' + python: '3.13' + toxpython: 'python3.13t' + python_arch: 'arm64-freethreaded' + tox_env: 'py313-ft-nocov' + cibw_arch: 'arm64' + cibw_build: 'cp313t-*' + cibw_ft: 'true' + os: 'macos-latest' + - name: 'pypy39-cover (ubuntu/x86_64)' + artifact: 'pypy39-ubuntu-x86_64' + python: 'pypy-3.9' + toxpython: 'pypy3.9' python_arch: 'x64' - tox_env: 'pypy37-nocov' + tox_env: 'pypy39-cover' + cover: true cibw_arch: 'x86_64' cibw_build: false + os: 'ubuntu-latest' + - name: 'pypy39-cover (windows/AMD64)' + artifact: 'pypy39-windows-AMD64' + python: 'pypy-3.9' + toxpython: 'pypy3.9' + python_arch: 'x64' + tox_env: 'pypy39-cover' + cover: true + cibw_arch: 'AMD64' + cibw_build: false + os: 'windows-latest' + - name: 'pypy39-cover (macos/arm64)' + artifact: 'pypy39-macos-arm64' + python: 'pypy-3.9' + toxpython: 'pypy3.9' + python_arch: 'arm64' + tox_env: 'pypy39-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false os: 'macos-latest' - - name: 'pypy38-cover (ubuntu/x86_64)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' + - name: 'pypy39-nocov (ubuntu/x86_64/manylinux)' + artifact: 'pypy39-ubuntu-x86_64-manylinux' + python: 'pypy-3.9' + toxpython: 'pypy3.9' python_arch: 'x64' - tox_env: 'pypy38-cover,codecov' + tox_env: 'pypy39-nocov' cibw_arch: 'x86_64' cibw_build: false os: 'ubuntu-latest' - - name: 'pypy38-cover (windows/AMD64)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' + - name: 'pypy39-nocov (windows/AMD64)' + artifact: 'pypy39-windows-AMD64' + python: 'pypy-3.9' + toxpython: 'pypy3.9' python_arch: 'x64' - tox_env: 'pypy38-cover,codecov' + tox_env: 'pypy39-nocov' cibw_arch: 'AMD64' cibw_build: false os: 'windows-latest' - - name: 'pypy38-cover (macos/x86_64)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' + - name: 'pypy39-nocov (macos/arm64)' + artifact: 'pypy39-macos-arm64' + python: 'pypy-3.9' + toxpython: 'pypy3.9' + python_arch: 'arm64' + tox_env: 'pypy39-nocov' + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'pypy310-cover (ubuntu/x86_64)' + artifact: 'pypy310-ubuntu-x86_64' + python: 'pypy-3.10' + toxpython: 'pypy3.10' python_arch: 'x64' - tox_env: 'pypy38-cover,codecov' + tox_env: 'pypy310-cover' + cover: true cibw_arch: 'x86_64' cibw_build: false + os: 'ubuntu-latest' + - name: 'pypy310-cover (windows/AMD64)' + artifact: 'pypy310-windows-AMD64' + python: 'pypy-3.10' + toxpython: 'pypy3.10' + python_arch: 'x64' + tox_env: 'pypy310-cover' + cover: true + cibw_arch: 'AMD64' + cibw_build: false + os: 'windows-latest' + - name: 'pypy310-cover (macos/arm64)' + artifact: 'pypy310-macos-arm64' + python: 'pypy-3.10' + toxpython: 'pypy3.10' + python_arch: 'arm64' + tox_env: 'pypy310-cover' + cover: true + cibw_arch: 'arm64' + cibw_build: false os: 'macos-latest' - - name: 'pypy38-nocov (ubuntu/x86_64/manylinux)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' + - name: 'pypy310-nocov (ubuntu/x86_64/manylinux)' + artifact: 'pypy310-ubuntu-x86_64-manylinux' + python: 'pypy-3.10' + toxpython: 'pypy3.10' python_arch: 'x64' - tox_env: 'pypy38-nocov' + tox_env: 'pypy310-nocov' cibw_arch: 'x86_64' cibw_build: false os: 'ubuntu-latest' - - name: 'pypy38-nocov (windows/AMD64)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' + - name: 'pypy310-nocov (windows/AMD64)' + artifact: 'pypy310-windows-AMD64' + python: 'pypy-3.10' + toxpython: 'pypy3.10' python_arch: 'x64' - tox_env: 'pypy38-nocov' + tox_env: 'pypy310-nocov' cibw_arch: 'AMD64' cibw_build: false os: 'windows-latest' - - name: 'pypy38-nocov (macos/x86_64)' - python: 'pypy-3.8' - toxpython: 'pypy3.8' + - name: 'pypy310-nocov (macos/arm64)' + artifact: 'pypy310-macos-arm64' + python: 'pypy-3.10' + toxpython: 'pypy3.10' + python_arch: 'arm64' + tox_env: 'pypy310-nocov' + cibw_arch: 'arm64' + cibw_build: false + os: 'macos-latest' + - name: 'graalpy242-nocov (ubuntu/x86_64/manylinux)' + artifact: 'graalpy242-ubuntu-x86_64-manylinux' + python: 'graalpy-24.2' + toxpython: 'graalpy' python_arch: 'x64' - tox_env: 'pypy38-nocov' + tox_env: 'graalpy-nocov' cibw_arch: 'x86_64' cibw_build: false + os: 'ubuntu-latest' + - name: 'graalpy242-nocov (macos/arm64)' + artifact: 'graalpy242-macos-arm64' + python: 'graalpy-24.2' + toxpython: 'graalpy' + python_arch: 'arm64' + tox_env: 'graalpy-nocov' + cibw_arch: 'arm64' + cibw_build: false os: 'macos-latest' steps: - - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-qemu-action@v3 if: matrix.cibw_arch == 'aarch64' with: platforms: arm64 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} architecture: ${{ matrix.python_arch }} - name: install dependencies run: | - python -mpip install --progress-bar=off twine tox cibuildwheel -r ci/requirements.txt + python -mpip install --progress-bar=off cibuildwheel -r ci/requirements.txt virtualenv --version pip --version tox --version @@ -546,6 +722,7 @@ jobs: TOXPYTHON: '${{ matrix.toxpython }}' CIBW_ARCHS: '${{ matrix.cibw_arch }}' CIBW_BUILD: '${{ matrix.cibw_build }}' + CIBW_FREE_THREADED_SUPPORT: '${{ matrix.cibw_ft }}' CIBW_BUILD_VERBOSITY: '3' CIBW_TEST_REQUIRES: > tox @@ -563,11 +740,40 @@ jobs: !matrix.cibw_build run: > tox -e ${{ matrix.tox_env }} -v + - uses: coverallsapp/github-action@v2 + if: matrix.cover + continue-on-error: true + with: + parallel: true + flag-name: ${{ matrix.tox_env }} + - uses: codecov/codecov-action@v5 + if: matrix.cover + with: + verbose: true + flags: ${{ matrix.tox_env }} - name: check wheel - if: matrix.cibw_build - run: twine check wheelhouse/*.whl + if: > + !matrix.cibw_ft && matrix.cibw_build + run: + python -mpip install --progress-bar=off twine + twine check wheelhouse/*.whl - name: upload wheel - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: matrix.cibw_build with: + name: wheel-${{ matrix.artifact }} path: wheelhouse/*.whl + finish: + needs: test + if: ${{ always() }} + runs-on: ubuntu-latest + steps: + - uses: actions/upload-artifact/merge@v4 + with: + name: wheels + - uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + - uses: codecov/codecov-action@v5 + with: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index 9fe45cb..a64fe0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,40 +1,53 @@ *.py[cod] __pycache__ +# Temp files +.*.sw[po] +*~ +*.bak +.DS_Store + # C extensions *.so -# Packages +# Build and package files *.egg *.egg-info -dist -build -eggs +.bootstrap +.build +.cache .eggs -parts +.env +.installed.cfg +.ve bin -var -sdist -wheelhouse +build develop-eggs -.installed.cfg +dist +eggs lib lib64 -venv*/ -pyvenv*/ +parts pip-wheel-metadata/ +pyvenv*/ +sdist +var +venv*/ +wheelhouse # Installer logs pip-log.txt # Unit test / coverage reports +.benchmarks .coverage -.tox .coverage.* +.pytest .pytest_cache/ -nosetests.xml +.tox coverage.xml htmlcov +nosetests.xml # Translations *.mo @@ -43,12 +56,12 @@ htmlcov .mr.developer.cfg # IDE project files +*.iml +*.komodoproject +.idea .project .pydevproject -.idea .vscode -*.iml -*.komodoproject # Complexity output/*.html @@ -57,19 +70,6 @@ output/*/index.html # Sphinx docs/_build -.DS_Store -*~ -.*.sw[po] -.build -.ve -.env -.cache -.pytest -.benchmarks -.bootstrap -.appveyor.token -*.bak - # Mypy Cache .mypy_cache/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ae2be47..ac13451 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,20 +1,19 @@ -# To install the git pre-commit hook run: -# pre-commit install -# To update the pre-commit hooks run: -# pre-commit install-hooks +# To install the git pre-commit hooks run: +# pre-commit install --install-hooks +# To update the versions: +# pre-commit autoupdate exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)' +# Note the order is intentional to avoid multiple passes of the hooks repos: + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.11.5 + hooks: + - id: ruff + args: [--fix, --exit-non-zero-on-fix, --show-fixes, --unsafe-fixes] + - id: ruff-format - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v5.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: debug-statements - - repo: https://github.com/timothycrosley/isort - rev: 5.9.3 - hooks: - - id: isort - - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.2 - hooks: - - id: flake8 diff --git a/.readthedocs.yml b/.readthedocs.yml index 59ff5c0..009a913 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,6 +3,10 @@ version: 2 sphinx: configuration: docs/conf.py formats: all +build: + os: ubuntu-22.04 + tools: + python: "3" python: install: - requirements: docs/requirements.txt diff --git a/AUTHORS.rst b/AUTHORS.rst index dbc0324..0b972ac 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -5,6 +5,7 @@ Authors * Ionel Cristian Mărieș - https://blog.ionelmc.ro * Alvin Chow - https://github.com/alvinchow86 * Astrum Kuo - https://github.com/xowenx -* Erik M. Bray - http://iguananaut.net +* Erik M. Bray - https://github.com/embray * Ran Benita - https://github.com/bluetech * "hugovk" - https://github.com/hugovk +* Sandro Tosi - https://github.com/sandrotosi diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7e3173a..2199958 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,9 +2,40 @@ Changelog ========= -1.7.1 (2021-12-15) +1.11.0 (2025-04-16) +------------------- + +* Added Python 3.13 wheels. +* Added support for ``__format__``. +* Dropped support for Python 3.8. + +1.10.0 (2023-12-15) +------------------- + +* Added Python 3.12 wheels. +* Dropped support for Python 3.7. +* Applied some reformatting and lint fixes using ruff to the codebase (mostly more Python 2 leftover cleanups). + +1.9.0 (2023-01-04) ------------------ +* Added support for matrix multiplication operator (``@``). +* Should have all the wheels now (including the manylinux ones). +* Bumped minimum version requirements for setuptools and setuptools-scm. +* Switched the default pure python fallback implementation to the "simple" one (when you ``from lazy_object_proxy import Proxy`` + and the C extension is not available). + Previously the "slots" implementation was used but as it turns out it is slower on Python 3. + +1.8.0 (2022-10-26) +------------------ + +* Cleaned up use of cPickle. Contributed by Sandro Tosi in `#62 `_. +* Cleaned up more dead Python 2 code. +* Added Python 3.11 wheels. +* Dropped support for Python 3.6. + +1.7.1 (2021-12-15) +------------------ * Removed most of the Python 2 support code and fixed ``python_requires`` to require at least Python 3.6. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 99f0ea4..704f0ed 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -49,7 +49,7 @@ To set up `python-lazy-object-proxy` for local development: Now you can make your changes locally. -4. When you're done making changes run all the checks and docs builder with `tox `_ one command:: +4. When you're done making changes run all the checks and docs builder with one command:: tox @@ -73,8 +73,6 @@ For merging, you should: 3. Add a note to ``CHANGELOG.rst`` about the changes. 4. Add yourself to ``AUTHORS.rst``. - - Tips ---- diff --git a/LICENSE b/LICENSE index de39b84..b56dc6d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,6 @@ BSD 2-Clause License -Copyright (c) 2014-2019, Ionel Cristian Mărieș -All rights reserved. +Copyright (c) 2014-2024, Ionel Cristian Mărieș. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.rst b/README.rst index ad2e9e7..43d6011 100644 --- a/README.rst +++ b/README.rst @@ -10,30 +10,24 @@ Overview * - docs - |docs| * - tests - - | |github-actions| |requires| - | |coveralls| |codecov| + - |github-actions| |coveralls| |codecov| * - package - - | |version| |wheel| |supported-versions| |supported-implementations| - | |commits-since| + - |version| |wheel| |supported-versions| |supported-implementations| |commits-since| .. |docs| image:: https://readthedocs.org/projects/python-lazy-object-proxy/badge/?style=flat - :target: https://python-lazy-object-proxy.readthedocs.io/ + :target: https://readthedocs.org/projects/python-lazy-object-proxy/ :alt: Documentation Status .. |github-actions| image:: https://github.com/ionelmc/python-lazy-object-proxy/actions/workflows/github-actions.yml/badge.svg :alt: GitHub Actions Build Status :target: https://github.com/ionelmc/python-lazy-object-proxy/actions -.. |requires| image:: https://requires.io/github/ionelmc/python-lazy-object-proxy/requirements.svg?branch=master - :alt: Requirements Status - :target: https://requires.io/github/ionelmc/python-lazy-object-proxy/requirements/?branch=master - -.. |coveralls| image:: https://coveralls.io/repos/ionelmc/python-lazy-object-proxy/badge.svg?branch=master&service=github +.. |coveralls| image:: https://coveralls.io/repos/github/ionelmc/python-lazy-object-proxy/badge.svg?branch=master :alt: Coverage Status - :target: https://coveralls.io/r/ionelmc/python-lazy-object-proxy + :target: https://coveralls.io/github/ionelmc/python-lazy-object-proxy?branch=master .. |codecov| image:: https://codecov.io/gh/ionelmc/python-lazy-object-proxy/branch/master/graphs/badge.svg?branch=master :alt: Coverage Status - :target: https://codecov.io/github/ionelmc/python-lazy-object-proxy + :target: https://app.codecov.io/github/ionelmc/python-lazy-object-proxy .. |version| image:: https://img.shields.io/pypi/v/lazy-object-proxy.svg :alt: PyPI Package latest release @@ -51,9 +45,9 @@ Overview :alt: Supported implementations :target: https://pypi.org/project/lazy-object-proxy -.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-lazy-object-proxy/v1.7.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-lazy-object-proxy/v1.11.0.svg :alt: Commits since latest release - :target: https://github.com/ionelmc/python-lazy-object-proxy/compare/v1.7.1...master + :target: https://github.com/ionelmc/python-lazy-object-proxy/compare/v1.11.0...master @@ -95,11 +89,18 @@ Installation pip install lazy-object-proxy +You can also install the in-development version with:: + + pip install https://github.com/ionelmc/python-lazy-object-proxy/archive/master.zip + + Documentation ============= + https://python-lazy-object-proxy.readthedocs.io/ + Development =========== diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..da9c516 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +## Security contact information + +To report a security vulnerability, please use the +[Tidelift security contact](https://tidelift.com/security). +Tidelift will coordinate the fix and disclosure. diff --git a/ci/bootstrap.py b/ci/bootstrap.py index 323a44c..f3c9a7e 100755 --- a/ci/bootstrap.py +++ b/ci/bootstrap.py @@ -1,67 +1,57 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals - import os +import pathlib import subprocess import sys -from os.path import abspath -from os.path import dirname -from os.path import exists -from os.path import join -from os.path import relpath -base_path = dirname(dirname(abspath(__file__))) -templates_path = join(base_path, "ci", "templates") +base_path: pathlib.Path = pathlib.Path(__file__).resolve().parent.parent +templates_path = base_path / 'ci' / 'templates' def check_call(args): - print("+", *args) + print('+', *args) subprocess.check_call(args) def exec_in_env(): - env_path = join(base_path, ".tox", "bootstrap") - if sys.platform == "win32": - bin_path = join(env_path, "Scripts") + env_path = base_path / '.tox' / 'bootstrap' + if sys.platform == 'win32': + bin_path = env_path / 'Scripts' else: - bin_path = join(env_path, "bin") - if not exists(env_path): + bin_path = env_path / 'bin' + if not env_path.exists(): import subprocess - print("Making bootstrap env in: {0} ...".format(env_path)) + print(f'Making bootstrap env in: {env_path} ...') try: - check_call([sys.executable, "-m", "venv", env_path]) + check_call([sys.executable, '-m', 'venv', env_path]) except subprocess.CalledProcessError: try: - check_call([sys.executable, "-m", "virtualenv", env_path]) + check_call([sys.executable, '-m', 'virtualenv', env_path]) except subprocess.CalledProcessError: - check_call(["virtualenv", env_path]) - print("Installing `jinja2` into bootstrap environment...") - check_call([join(bin_path, "pip"), "install", "jinja2", "tox"]) - python_executable = join(bin_path, "python") - if not os.path.exists(python_executable): - python_executable += '.exe' + check_call(['virtualenv', env_path]) + print('Installing `jinja2` into bootstrap environment...') + check_call([bin_path / 'pip', 'install', 'jinja2', 'tox']) + python_executable = bin_path / 'python' + if not python_executable.exists(): + python_executable = python_executable.with_suffix('.exe') - print("Re-executing with: {0}".format(python_executable)) - print("+ exec", python_executable, __file__, "--no-env") - os.execv(python_executable, [python_executable, __file__, "--no-env"]) + print(f'Re-executing with: {python_executable}') + print('+ exec', python_executable, __file__, '--no-env') + os.execv(python_executable, [python_executable, __file__, '--no-env']) def main(): import jinja2 - print("Project path: {0}".format(base_path)) + print(f'Project path: {base_path}') jinja = jinja2.Environment( - loader=jinja2.FileSystemLoader(templates_path), + loader=jinja2.FileSystemLoader(str(templates_path)), trim_blocks=True, lstrip_blocks=True, - keep_trailing_newline=True + keep_trailing_newline=True, ) - tox_environments = [ line.strip() # 'tox' need not be installed globally, but must be importable @@ -72,22 +62,22 @@ def main(): for line in subprocess.check_output([sys.executable, '-m', 'tox', '--listenvs'], universal_newlines=True).splitlines() ] tox_environments = [line for line in tox_environments if line.startswith('py')] - - for root, _, files in os.walk(templates_path): - for name in files: - relative = relpath(root, templates_path) - with open(join(base_path, relative, name), "w") as fh: - fh.write(jinja.get_template(join(relative, name)).render(tox_environments=tox_environments)) - print("Wrote {}".format(name)) - print("DONE.") + for template in templates_path.rglob('*'): + if template.is_file(): + template_path = template.relative_to(templates_path).as_posix() + destination = base_path / template_path + destination.parent.mkdir(parents=True, exist_ok=True) + destination.write_text(jinja.get_template(template_path).render(tox_environments=tox_environments)) + print(f'Wrote {template_path}') + print('DONE.') -if __name__ == "__main__": +if __name__ == '__main__': args = sys.argv[1:] - if args == ["--no-env"]: + if args == ['--no-env']: main() elif not args: exec_in_env() else: - print("Unexpected arguments {0}".format(args), file=sys.stderr) + print(f'Unexpected arguments: {args}', file=sys.stderr) sys.exit(1) diff --git a/ci/requirements.txt b/ci/requirements.txt index d99ac18..6226712 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -virtualenv>=20.4.7 +virtualenv>=16.6.0 pip>=19.1.1 setuptools>=18.0.1 -six>=1.14.0 +tox diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml index 5cd4146..4b4c7a8 100644 --- a/ci/templates/.github/workflows/github-actions.yml +++ b/ci/templates/.github/workflows/github-actions.yml @@ -1,5 +1,5 @@ name: build -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: test: name: {{ '${{ matrix.name }}' }} @@ -10,25 +10,26 @@ jobs: matrix: include: - name: 'check' - python: '3.9' - toxpython: 'python3.9' + python: '3.11' + toxpython: 'python3.11' tox_env: 'check' os: 'ubuntu-latest' - name: 'docs' - python: '3.9' - toxpython: 'python3.9' + python: '3.11' + toxpython: 'python3.11' tox_env: 'docs' os: 'ubuntu-latest' {% for env in tox_environments %} {% set prefix = env.split('-')[0] -%} +{% set nogil = 'ft' in env %} {% if prefix.startswith('pypy') %} -{% set python %}pypy-{{ prefix[4] }}.{{ prefix[5] }}{% endset %} +{% set python %}pypy-{{ prefix[4] }}.{{ prefix[5:] }}{% endset %} {% set cpython %}pp{{ prefix[4:5] }}{% endset %} -{% set toxpython %}pypy{{ prefix[4] }}.{{ prefix[5] }}{% endset %} +{% set toxpython %}pypy{{ prefix[4] }}.{{ prefix[5:] }}{{ 't' if nogil else '' }}{% endset %} {% else %} {% set python %}{{ prefix[2] }}.{{ prefix[3:] }}{% endset %} {% set cpython %}cp{{ prefix[2:] }}{% endset %} -{% set toxpython %}python{{ prefix[2] }}.{{ prefix[3:] }}{% endset %} +{% set toxpython %}python{{ prefix[2] }}.{{ prefix[3:] }}{{ 't' if nogil else '' }}{% endset %} {% endif %} {% for os, python_arch, cibw_arch, wheel_arch, include_cover in [ ['ubuntu', 'x64', 'x86_64', '*manylinux*', True], @@ -36,20 +37,24 @@ jobs: ['ubuntu', 'x64', 'aarch64', '*manylinux*', False], ['ubuntu', 'x64', 'aarch64', '*musllinux*', False], ['windows', 'x64', 'AMD64', '*', True], - ['windows', 'x86', 'x86', '*', False], - ['macos', 'x64', 'x86_64', '*', True], + ['macos', 'arm64', 'arm64', '*', True], ] %} {% if include_cover or ('nocov' in env and not prefix.startswith('pypy')) %} {% set wheel_suffix = 'nocov' in env and wheel_arch.strip('*') %} {% set name_suffix = '/' + wheel_suffix if wheel_suffix else '' %} - name: '{{ env }} ({{ os }}/{{ cibw_arch }}{{ name_suffix }})' + artifact: '{{ env.rsplit('-', 1)[0] }}-{{ os }}-{{ cibw_arch }}{{ name_suffix.replace('/', '-') }}' python: '{{ python }}' toxpython: '{{ toxpython }}' - python_arch: '{{ python_arch }}' - tox_env: '{{ env }}{% if 'cover' in env %},codecov{% endif %}' + python_arch: '{{ python_arch }}{% if nogil %}-freethreaded{% endif %}' + tox_env: '{{ env }}' +{% if 'cover' in env %} + cover: true +{% endif %} cibw_arch: '{{ cibw_arch }}' {% if 'nocov' in env and not prefix.startswith('pypy') %} - cibw_build: '{{ cpython }}-{{ wheel_arch }}' + cibw_build: '{{ cpython }}{% if nogil %}t{% endif %}-{{ wheel_arch }}' + cibw_ft: '{% if nogil %}true{% else %}false{% endif %}' {% else %} cibw_build: false {% endif %} @@ -58,20 +63,20 @@ jobs: {% endfor %} {% endfor %} steps: - - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-qemu-action@v3 if: matrix.cibw_arch == 'aarch64' with: platforms: arm64 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: {{ '${{ matrix.python }}' }} architecture: {{ '${{ matrix.python_arch }}' }} - name: install dependencies run: | - python -mpip install --progress-bar=off twine tox cibuildwheel -r ci/requirements.txt + python -mpip install --progress-bar=off cibuildwheel -r ci/requirements.txt virtualenv --version pip --version tox --version @@ -88,6 +93,7 @@ jobs: TOXPYTHON: '{{ '${{ matrix.toxpython }}' }}' CIBW_ARCHS: '{{ '${{ matrix.cibw_arch }}' }}' CIBW_BUILD: '{{ '${{ matrix.cibw_build }}' }}' + CIBW_FREE_THREADED_SUPPORT: '{{ '${{ matrix.cibw_ft }}' }}' CIBW_BUILD_VERBOSITY: '3' CIBW_TEST_REQUIRES: > tox @@ -105,11 +111,41 @@ jobs: !matrix.cibw_build run: > tox -e {{ '${{ matrix.tox_env }}' }} -v + - uses: coverallsapp/github-action@v2 + if: matrix.cover + continue-on-error: true + with: + parallel: true + flag-name: {{ '${{ matrix.tox_env }}' }} + - uses: codecov/codecov-action@v5 + if: matrix.cover + with: + verbose: true + flags: {{ '${{ matrix.tox_env }}' }} - name: check wheel - if: matrix.cibw_build - run: twine check wheelhouse/*.whl + if: > + !matrix.cibw_ft && matrix.cibw_build + run: + python -mpip install --progress-bar=off twine + twine check wheelhouse/*.whl - name: upload wheel - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: matrix.cibw_build with: + name: {{ 'wheel-${{ matrix.artifact }}' }} path: wheelhouse/*.whl + finish: + needs: test + if: {{ '${{ always() }}' }} + runs-on: ubuntu-latest + steps: + - uses: actions/upload-artifact/merge@v4 + with: + name: wheels + - uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + - uses: codecov/codecov-action@v5 + with: + CODECOV_TOKEN: {% raw %}${{ secrets.CODECOV_TOKEN }}{% endraw %} + diff --git a/conftest.py b/conftest.py deleted file mode 100644 index b09ced8..0000000 --- a/conftest.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -PY3 = sys.version_info[0] >= 3 - - -def pytest_ignore_collect(path, config): - basename = path.basename - - if not PY3 and "py3" in basename or PY3 and "py2" in basename: - return True diff --git a/docs/conf.py b/docs/conf.py index b38809b..dfa64f0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,10 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import traceback - -import sphinx_py3doc_enhanced_theme - extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.autosummary', @@ -19,35 +12,35 @@ source_suffix = '.rst' master_doc = 'index' project = 'lazy-object-proxy' -year = '2014-2021' +year = '2014-2024' author = 'Ionel Cristian Mărieș' -copyright = '{0}, {1}'.format(year, author) +copyright = f'{year}, {author}' try: from pkg_resources import get_distribution + version = release = get_distribution('lazy_object_proxy').version except Exception: + import traceback + traceback.print_exc() - version = release = '1.7.1' + version = release = '1.11.0' pygments_style = 'trac' templates_path = ['.'] extlinks = { - 'issue': ('https://github.com/ionelmc/python-lazy-object-proxy/issues/%s', '#'), - 'pr': ('https://github.com/ionelmc/python-lazy-object-proxy/pull/%s', 'PR #'), + 'issue': ('https://github.com/ionelmc/python-lazy-object-proxy/issues/%s', '#%s'), + 'pr': ('https://github.com/ionelmc/python-lazy-object-proxy/pull/%s', 'PR #%s'), } -html_theme = "sphinx_py3doc_enhanced_theme" -html_theme_path = [sphinx_py3doc_enhanced_theme.get_html_theme_path()] + +html_theme = 'furo' html_theme_options = { - 'githuburl': 'https://github.com/ionelmc/python-lazy-object-proxy/' + 'githuburl': 'https://github.com/ionelmc/python-lazy-object-proxy/', } html_use_smartypants = True html_last_updated_fmt = '%b %d, %Y' html_split_index = False -html_sidebars = { - '**': ['searchbox.html', 'globaltoc.html', 'sourcelink.html'], -} -html_short_title = '%s-%s' % (project, version) +html_short_title = f'{project}-{version}' napoleon_use_ivar = True napoleon_use_rtype = False diff --git a/docs/index.rst b/docs/index.rst index e55d633..2d82389 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -18,4 +18,3 @@ Indices and tables * :ref:`genindex` * :ref:`modindex` * :ref:`search` - diff --git a/docs/requirements.txt b/docs/requirements.txt index 62bc14e..c03e307 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx>=1.3 -sphinx-py3doc-enhanced-theme +furo diff --git a/pyproject.toml b/pyproject.toml index 23cf6d7..6632079 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,61 @@ [build-system] requires = [ - "setuptools>=30.3.0", - "wheel", - "setuptools_scm>=3.3.1", + "setuptools>=64", + "setuptools_scm>=8", ] +build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] + +[tool.ruff] +extend-exclude = ["static", "ci/templates"] +line-length = 140 +src = ["src", "tests"] +target-version = "py39" + +[tool.ruff.lint.per-file-ignores] +"ci/*" = ["S"] + +[tool.ruff.lint] +ignore = [ + "RUF001", # ruff-specific rules ambiguous-unicode-character-string + "S101", # flake8-bandit assert + "S308", # flake8-bandit suspicious-mark-safe-usage + "E501", # pycodestyle line-too-long + "DTZ001", + "PT011", + "PT012", + "B004", + "S102", +] +select = [ + "B", # flake8-bugbear + "C4", # flake8-comprehensions + "DTZ", # flake8-datetimez + "E", # pycodestyle errors + "EXE", # flake8-executable + "F", # pyflakes + "I", # isort + "INT", # flake8-gettext + "PIE", # flake8-pie + "PLC", # pylint convention + "PLE", # pylint errors + "PT", # flake8-pytest-style + "PTH", # flake8-use-pathlib + "RSE", # flake8-raise + "RUF", # ruff-specific rules + "S", # flake8-bandit + "UP", # pyupgrade + "W", # pycodestyle warnings +] + +[tool.ruff.lint.flake8-pytest-style] +fixture-parentheses = false +mark-parentheses = false + +[tool.ruff.lint.isort] +forced-separate = ["conftest"] +force-single-line = true + +[tool.ruff.format] +quote-style = "single" diff --git a/setup.cfg b/pytest.ini similarity index 68% rename from setup.cfg rename to pytest.ini index d55819a..09a3355 100644 --- a/setup.cfg +++ b/pytest.ini @@ -1,12 +1,4 @@ -[options] -setup_requires = - setuptools_scm>=3.3.1 - -[flake8] -max-line-length = 140 -exclude = .tox,.eggs,ci/templates,build,dist - -[tool:pytest] +[pytest] # If a pytest section is found in one of the possible config files # (pytest.ini, tox.ini or setup.cfg), then pytest will not look for any others, # so if you add a pytest config section elsewhere, @@ -39,10 +31,10 @@ addopts = testpaths = tests -[tool:isort] -force_single_line = True -line_length = 120 -known_first_party = lazy_object_proxy -default_section = THIRDPARTY -forced_separate = test_lazy_object_proxy -skip = .tox,.eggs,ci/templates,build,dist +# Idea from: https://til.simonwillison.net/pytest/treat-warnings-as-errors +filterwarnings = + error +# You can add exclusions, some examples: +# ignore:'lazy_object_proxy' defines default_app_config:PendingDeprecationWarning:: +# ignore:The {{% if::: +# ignore:Coverage disabled via --no-cov switch! diff --git a/setup.py b/setup.py index 14eb6c9..3cbc50e 100755 --- a/setup.py +++ b/setup.py @@ -1,19 +1,9 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- -from __future__ import absolute_import -from __future__ import print_function - -import io import os import platform import re import sys -from glob import glob -from os.path import basename -from os.path import dirname -from os.path import join -from os.path import relpath -from os.path import splitext +from pathlib import Path from setuptools import Extension from setuptools import find_packages @@ -21,8 +11,8 @@ from setuptools.command.build_ext import build_ext from setuptools.dist import Distribution -# Enable code coverage for C code: we can't use CFLAGS=-coverage in tox.ini, since that may mess with compiling -# dependencies (e.g. numpy). Therefore we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after +# Enable code coverage for C code: we cannot use CFLAGS=-coverage in tox.ini, since that may mess with compiling +# dependencies (e.g. numpy). Therefore, we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after # deps have been safely installed). if 'TOX_ENV_NAME' in os.environ and os.environ.get('SETUPPY_EXT_COVERAGE') == 'yes' and platform.system() == 'Linux': CFLAGS = os.environ['CFLAGS'] = '-fprofile-arcs -ftest-coverage' @@ -31,9 +21,20 @@ CFLAGS = '' LFLAGS = '' +allow_extensions = True +if sys.implementation.name in ('pypy', 'graalpy'): + print('NOTICE: C extensions disabled on PyPy/GraalPy (would be broken)!') + allow_extensions = False +if os.environ.get('SETUPPY_FORCE_PURE'): + print('NOTICE: C extensions disabled (SETUPPY_FORCE_PURE)!') + allow_extensions = False + class OptionalBuildExt(build_ext): - """Allow the building of C extensions to fail.""" + """ + Allow the building of C extensions to fail. + """ + def run(self): try: super().run() @@ -43,12 +44,14 @@ def run(self): def _unavailable(self, e): print('*' * 80) - print('''WARNING: + print( + """WARNING: An optional code optimization (C extension) could not be compiled. Optimizations for this package will not be available! - ''') + """ + ) print('CAUSE:') print('') @@ -56,40 +59,41 @@ def _unavailable(self, e): print('*' * 80) -def read(*names, **kwargs): - with io.open( - join(dirname(__file__), *names), - encoding=kwargs.get('encoding', 'utf8') - ) as fh: - return fh.read() - - class BinaryDistribution(Distribution): - """Distribution which almost always forces a binary package with platform name""" + """ + Distribution which almost always forces a binary package with platform name + """ + def has_ext_modules(self): return super().has_ext_modules() or not os.environ.get('SETUPPY_ALLOW_PURE') +def read(*names, **kwargs): + with Path(__file__).parent.joinpath(*names).open(encoding=kwargs.get('encoding', 'utf8')) as fh: + return fh.read() + + setup( name='lazy-object-proxy', use_scm_version={ 'local_scheme': 'dirty-tag', 'write_to': 'src/lazy_object_proxy/_version.py', - 'fallback_version': '1.7.1', + 'fallback_version': '1.11.0', }, license='BSD-2-Clause', description='A fast and thorough lazy object proxy.', - long_description='%s\n%s' % ( + long_description='{}\n{}'.format( re.compile('^.. start-badges.*^.. end-badges', re.M | re.S).sub('', read('README.rst')), - re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst')) + re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst')), ), + long_description_content_type='text/x-rst', author='Ionel Cristian Mărieș', author_email='contact@ionelmc.ro', url='https://github.com/ionelmc/python-lazy-object-proxy', packages=find_packages('src'), package_dir={'': 'src'}, - py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')], - include_package_data=False, + py_modules=[path.stem for path in Path('src').glob('*.py')], + include_package_data=True, zip_safe=False, classifiers=[ # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers @@ -100,18 +104,19 @@ def has_ext_modules(self): 'Operating System :: POSIX', 'Operating System :: Microsoft :: Windows', 'Programming Language :: Python', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3 :: Only', - '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', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', # uncomment if you test on these interpreters: - # 'Programming Language :: Python :: Implementation :: IronPython', - # 'Programming Language :: Python :: Implementation :: Jython', - # 'Programming Language :: Python :: Implementation :: Stackless', + # "Programming Language :: Python :: Implementation :: IronPython", + # "Programming Language :: Python :: Implementation :: Jython", + # "Programming Language :: Python :: Implementation :: Stackless", 'Topic :: Utilities', ], project_urls={ @@ -120,28 +125,32 @@ def has_ext_modules(self): 'Issue Tracker': 'https://github.com/ionelmc/python-lazy-object-proxy/issues', }, keywords=[ - # eg: 'keyword1', 'keyword2', 'keyword3', + # eg: "keyword1", "keyword2", "keyword3", ], - python_requires='>=3.6', + python_requires='>=3.9', install_requires=[ - # eg: 'aspectlib==1.1.1', 'six>=1.7', + # eg: "aspectlib==1.1.1", "six>=1.7", ], extras_require={ # eg: - # 'rst': ['docutils>=0.11'], - # ':python_version=="2.6"': ['argparse'], + # "rst": ["docutils>=0.11"], + # ":python_version=='3.8'": ["backports.zoneinfo"], }, + setup_requires=[ + 'setuptools_scm>=3.3.1', + ], cmdclass={'build_ext': OptionalBuildExt}, - ext_modules=[] if hasattr(sys, 'pypy_version_info') else [ + ext_modules=[ Extension( - splitext(relpath(path, 'src').replace(os.sep, '.'))[0], - sources=[path], + str(path.relative_to('src').with_suffix('')).replace(os.sep, '.'), + sources=[str(path)], extra_compile_args=CFLAGS.split(), extra_link_args=LFLAGS.split(), - include_dirs=[dirname(path)] + include_dirs=[str(path.parent)], ) - for root, _, _ in os.walk('src') - for path in glob(join(root, '*.c')) - ], - distclass=BinaryDistribution, + for path in Path('src').glob('**/*.c') + ] + if allow_extensions + else [], + distclass=BinaryDistribution if allow_extensions else None, ) diff --git a/src/lazy_object_proxy/__init__.py b/src/lazy_object_proxy/__init__.py index 0c1ef47..e91e6c2 100644 --- a/src/lazy_object_proxy/__init__.py +++ b/src/lazy_object_proxy/__init__.py @@ -11,13 +11,13 @@ from .cext import Proxy from .cext import identity except ImportError: - from .slots import Proxy + from .simple import Proxy else: copyreg.constructor(identity) try: from ._version import version as __version__ except ImportError: - __version__ = '1.7.1' + __version__ = '1.11.0' -__all__ = "Proxy", +__all__ = ('Proxy',) diff --git a/src/lazy_object_proxy/cext.c b/src/lazy_object_proxy/cext.c index 54f69e1..4867c7f 100644 --- a/src/lazy_object_proxy/cext.c +++ b/src/lazy_object_proxy/cext.c @@ -248,6 +248,16 @@ static PyObject *Proxy_multiply(PyObject *o1, PyObject *o2) /* ------------------------------------------------------------------------- */ +static PyObject *Proxy_matrix_multiply(PyObject *o1, PyObject *o2) +{ + Proxy__WRAPPED_REPLACE_OR_RETURN_NULL(o1); + Proxy__WRAPPED_REPLACE_OR_RETURN_NULL(o2); + + return PyNumber_MatrixMultiply(o1, o2); +} + +/* ------------------------------------------------------------------------- */ + static PyObject *Proxy_remainder(PyObject *o1, PyObject *o2) { Proxy__WRAPPED_REPLACE_OR_RETURN_NULL(o1); @@ -458,6 +468,28 @@ static PyObject *Proxy_inplace_multiply( /* ------------------------------------------------------------------------- */ +static PyObject *Proxy_inplace_matrix_multiply( + ProxyObject *self, PyObject *other) +{ + PyObject *object = NULL; + + Proxy__ENSURE_WRAPPED_OR_RETURN_NULL(self); + Proxy__WRAPPED_REPLACE_OR_RETURN_NULL(other); + + object = PyNumber_InPlaceMatrixMultiply(self->wrapped, other); + + if (!object) + return NULL; + + Py_DECREF(self->wrapped); + self->wrapped = object; + + Py_INCREF(self); + return (PyObject *)self; +} + +/* ------------------------------------------------------------------------- */ + static PyObject *Proxy_inplace_remainder( ProxyObject *self, PyObject *other) { @@ -807,24 +839,28 @@ static PyObject *Proxy_reduce( /* ------------------------------------------------------------------------- */ -static PyObject *Proxy_round( - ProxyObject *self, PyObject *args) +static PyObject *Proxy_round(ProxyObject *self, PyObject *args, PyObject *kwds) { PyObject *module = NULL; - PyObject *dict = NULL; PyObject *round = NULL; + PyObject *ndigits = NULL; PyObject *result = NULL; + char *const kwlist[] = { "ndigits", NULL }; + Proxy__ENSURE_WRAPPED_OR_RETURN_NULL(self); + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:ObjectProxy", kwlist, &ndigits)) { + return NULL; + } + module = PyImport_ImportModule("builtins"); if (!module) return NULL; - dict = PyModule_GetDict(module); - round = PyDict_GetItemString(dict, "round"); + round = PyObject_GetAttrString(module, "round"); if (!round) { Py_DECREF(module); @@ -834,7 +870,7 @@ static PyObject *Proxy_round( Py_INCREF(round); Py_DECREF(module); - result = PyObject_CallFunctionObjArgs(round, self->wrapped, NULL); + result = PyObject_CallFunctionObjArgs(round, self->wrapped, ndigits, NULL); Py_DECREF(round); @@ -1150,6 +1186,22 @@ static PyObject *Proxy_aexit( /* ------------------------------------------------------------------------- */ +static PyObject *Proxy_format( + ProxyObject *self, PyObject *args, PyObject *kwds) +{ + PyObject *format_spec = NULL; + + Proxy__ENSURE_WRAPPED_OR_RETURN_NULL(self); + + if (!PyArg_ParseTuple(args, "|O:format", &format_spec)) + return NULL; + + return PyObject_Format(self->wrapped, format_spec); + +} + +/* ------------------------------------------------------------------------- */ + static PyObject *Proxy_await(ProxyObject *self) { Proxy__ENSURE_WRAPPED_OR_RETURN_NULL(self); @@ -1239,6 +1291,8 @@ static PyNumberMethods Proxy_as_number = { (binaryfunc)Proxy_inplace_floor_divide, /*nb_inplace_floor_divide*/ (binaryfunc)Proxy_inplace_true_divide, /*nb_inplace_true_divide*/ (unaryfunc)Proxy_index, /*nb_index*/ + (binaryfunc)Proxy_matrix_multiply, /*nb_matrix_multiply*/ + (binaryfunc)Proxy_inplace_matrix_multiply, /*nb_inplace_matrix_multiply*/ }; static PySequenceMethods Proxy_as_sequence = { @@ -1274,9 +1328,10 @@ static PyMethodDef Proxy_methods[] = { { "__reduce__", (PyCFunction)Proxy_reduce, METH_NOARGS, 0 }, { "__reduce_ex__", (PyCFunction)Proxy_reduce, METH_O, 0 }, { "__fspath__", (PyCFunction)Proxy_fspath, METH_NOARGS, 0 }, - { "__round__", (PyCFunction)Proxy_round, METH_NOARGS, 0 }, + { "__round__", (PyCFunction)Proxy_round, METH_VARARGS | METH_KEYWORDS, 0 }, { "__aenter__", (PyCFunction)Proxy_aenter, METH_NOARGS, 0 }, { "__aexit__", (PyCFunction)Proxy_aexit, METH_VARARGS | METH_KEYWORDS, 0 }, + { "__format__", (PyCFunction)Proxy_format, METH_VARARGS, 0 }, { NULL, NULL }, }; @@ -1384,8 +1439,12 @@ moduleinit(void) return NULL; Py_INCREF(&Proxy_Type); - PyModule_AddObject(module, "Proxy", - (PyObject *)&Proxy_Type); + PyModule_AddObject(module, "Proxy", (PyObject *)&Proxy_Type); + +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED); +#endif + return module; } diff --git a/src/lazy_object_proxy/compat.py b/src/lazy_object_proxy/compat.py index e950fdf..90c1cde 100644 --- a/src/lazy_object_proxy/compat.py +++ b/src/lazy_object_proxy/compat.py @@ -1,14 +1,6 @@ -import sys - -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 - -if PY3: - string_types = str, bytes -else: - string_types = basestring, # noqa: F821 +string_types = str, bytes def with_metaclass(meta, *bases): """Create a base class with a metaclass.""" - return meta("NewBase", bases, {}) + return meta('NewBase', bases, {}) diff --git a/src/lazy_object_proxy/simple.py b/src/lazy_object_proxy/simple.py index 724998d..8009b93 100644 --- a/src/lazy_object_proxy/simple.py +++ b/src/lazy_object_proxy/simple.py @@ -1,7 +1,5 @@ import operator -from .compat import PY2 -from .compat import PY3 from .compat import string_types from .compat import with_metaclass from .utils import await_ @@ -16,7 +14,7 @@ def proxy_wrapper(self, *args): return proxy_wrapper -class _ProxyMethods(object): +class _ProxyMethods: # We use properties to override the values of __module__ and # __doc__. If we add these in ObjectProxy, the derived class # __dict__ will still be setup to have string variants of these @@ -89,22 +87,13 @@ def __wrapped__(self): __annotations__ = property(make_proxy_method(operator.attrgetter('__anotations__'))) __dir__ = make_proxy_method(dir) __str__ = make_proxy_method(str) - - if PY3: - __bytes__ = make_proxy_method(bytes) + __bytes__ = make_proxy_method(bytes) def __repr__(self, __getattr__=object.__getattribute__): if '__wrapped__' in self.__dict__: - return '<{} at 0x{:x} wrapping {!r} at 0x{:x} with factory {!r}>'.format( - type(self).__name__, id(self), - self.__wrapped__, id(self.__wrapped__), - self.__factory__ - ) + return f'<{type(self).__name__} at 0x{id(self):x} wrapping {self.__wrapped__!r} at 0x{id(self.__wrapped__):x} with factory {self.__factory__!r}>' else: - return '<{} at 0x{:x} with factory {!r}>'.format( - type(self).__name__, id(self), - self.__factory__ - ) + return f'<{type(self).__name__} at 0x{id(self):x} with factory {self.__factory__!r}>' def __fspath__(self): wrapped = self.__wrapped__ @@ -118,10 +107,7 @@ def __fspath__(self): return fspath() __reversed__ = make_proxy_method(reversed) - - if PY3: - __round__ = make_proxy_method(round) - + __round__ = make_proxy_method(round) __lt__ = make_proxy_method(operator.lt) __le__ = make_proxy_method(operator.le) __eq__ = make_proxy_method(operator.eq) @@ -153,7 +139,7 @@ def __delattr__(self, name): __add__ = make_proxy_method(operator.add) __sub__ = make_proxy_method(operator.sub) __mul__ = make_proxy_method(operator.mul) - __div__ = make_proxy_method(operator.div if PY2 else operator.truediv) + __matmul__ = make_proxy_method(operator.matmul) __truediv__ = make_proxy_method(operator.truediv) __floordiv__ = make_proxy_method(operator.floordiv) __mod__ = make_proxy_method(operator.mod) @@ -174,6 +160,9 @@ def __rsub__(self, other): def __rmul__(self, other): return other * self.__wrapped__ + def __rmatmul__(self, other): + return other @ self.__wrapped__ + def __rdiv__(self, other): return operator.div(other, self.__wrapped__) @@ -210,7 +199,7 @@ def __ror__(self, other): __iadd__ = make_proxy_method(operator.iadd) __isub__ = make_proxy_method(operator.isub) __imul__ = make_proxy_method(operator.imul) - __idiv__ = make_proxy_method(operator.idiv if PY2 else operator.itruediv) + __imatmul__ = make_proxy_method(operator.imatmul) __itruediv__ = make_proxy_method(operator.itruediv) __ifloordiv__ = make_proxy_method(operator.ifloordiv) __imod__ = make_proxy_method(operator.imod) @@ -224,12 +213,7 @@ def __ror__(self, other): __pos__ = make_proxy_method(operator.pos) __abs__ = make_proxy_method(operator.abs) __invert__ = make_proxy_method(operator.invert) - __int__ = make_proxy_method(int) - - if PY2: - __long__ = make_proxy_method(long) # noqa - __float__ = make_proxy_method(float) __oct__ = make_proxy_method(oct) __hex__ = make_proxy_method(hex) @@ -246,11 +230,6 @@ def __index__(self): __setitem__ = make_proxy_method(operator.setitem) __delitem__ = make_proxy_method(operator.delitem) - if PY2: - __getslice__ = make_proxy_method(operator.getslice) - __setslice__ = make_proxy_method(operator.setslice) - __delslice__ = make_proxy_method(operator.delslice) - def __enter__(self): return self.__wrapped__.__enter__() @@ -268,6 +247,9 @@ def __reduce__(self): def __reduce_ex__(self, protocol): return identity, (self.__wrapped__,) + def __format__(self, format_spec): + return self.__wrapped__.__format__(format_spec) + if await_: from .utils import __aenter__ from .utils import __aexit__ diff --git a/src/lazy_object_proxy/slots.py b/src/lazy_object_proxy/slots.py index 24d2f7e..73bf555 100644 --- a/src/lazy_object_proxy/slots.py +++ b/src/lazy_object_proxy/slots.py @@ -1,14 +1,12 @@ import operator -from .compat import PY2 -from .compat import PY3 from .compat import string_types from .compat import with_metaclass from .utils import await_ from .utils import identity -class _ProxyMethods(object): +class _ProxyMethods: # We use properties to override the values of __module__ and # __doc__. If we add these in ObjectProxy, the derived class # __dict__ will still be setup to have string variants of these @@ -79,7 +77,7 @@ class Proxy(with_metaclass(_ProxyMetaType)): * calls ``__factory__``, saves result to ``__target__`` and returns said result. """ - __slots__ = '__target__', '__factory__' + __slots__ = '__factory__', '__target__' def __init__(self, factory): object.__setattr__(self, '__factory__', factory) @@ -94,15 +92,14 @@ def __resolved__(self, __getattr__=object.__getattribute__): return True @property - def __wrapped__(self, __getattr__=object.__getattribute__, __setattr__=object.__setattr__, - __delattr__=object.__delattr__): + def __wrapped__(self, __getattr__=object.__getattribute__, __setattr__=object.__setattr__, __delattr__=object.__delattr__): try: return __getattr__(self, '__target__') except AttributeError: try: factory = __getattr__(self, '__factory__') - except AttributeError: - raise ValueError("Proxy hasn't been initiated: __factory__ is missing.") + except AttributeError as exc: + raise ValueError("Proxy hasn't been initiated: __factory__ is missing.") from exc target = factory() __setattr__(self, '__target__', target) return target @@ -127,8 +124,8 @@ def __name__(self, value): def __class__(self): return self.__wrapped__.__class__ - @__class__.setter # noqa: F811 - def __class__(self, value): # noqa: F811 + @__class__.setter + def __class__(self, value): self.__wrapped__.__class__ = value @property @@ -145,24 +142,16 @@ def __dir__(self): def __str__(self): return str(self.__wrapped__) - if PY3: - def __bytes__(self): - return bytes(self.__wrapped__) + def __bytes__(self): + return bytes(self.__wrapped__) def __repr__(self, __getattr__=object.__getattribute__): try: target = __getattr__(self, '__target__') except AttributeError: - return '<{} at 0x{:x} with factory {!r}>'.format( - type(self).__name__, id(self), - self.__factory__ - ) + return f'<{type(self).__name__} at 0x{id(self):x} with factory {self.__factory__!r}>' else: - return '<{} at 0x{:x} wrapping {!r} at 0x{:x} with factory {!r}>'.format( - type(self).__name__, id(self), - target, id(target), - self.__factory__ - ) + return f'<{type(self).__name__} at 0x{id(self):x} wrapping {target!r} at 0x{id(target):x} with factory {self.__factory__!r}>' def __fspath__(self): wrapped = self.__wrapped__ @@ -178,9 +167,8 @@ def __fspath__(self): def __reversed__(self): return reversed(self.__wrapped__) - if PY3: - def __round__(self): - return round(self.__wrapped__) + def __round__(self, ndigits=None): + return round(self.__wrapped__, ndigits) def __lt__(self, other): return self.__wrapped__ < other @@ -236,8 +224,8 @@ def __sub__(self, other): def __mul__(self, other): return self.__wrapped__ * other - def __div__(self, other): - return operator.div(self.__wrapped__, other) + def __matmul__(self, other): + return self.__wrapped__ @ other def __truediv__(self, other): return operator.truediv(self.__wrapped__, other) @@ -278,6 +266,9 @@ def __rsub__(self, other): def __rmul__(self, other): return other * self.__wrapped__ + def __rmatmul__(self, other): + return other @ self.__wrapped__ + def __rdiv__(self, other): return operator.div(other, self.__wrapped__) @@ -323,8 +314,8 @@ def __imul__(self, other): self.__wrapped__ *= other return self - def __idiv__(self, other): - self.__wrapped__ = operator.idiv(self.__wrapped__, other) + def __imatmul__(self, other): + self.__wrapped__ @= other return self def __itruediv__(self, other): @@ -378,10 +369,6 @@ def __invert__(self): def __int__(self): return int(self.__wrapped__) - if PY2: - def __long__(self): - return long(self.__wrapped__) # noqa - def __float__(self): return float(self.__wrapped__) @@ -442,6 +429,9 @@ def __reduce__(self): def __reduce_ex__(self, protocol): return identity, (self.__wrapped__,) + def __format__(self, format_spec): + return self.__wrapped__.__format__(format_spec) + if await_: from .utils import __aenter__ from .utils import __aexit__ diff --git a/src/lazy_object_proxy/utils.py b/src/lazy_object_proxy/utils.py index 3307abe..720d768 100644 --- a/src/lazy_object_proxy/utils.py +++ b/src/lazy_object_proxy/utils.py @@ -1,20 +1,54 @@ - # flake8: noqa -try: - from .utils_py3 import __aenter__ - from .utils_py3 import __aexit__ - from .utils_py3 import __aiter__ - from .utils_py3 import __anext__ - from .utils_py3 import __await__ - from .utils_py3 import await_ -except (ImportError, SyntaxError): - await_ = None +from collections.abc import Awaitable +from inspect import CO_ITERABLE_COROUTINE +from types import CoroutineType +from types import GeneratorType + + +async def do_await(obj): + return await obj + + +def do_yield_from(gen): + return (yield from gen) + + +def await_(obj): + obj_type = type(obj) + if ( + obj_type is CoroutineType + or (obj_type is GeneratorType and bool(obj.gi_code.co_flags & CO_ITERABLE_COROUTINE)) + or isinstance(obj, Awaitable) + ): + return do_await(obj).__await__() + else: + return do_yield_from(obj) + + +def __aiter__(self): + return self.__wrapped__.__aiter__() + + +async def __anext__(self): + return await self.__wrapped__.__anext__() + + +def __await__(self): + return await_(self.__wrapped__) + + +def __aenter__(self): + return self.__wrapped__.__aenter__() + + +def __aexit__(self, *args, **kwargs): + return self.__wrapped__.__aexit__(*args, **kwargs) def identity(obj): return obj -class cached_property(object): +class cached_property: def __init__(self, func): self.func = func diff --git a/src/lazy_object_proxy/utils_py3.py b/src/lazy_object_proxy/utils_py3.py deleted file mode 100644 index 101f270..0000000 --- a/src/lazy_object_proxy/utils_py3.py +++ /dev/null @@ -1,44 +0,0 @@ -from collections.abc import Awaitable -from inspect import CO_ITERABLE_COROUTINE -from types import CoroutineType -from types import GeneratorType - - -async def do_await(obj): - return await obj - - -def do_yield_from(gen): - return (yield from gen) - - -def await_(obj): - obj_type = type(obj) - if ( - obj_type is CoroutineType or - obj_type is GeneratorType and bool(obj.gi_code.co_flags & CO_ITERABLE_COROUTINE) or - isinstance(obj, Awaitable) - ): - return do_await(obj).__await__() - else: - return do_yield_from(obj) - - -def __aiter__(self): - return self.__wrapped__.__aiter__() - - -async def __anext__(self): - return await self.__wrapped__.__anext__() - - -def __await__(self): - return await_(self.__wrapped__) - - -def __aenter__(self): - return self.__wrapped__.__aenter__() - - -def __aexit__(self, *args, **kwargs): - return self.__wrapped__.__aexit__(*args, **kwargs) diff --git a/tests/compat.py b/tests/compat.py deleted file mode 100644 index 7a054dc..0000000 --- a/tests/compat.py +++ /dev/null @@ -1,26 +0,0 @@ -import sys - -PY2 = sys.version_info[0] < 3 -PY3 = sys.version_info[0] >= 3 - -if PY3: - import builtins - exec_ = getattr(builtins, "exec") - del builtins - -else: - def exec_(_code_, _globs_=None, _locs_=None): - """Execute code in a namespace.""" - if _globs_ is None: - frame = sys._getframe(1) - _globs_ = frame.f_globals - if _locs_ is None: - _locs_ = frame.f_locals - del frame - elif _locs_ is None: - _locs_ = _globs_ - exec("""exec _code_ in _globs_, _locs_""") - - exec_("""def reraise(tp, value, tb=None): - raise tp, value, tb -""") diff --git a/tests/conftest.py b/tests/conftest.py index c357a01..1289733 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,74 +1,79 @@ +import os import sys import pytest PYPY = '__pypy__' in sys.builtin_module_names +GRAALPY = sys.implementation.name == 'graalpy' -@pytest.fixture(scope="session") +@pytest.fixture(scope='session') def lop_loader(): def load_implementation(name): class FakeModule: subclass = False kind = name - if name == "slots": + if name == 'slots': from lazy_object_proxy.slots import Proxy - elif name == "simple": + elif name == 'simple': from lazy_object_proxy.simple import Proxy - elif name == "cext": + elif name == 'cext': try: from lazy_object_proxy.cext import Proxy except ImportError: - if PYPY: - pytest.skip(msg="C Extension not available.") + if PYPY or GRAALPY or os.environ.get('SETUPPY_FORCE_PURE'): + pytest.skip(reason='C Extension not available.') else: raise - elif name == "objproxies": - Proxy = pytest.importorskip("objproxies").LazyProxy - elif name == "django": - Proxy = pytest.importorskip("django.utils.functional").SimpleLazyObject + elif name == 'objproxies': + Proxy = pytest.importorskip('objproxies').LazyProxy + elif name == 'django': + Proxy = pytest.importorskip('django.utils.functional').SimpleLazyObject else: - raise RuntimeError("Unsupported param: %r." % name) + raise RuntimeError(f'Unsupported param: {name!r}.') - Proxy + Proxy # noqa: B018 return FakeModule return load_implementation -@pytest.fixture(scope="session", params=[ - "slots", "cext", - "simple", - # "external-django", "external-objproxies" -]) +@pytest.fixture( + scope='session', + params=[ + 'slots', + 'cext', + 'simple', + # "external-django", "external-objproxies" + ], +) def lop_implementation(request, lop_loader): return lop_loader(request.param) -@pytest.fixture(scope="session", params=[True, False], ids=['subclassed', 'normal']) +@pytest.fixture(scope='session', params=[True, False], ids=['subclassed', 'normal']) def lop_subclass(request, lop_implementation): if request.param: + class submod(lop_implementation): subclass = True - Proxy = type("SubclassOf_" + lop_implementation.Proxy.__name__, - (lop_implementation.Proxy,), {}) + Proxy = type('SubclassOf_' + lop_implementation.Proxy.__name__, (lop_implementation.Proxy,), {}) return submod else: return lop_implementation -@pytest.fixture(scope="function") +@pytest.fixture def lop(request, lop_subclass): if request.node.get_closest_marker('xfail_subclass'): - request.applymarker(pytest.mark.xfail( - reason="This test can't work because subclassing disables certain " - "features like __doc__ and __module__ proxying." - )) + request.applymarker( + pytest.mark.xfail( + reason="This test can't work because subclassing disables certain features like __doc__ and __module__ proxying." + ) + ) if request.node.get_closest_marker('xfail_simple'): - request.applymarker(pytest.mark.xfail( - reason="The lazy_object_proxy.simple.Proxy has some limitations." - )) + request.applymarker(pytest.mark.xfail(reason='The lazy_object_proxy.simple.Proxy has some limitations.')) return lop_subclass diff --git a/tests/test_async_py3.py b/tests/test_async_py3.py index 8ca24e1..235cf2f 100644 --- a/tests/test_async_py3.py +++ b/tests/test_async_py3.py @@ -13,6 +13,7 @@ from lazy_object_proxy.utils import await_ pypyxfail = pytest.mark.xfail('hasattr(sys, "pypy_version_info")') +graalpyxfail = pytest.mark.xfail('sys.implementation.name == "graalpy"') class AsyncYieldFrom: @@ -69,11 +70,13 @@ async def proxy(ob): # workaround def test_gen_1(lop): - def gen(): yield + def gen(): + yield assert not hasattr(gen, '__await__') +@graalpyxfail def test_func_1(lop): async def foo(): return 10 @@ -88,16 +91,18 @@ async def foo(): assert run_async__await__(foo()) == ([], 10) - def bar(): pass + def bar(): + pass assert not bool(bar.__code__.co_flags & inspect.CO_COROUTINE) +@graalpyxfail def test_func_2(lop): async def foo(): raise StopIteration - with pytest.raises(RuntimeError, match="coroutine raised StopIteration"): + with pytest.raises(RuntimeError, match='coroutine raised StopIteration'): run_async(lop.Proxy(foo)) @@ -223,7 +228,7 @@ def gen(): nonlocal N try: a = yield - yield (a ** 2) + yield (a**2) except ZeroDivisionError: N += 100 raise @@ -247,12 +252,13 @@ async def foo(): aw = coro.__await__() next(aw) with pytest.raises(ZeroDivisionError): - aw.throw(ZeroDivisionError, None, None) + aw.throw(ZeroDivisionError) assert N == 102 def test_func_11(lop): - async def func(): pass + async def func(): + pass coro = lop.Proxy(func) # Test that PyCoro_Type and _PyCoroWrapper_Type types were properly @@ -266,16 +272,18 @@ async def func(): pass coro.close() +@graalpyxfail def test_func_12(lop): async def g(): i = me.send(None) await foo me = lop.Proxy(g) - with pytest.raises(ValueError, match="coroutine already executing"): + with pytest.raises(ValueError, match='coroutine already executing'): me.send(None) +@graalpyxfail def test_func_13(lop): async def g(): pass @@ -287,6 +295,7 @@ async def g(): coro.close() +@graalpyxfail def test_func_14(lop): @types.coroutine def gen(): @@ -300,7 +309,7 @@ async def coro(): c = lop.Proxy(coro) c.send(None) - with pytest.raises(RuntimeError, match="coroutine ignored GeneratorExit"): + with pytest.raises(RuntimeError, match='coroutine ignored GeneratorExit'): c.close() @@ -495,7 +504,7 @@ def test_await_1(lop): async def foo(): await 1 - with pytest.raises(TypeError, match="object int can.t.*await"): + with pytest.raises(TypeError, match='object int can.t.*await'): run_async(lop.Proxy(foo)) @@ -503,7 +512,7 @@ def test_await_2(lop): async def foo(): await [] - with pytest.raises(TypeError, match="object list can.t.*await"): + with pytest.raises(TypeError, match='object list can.t.*await'): run_async(lop.Proxy(foo)) @@ -531,9 +540,9 @@ def __await__(self): return async def foo(): - return (await lop.Proxy(Awaitable)) + return await lop.Proxy(Awaitable) - with pytest.raises(TypeError, match="__await__.*returned non-iterator of type"): + with pytest.raises(TypeError, match='__await__.*returned non-iterator of type'): run_async(lop.Proxy(foo)) @@ -543,7 +552,7 @@ def __await__(self): return iter([52]) async def foo(): - return (await lop.Proxy(Awaitable)) + return await lop.Proxy(Awaitable) assert run_async(lop.Proxy(foo)) == ([52], None) @@ -555,7 +564,7 @@ def __await__(self): return 100 async def foo(): - return (await lop.Proxy(Awaitable)) + return await lop.Proxy(Awaitable) assert run_async(lop.Proxy(foo)) == ([42], 100) @@ -584,8 +593,13 @@ async def foo(): class DB: b = wrap - return (await lop.Proxy(bar) + await lop.Proxy(wrap)() + await lop.Proxy(lambda: db['b']()()()) + - await lop.Proxy(bar) * 1000 + await DB.b()()) + return ( + await lop.Proxy(bar) + + await lop.Proxy(wrap)() + + await lop.Proxy(lambda: db['b']()()()) + + await lop.Proxy(bar) * 1000 + + await DB.b()() + ) async def foo2(): return -await lop.Proxy(bar) @@ -636,7 +650,7 @@ def __await__(self): async def foo(): return await lop.Proxy(Awaitable) - with pytest.raises(TypeError, match=r"__await__\(\) returned a coroutine"): + with pytest.raises(TypeError, match=r'__await__\(\) returned a coroutine'): run_async(lop.Proxy(foo)) c.close() @@ -650,7 +664,7 @@ def __await__(self): async def foo(): return await lop.Proxy(Awaitable) - with pytest.raises(TypeError, match="__await__.*returned non-iterator of type"): + with pytest.raises(TypeError, match='__await__.*returned non-iterator of type'): run_async(lop.Proxy(foo)) @@ -705,7 +719,7 @@ async def waiter(coro): coro = lop.Proxy(coroutine) coro.send(None) - with pytest.raises(RuntimeError, match="coroutine is being awaited already"): + with pytest.raises(RuntimeError, match='coroutine is being awaited already'): waiter(coro).send(None) @@ -731,31 +745,37 @@ def __init__(self, name): self.name = name async def __aenter__(self): - await AsyncYieldFrom(['enter-1-' + self.name, - 'enter-2-' + self.name]) + await AsyncYieldFrom(['enter-1-' + self.name, 'enter-2-' + self.name]) return self async def __aexit__(self, *args): - await AsyncYieldFrom(['exit-1-' + self.name, - 'exit-2-' + self.name]) + await AsyncYieldFrom(['exit-1-' + self.name, 'exit-2-' + self.name]) if self.name == 'B': return True async def foo(): - async with lop.Proxy(lambda: Manager("A")) as a, lop.Proxy(lambda: Manager("B")) as b: + async with lop.Proxy(lambda: Manager('A')) as a, lop.Proxy(lambda: Manager('B')) as b: await lop.Proxy(lambda: AsyncYieldFrom([('managers', a.name, b.name)])) 1 / 0 f = lop.Proxy(foo) result, _ = run_async(f) - assert result == ['enter-1-A', 'enter-2-A', 'enter-1-B', 'enter-2-B', - ('managers', 'A', 'B'), - 'exit-1-B', 'exit-2-B', 'exit-1-A', 'exit-2-A'] + assert result == [ + 'enter-1-A', + 'enter-2-A', + 'enter-1-B', + 'enter-2-B', + ('managers', 'A', 'B'), + 'exit-1-B', + 'exit-2-B', + 'exit-1-A', + 'exit-2-A', + ] async def foo(): - async with lop.Proxy(lambda: Manager("A")) as a, lop.Proxy(lambda: Manager("C")) as c: + async with lop.Proxy(lambda: Manager('A')) as a, lop.Proxy(lambda: Manager('C')) as c: await lop.Proxy(lambda: AsyncYieldFrom([('managers', a.name, c.name)])) 1 / 0 @@ -763,6 +783,7 @@ async def foo(): run_async(lop.Proxy(foo)) +@graalpyxfail def test_with_2(lop): class CM: def __aenter__(self): @@ -831,6 +852,7 @@ async def func(): @pypyxfail +@graalpyxfail def test_with_6(lop): class CM: def __aenter__(self): @@ -843,13 +865,13 @@ async def foo(): async with lop.Proxy(CM): pass - with pytest.raises(TypeError, match="'async with' received an object from __aenter__ " - "that does not implement __await__: int"): + with pytest.raises(TypeError, match="'async with' received an object from __aenter__ that does not implement __await__: int"): # it's important that __aexit__ wasn't called run_async(lop.Proxy(foo)) @pypyxfail +@graalpyxfail def test_with_7(lop): class CM: async def __aenter__(self): @@ -866,8 +888,7 @@ async def foo(): try: run_async(lop.Proxy(foo)) except TypeError as exc: - assert re.search("'async with' received an object from __aexit__ " \ - "that does not implement __await__: int", exc.args[0]) + assert re.search("'async with' received an object from __aexit__ that does not implement __await__: int", exc.args[0]) assert exc.__context__ is not None assert isinstance(exc.__context__, ZeroDivisionError) else: @@ -875,6 +896,7 @@ async def foo(): @pypyxfail +@graalpyxfail def test_with_8(lop): CNT = 0 @@ -891,8 +913,7 @@ async def foo(): async with lop.Proxy(CM): CNT += 1 - with pytest.raises(TypeError, match="'async with' received an object from __aexit__ " - "that does not implement __await__: int"): + with pytest.raises(TypeError, match="'async with' received an object from __aexit__ that does not implement __await__: int"): run_async(lop.Proxy(foo)) assert CNT == 1 @@ -904,8 +925,7 @@ async def foo(): CNT += 1 break - with pytest.raises(TypeError, match="'async with' received an object from __aexit__ " - "that does not implement __await__: int"): + with pytest.raises(TypeError, match="'async with' received an object from __aexit__ that does not implement __await__: int"): run_async(lop.Proxy(foo)) assert CNT == 2 @@ -917,8 +937,7 @@ async def foo(): CNT += 1 continue - with pytest.raises(TypeError, match="'async with' received an object from __aexit__ " - "that does not implement __await__: int"): + with pytest.raises(TypeError, match="'async with' received an object from __aexit__ that does not implement __await__: int"): run_async(lop.Proxy(foo)) assert CNT == 3 @@ -929,8 +948,7 @@ async def foo(): CNT += 1 return - with pytest.raises(TypeError, match="'async with' received an object from __aexit__ " - "that does not implement __await__: int"): + with pytest.raises(TypeError, match="'async with' received an object from __aexit__ that does not implement __await__: int"): run_async(lop.Proxy(foo)) assert CNT == 4 @@ -977,12 +995,12 @@ async def foo(): except ZeroDivisionError as exc: assert exc.__context__ is not None assert isinstance(exc.__context__, ZeroDivisionError) - assert isinstance(exc.__context__.__context__, - RuntimeError) + assert isinstance(exc.__context__.__context__, RuntimeError) else: pytest.fail('exception from __aexit__ did not propagate') +@graalpyxfail def test_with_11(lop): CNT = 0 @@ -1025,6 +1043,7 @@ async def foo(): run_async(lop.Proxy(foo)) +@graalpyxfail def test_with_13(lop): CNT = 0 @@ -1116,8 +1135,7 @@ async def test3(): # Make sure that __aiter__ was called only once assert aiter_calls == 3 assert yielded == [i * 100 for i in range(1, 11)] - assert buffer == [i for i in range(1, 21)] + \ - ['what?', 'end'] + assert buffer == [i for i in range(1, 21)] + ['what?', 'end'] @pypyxfail @@ -1218,7 +1236,7 @@ async def main(): I += 1000 with warnings.catch_warnings(): - warnings.simplefilter("error") + warnings.simplefilter('error') # Test that __aiter__ that returns an asynchronous iterator # directly does not throw any warnings. run_async(main()) @@ -1303,7 +1321,7 @@ async def foo(): with pytest.raises(ZeroDivisionError): with warnings.catch_warnings(): - warnings.simplefilter("error") + warnings.simplefilter('error') # Test that if __aiter__ raises an exception it propagates # without any kind of warning. run_async(lop.Proxy(foo)) @@ -1415,37 +1433,28 @@ async def f(i): return i async def run_list(): - return [s for c in [lop.Proxy(lambda: f('')), lop.Proxy(lambda: f('abc')), lop.Proxy(lambda: f('')), - lop.Proxy(lambda: f(['de', 'fg']))] - for s in await c] + return [ + s + for c in [lop.Proxy(lambda: f('')), lop.Proxy(lambda: f('abc')), lop.Proxy(lambda: f('')), lop.Proxy(lambda: f(['de', 'fg']))] + for s in await c + ] - assert run_async(lop.Proxy(run_list)) == \ - ([], ['a', 'b', 'c', 'de', 'fg']) + assert run_async(lop.Proxy(run_list)) == ([], ['a', 'b', 'c', 'de', 'fg']) async def run_set(): return { - d for c in [ - lop.Proxy(lambda: f([ - lop.Proxy(lambda: f([10, 30])), - lop.Proxy(lambda: f([20]))])) - ] + d + for c in [lop.Proxy(lambda: f([lop.Proxy(lambda: f([10, 30])), lop.Proxy(lambda: f([20]))]))] for s in await c - for d in await s} + for d in await s + } - assert run_async(lop.Proxy(run_set)) == \ - ([], {10, 20, 30}) + assert run_async(lop.Proxy(run_set)) == ([], {10, 20, 30}) async def run_set2(): - return { - await s - for c in [lop.Proxy(lambda: f([ - lop.Proxy(lambda: f(10)), - lop.Proxy(lambda: f(20)) - ]))] - for s in await c} + return {await s for c in [lop.Proxy(lambda: f([lop.Proxy(lambda: f(10)), lop.Proxy(lambda: f(20))]))] for s in await c} - assert run_async(lop.Proxy(run_set2)) == \ - ([], {10, 20}) + assert run_async(lop.Proxy(run_set2)) == ([], {10, 20}) def test_comp_3(lop): @@ -1456,27 +1465,23 @@ async def f(it): async def run_list(): return [i + 1 async for i in f([10, 20])] - assert run_async(run_list()) == \ - ([], [11, 21]) + assert run_async(run_list()) == ([], [11, 21]) async def run_set(): return {i + 1 async for i in f([10, 20])} - assert run_async(run_set()) == \ - ([], {11, 21}) + assert run_async(run_set()) == ([], {11, 21}) async def run_dict(): return {i + 1: i + 2 async for i in f([10, 20])} - assert run_async(run_dict()) == \ - ([], {11: 12, 21: 22}) + assert run_async(run_dict()) == ([], {11: 12, 21: 22}) async def run_gen(): gen = (i + 1 async for i in f([10, 20])) return [g + 100 async for g in gen] - assert run_async(run_gen()) == \ - ([], [111, 121]) + assert run_async(run_gen()) == ([], [111, 121]) def test_comp_4(lop): @@ -1487,27 +1492,23 @@ async def f(it): async def run_list(): return [i + 1 async for i in f([10, 20]) if i > 10] - assert run_async(run_list()) == \ - ([], [21]) + assert run_async(run_list()) == ([], [21]) async def run_set(): return {i + 1 async for i in f([10, 20]) if i > 10} - assert run_async(run_set()) == \ - ([], {21}) + assert run_async(run_set()) == ([], {21}) async def run_dict(): return {i + 1: i + 2 async for i in f([10, 20]) if i > 10} - assert run_async(run_dict()) == \ - ([], {21: 22}) + assert run_async(run_dict()) == ([], {21: 22}) async def run_gen(): gen = (i + 1 async for i in f([10, 20]) if i > 10) return [g + 100 async for g in gen] - assert run_async(run_gen()) == \ - ([], [121]) + assert run_async(run_gen()) == ([], [121]) def test_comp_4_2(lop): @@ -1518,27 +1519,23 @@ async def f(it): async def run_list(): return [i + 10 async for i in f(range(5)) if 0 < i < 4] - assert run_async(run_list()) == \ - ([], [11, 12, 13]) + assert run_async(run_list()) == ([], [11, 12, 13]) async def run_set(): return {i + 10 async for i in f(range(5)) if 0 < i < 4} - assert run_async(run_set()) == \ - ([], {11, 12, 13}) + assert run_async(run_set()) == ([], {11, 12, 13}) async def run_dict(): return {i + 10: i + 100 async for i in f(range(5)) if 0 < i < 4} - assert run_async(run_dict()) == \ - ([], {11: 101, 12: 102, 13: 103}) + assert run_async(run_dict()) == ([], {11: 101, 12: 102, 13: 103}) async def run_gen(): gen = (i + 10 async for i in f(range(5)) if 0 < i < 4) return [g + 100 async for g in gen] - assert run_async(run_gen()) == \ - ([], [111, 112, 113]) + assert run_async(run_gen()) == ([], [111, 112, 113]) def test_comp_5(lop): @@ -1547,11 +1544,9 @@ async def f(it): yield i async def run_list(): - return [i + 1 for pair in ([10, 20], [30, 40]) if pair[0] > 10 - async for i in f(pair) if i > 30] + return [i + 1 for pair in ([10, 20], [30, 40]) if pair[0] > 10 async for i in f(pair) if i > 30] - assert run_async(run_list()) == \ - ([], [41]) + assert run_async(run_list()) == ([], [41]) def test_comp_6(lop): @@ -1560,11 +1555,9 @@ async def f(it): yield i async def run_list(): - return [i + 1 async for seq in f([(10, 20), (30,)]) - for i in seq] + return [i + 1 async for seq in f([(10, 20), (30,)]) for i in seq] - assert run_async(run_list()) == \ - ([], [11, 21, 31]) + assert run_async(run_list()) == ([], [11, 21, 31]) def test_comp_7(lop): @@ -1584,8 +1577,7 @@ def test_comp_8(lop): async def f(): return [i for i in [1, 2, 3]] - assert run_async(f()) == \ - ([], [1, 2, 3]) + assert run_async(f()) == ([], [1, 2, 3]) def test_comp_9(lop): @@ -1597,8 +1589,7 @@ async def f(): l = [i async for i in gen()] return [i for i in l] - assert run_async(f()) == \ - ([], [1, 2]) + assert run_async(f()) == ([], [1, 2]) def test_comp_10(lop): @@ -1606,8 +1597,7 @@ async def f(): xx = {i for i in [1, 2, 3]} return {x: x for x in xx} - assert run_async(f()) == \ - ([], {1: 1, 2: 2, 3: 3}) + assert run_async(f()) == ([], {1: 1, 2: 2, 3: 3}) def test_copy(lop): @@ -1644,7 +1634,7 @@ async def func(): aw.close() -@pytest.mark.skipif("sys.version_info[1] < 8") +@pytest.mark.skipif('sys.version_info[1] < 8') def test_for_assign_raising_stop_async_iteration(lop): class BadTarget: def __setitem__(self, key, value): @@ -1684,7 +1674,7 @@ async def run_gen(): assert run_async(run_gen()) == ([], 'end') -@pytest.mark.skipif("sys.version_info[1] < 8") +@pytest.mark.skipif('sys.version_info[1] < 8') def test_for_assign_raising_stop_async_iteration_2(lop): class BadIterable: def __iter__(self): diff --git a/tests/test_lazy_object_proxy.py b/tests/test_lazy_object_proxy.py index 60555de..4140c10 100644 --- a/tests/test_lazy_object_proxy.py +++ b/tests/test_lazy_object_proxy.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import gc import os import pickle @@ -13,12 +11,11 @@ from functools import partial import pytest -from compat import PY2 -from compat import PY3 -from compat import exec_ PYPY = '__pypy__' in sys.builtin_module_names +graalpyxfail = pytest.mark.xfail('sys.implementation.name == "graalpy"') + OBJECTS_CODE = """ class TargetBaseClass(object): "documentation" @@ -32,7 +29,7 @@ def target(): """ objects = types.ModuleType('objects') -exec_(OBJECTS_CODE, objects.__dict__, objects.__dict__) +exec(OBJECTS_CODE, objects.__dict__, objects.__dict__) def test_round(lop): @@ -40,6 +37,11 @@ def test_round(lop): assert round(proxy) == 1 +def test_round_ndigits(lop): + proxy = lop.Proxy(lambda: 1.49494) + assert round(proxy, 3) == 1.495 + + def test_attributes(lop): def function1(*args, **kwargs): return args, kwargs @@ -72,8 +74,7 @@ def function1(*args, **kwargs): assert function2.__wrapped__ is function1 assert function2.__name__ == function1.__name__ - if PY3: - assert function2.__qualname__ == function1.__qualname__ + assert function2.__qualname__ == function1.__qualname__ function2.__wrapped__ = None @@ -83,8 +84,7 @@ def function1(*args, **kwargs): assert function2.__wrapped__ is None assert not hasattr(function2, '__name__') - if PY3: - assert not hasattr(function2, '__qualname__') + assert not hasattr(function2, '__qualname__') def function3(*args, **kwargs): return args, kwargs @@ -95,8 +95,7 @@ def function3(*args, **kwargs): assert function2.__wrapped__ == function3 assert function2.__name__ == function3.__name__ - if PY3: - assert function2.__qualname__ == function3.__qualname__ + assert function2.__qualname__ == function3.__qualname__ def test_wrapped_attribute(lop): @@ -226,6 +225,7 @@ def test_function_doc_string(lop): assert wrapper.__doc__ == target.__doc__ +@graalpyxfail def test_class_of_class(lop): # Test preservation of class __class__ attribute. @@ -274,6 +274,7 @@ def test_class_of_instance(lop): assert isinstance(wrapper, objects.TargetBaseClass) +@graalpyxfail def test_class_of_function(lop): # Test preservation of function __class__ attribute. @@ -372,7 +373,7 @@ def function(*args, **kwargs): def test_function_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} def function(*args, **kwargs): return args, kwargs @@ -386,7 +387,7 @@ def function(*args, **kwargs): def test_function_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} def function(*args, **kwargs): return args, kwargs @@ -402,7 +403,7 @@ def test_instancemethod_no_args(lop): _args = () _kwargs = {} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -417,7 +418,7 @@ def test_instancemethod_args(lop): _args = (1, 2) _kwargs = {} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -430,9 +431,9 @@ def function(self, *args, **kwargs): def test_instancemethod_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -445,9 +446,9 @@ def function(self, *args, **kwargs): def test_instancemethod_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -462,7 +463,7 @@ def test_instancemethod_via_class_no_args(lop): _args = () _kwargs = {} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -477,7 +478,7 @@ def test_instancemethod_via_class_args(lop): _args = (1, 2) _kwargs = {} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -490,9 +491,9 @@ def function(self, *args, **kwargs): def test_instancemethod_via_class_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -505,9 +506,9 @@ def function(self, *args, **kwargs): def test_instancemethod_via_class_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: def function(self, *args, **kwargs): return args, kwargs @@ -522,7 +523,7 @@ def test_classmethod_no_args(lop): _args = () _kwargs = {} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -538,7 +539,7 @@ def test_classmethod_args(lop): _args = (1, 2) _kwargs = {} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -552,9 +553,9 @@ def function(cls, *args, **kwargs): def test_classmethod_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -568,9 +569,9 @@ def function(cls, *args, **kwargs): def test_classmethod_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -586,7 +587,7 @@ def test_classmethod_via_class_no_args(lop): _args = () _kwargs = {} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -602,7 +603,7 @@ def test_classmethod_via_class_args(lop): _args = (1, 2) _kwargs = {} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -616,9 +617,9 @@ def function(cls, *args, **kwargs): def test_classmethod_via_class_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -632,9 +633,9 @@ def function(cls, *args, **kwargs): def test_classmethod_via_class_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @classmethod def function(cls, *args, **kwargs): return args, kwargs @@ -650,7 +651,7 @@ def test_staticmethod_no_args(lop): _args = () _kwargs = {} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -666,7 +667,7 @@ def test_staticmethod_args(lop): _args = (1, 2) _kwargs = {} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -680,9 +681,9 @@ def function(*args, **kwargs): def test_staticmethod_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -696,9 +697,9 @@ def function(*args, **kwargs): def test_staticmethod_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -714,7 +715,7 @@ def test_staticmethod_via_class_no_args(lop): _args = () _kwargs = {} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -730,7 +731,7 @@ def test_staticmethod_via_class_args(lop): _args = (1, 2) _kwargs = {} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -744,9 +745,9 @@ def function(*args, **kwargs): def test_staticmethod_via_class_kwargs(lop): _args = () - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -760,9 +761,9 @@ def function(*args, **kwargs): def test_staticmethod_via_class_args_plus_kwargs(lop): _args = (1, 2) - _kwargs = {"one": 1, "two": 2} + _kwargs = {'one': 1, 'two': 2} - class Class(object): + class Class: @staticmethod def function(*args, **kwargs): return args, kwargs @@ -779,7 +780,7 @@ def test_iteration(lop): wrapper = lop.Proxy(lambda: items) - result = [x for x in wrapper] + result = [x for x in wrapper] # noqa: C416 assert result == items @@ -794,7 +795,7 @@ def test_iter_builtin(lop): def test_context_manager(lop): - class Class(object): + class Class: def __enter__(self): return self @@ -824,13 +825,11 @@ def function1(*args, **kwargs): function2 = lop.Proxy(lambda: function1) - table = dict() - table[function1] = True + table = {function1: True} assert table.get(function2) - table = dict() - table[function2] = True + table = {function2: True} assert table.get(function1) @@ -884,9 +883,6 @@ def test_int(lop): assert int(one) == 1 - if not PY3: - assert long(one) == 1 # noqa - def test_float(lop): one = lop.Proxy(lambda: 1) @@ -921,6 +917,38 @@ def test_mul(lop): assert two * 3 == 2 * 3 +def test_matmul(lop): + class MatmulClass: + def __init__(self, value): + self.value = value + + def __matmul__(self, other): + return self.value * other.value + + def __rmatmul__(self, other): + return other + self.value + + one = MatmulClass(123) + two = MatmulClass(234) + assert one @ two == 28782 + + one = lop.Proxy(lambda: MatmulClass(123)) + two = lop.Proxy(lambda: MatmulClass(234)) + assert one @ two == 28782 + + one = lop.Proxy(lambda: MatmulClass(123)) + two = MatmulClass(234) + assert one @ two == 28782 + + one = 123 + two = lop.Proxy(lambda: MatmulClass(234)) + assert one @ two == 357 + + one = lop.Proxy(lambda: 123) + two = lop.Proxy(lambda: MatmulClass(234)) + assert one @ two == 357 + + def test_div(lop): # On Python 2 this will pick up div and on Python # 3 it will pick up truediv. @@ -964,21 +992,30 @@ def test_pow(lop): two = lop.Proxy(lambda: 2) three = lop.Proxy(lambda: 3) - assert three ** two == pow(3, 2) - assert 3 ** two == pow(3, 2) - assert three ** 2 == pow(3, 2) + assert three**two == pow(3, 2) + assert 3**two == pow(3, 2) + assert pow(3, two) == pow(3, 2) + assert three**2 == pow(3, 2) assert pow(three, two) == pow(3, 2) assert pow(3, two) == pow(3, 2) assert pow(three, 2) == pow(3, 2) + assert pow(three, 2, 2) == pow(3, 2, 2) - # Only PyPy implements __rpow__ for ternary pow(). - if PYPY: - assert pow(three, two, 2) == pow(3, 2, 2) - assert pow(3, two, 2) == pow(3, 2, 2) +@pytest.mark.xfail +def test_pow_ternary(lop): + two = lop.Proxy(lambda: 2) + three = lop.Proxy(lambda: 3) - assert pow(three, 2, 2) == pow(3, 2, 2) + assert pow(three, two, 2) == pow(3, 2, 2) + + +@pytest.mark.xfail +def test_rpow_ternary(lop): + two = lop.Proxy(lambda: 2) + + assert pow(3, two, 2) == pow(3, 2, 2) def test_lshift(lop): @@ -1034,13 +1071,13 @@ def test_iadd(lop): assert value == 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value += one assert value == 3 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_isub(lop): @@ -1050,13 +1087,13 @@ def test_isub(lop): value -= 1 assert value == 0 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value -= one assert value == -1 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_imul(lop): @@ -1067,13 +1104,34 @@ def test_imul(lop): assert value == 4 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value *= two assert value == 8 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy + + +def test_imatmul(lop): + class InplaceMatmul: + value = None + + def __imatmul__(self, other): + self.value = other + return self + + value = InplaceMatmul() + assert value.value is None + value @= 123 + assert value.value == 123 + + value = lop.Proxy(InplaceMatmul) + value @= 234 + assert value.value == 234 + + if lop.kind != 'simple': + assert type(value) is lop.Proxy def test_idiv(lop): @@ -1087,13 +1145,13 @@ def test_idiv(lop): assert value == 2 / 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value /= two assert value == 2 / 2 / 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_ifloordiv(lop): @@ -1104,13 +1162,13 @@ def test_ifloordiv(lop): assert value == 2 // 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value //= two assert value == 2 // 2 // 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_imod(lop): @@ -1121,13 +1179,13 @@ def test_imod(lop): assert value == 10 % 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value %= two assert value == 10 % 2 % 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_ipow(lop): @@ -1135,16 +1193,16 @@ def test_ipow(lop): two = lop.Proxy(lambda: 2) value **= 2 - assert value == 10 ** 2 + assert value == 10**2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value **= two - assert value == 10 ** 2 ** 2 + assert value == 10**2**2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_ilshift(lop): @@ -1155,13 +1213,13 @@ def test_ilshift(lop): assert value == 256 << 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value <<= two assert value == 256 << 2 << 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_irshift(lop): @@ -1172,13 +1230,13 @@ def test_irshift(lop): assert value == 2 >> 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value >>= two assert value == 2 >> 2 >> 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_iand(lop): @@ -1189,13 +1247,13 @@ def test_iand(lop): assert value == 1 & 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value &= two assert value == 1 & 2 & 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_ixor(lop): @@ -1206,13 +1264,13 @@ def test_ixor(lop): assert value == 1 ^ 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value ^= two assert value == 1 ^ 2 ^ 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_ior(lop): @@ -1223,13 +1281,13 @@ def test_ior(lop): assert value == 1 | 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy value |= two assert value == 1 | 2 | 2 if lop.kind != 'simple': - assert type(value) == lop.Proxy + assert type(value) is lop.Proxy def test_neg(lop): @@ -1269,7 +1327,7 @@ def test_hex(lop): def test_index(lop): - class Class(object): + class Class: def __index__(self): return 1 @@ -1416,12 +1474,12 @@ def test_repr_doesnt_consume(lop): def test_derived_new(lop): class DerivedObjectProxy(lop.Proxy): def __new__(cls, wrapped): - instance = super(DerivedObjectProxy, cls).__new__(cls) + instance = super().__new__(cls) instance.__init__(wrapped) return instance def __init__(self, wrapped): - super(DerivedObjectProxy, self).__init__(wrapped) + super().__init__(wrapped) def function(): return 123 @@ -1498,9 +1556,9 @@ class DerivedObjectProxy(lop.Proxy): def __getattr__(self, name): accessed.append(name) try: - __getattr__ = super(DerivedObjectProxy, self).__getattr__ + __getattr__ = super().__getattr__ except AttributeError as e: - raise RuntimeError(str(e)) + raise RuntimeError(str(e)) from e return __getattr__(name) function.attribute = 1 @@ -1512,15 +1570,14 @@ def __getattr__(self, name): assert 'attribute' in accessed -skipcallable = pytest.mark.xfail( - reason="Don't know how to make this work. This tests the existence of the __call__ method.") +skipcallable = pytest.mark.xfail(reason="Don't know how to make this work. This tests the existence of the __call__ method.") @skipcallable def test_proxy_hasattr_call(lop): proxy = lop.Proxy(lambda: None) - assert not hasattr(proxy, '__call__') + assert not callable(proxy) @skipcallable @@ -1540,7 +1597,7 @@ def test_proxy_is_callable(lop): def test_callable_proxy_hasattr_call(lop): proxy = lop.Proxy(lambda: None) - assert hasattr(proxy, '__call__') + assert callable(proxy) @skipcallable @@ -1557,16 +1614,15 @@ def test_callable_proxy_is_callable(lop): def test_class_bytes(lop): - if PY3: - class Class(object): - def __bytes__(self): - return b'BYTES' + class Class: + def __bytes__(self): + return b'BYTES' - instance = Class() + instance = Class() - proxy = lop.Proxy(lambda: instance) + proxy = lop.Proxy(lambda: instance) - assert bytes(instance) == bytes(proxy) + assert bytes(instance) == bytes(proxy) def test_str_format(lop): @@ -1606,13 +1662,7 @@ def test_fractions_round(lop): def test_readonly(lop): - class Foo(object): - if PY2: - @property - def __qualname__(self): - return 'object' - - proxy = lop.Proxy(lambda: Foo() if PY2 else object) + proxy = lop.Proxy(lambda: object) assert proxy.__qualname__ == 'object' @@ -1636,7 +1686,7 @@ def make_foo(): def test_raise_attribute_error(lop): def foo(): - raise AttributeError("boom!") + raise AttributeError('boom!') proxy = lop.Proxy(foo) pytest.raises(AttributeError, str, proxy) @@ -1646,7 +1696,7 @@ def foo(): def test_patching_the_factory(lop): def foo(): - raise AttributeError("boom!") + raise AttributeError('boom!') proxy = lop.Proxy(foo) pytest.raises(AttributeError, lambda: proxy.__wrapped__) @@ -1708,22 +1758,17 @@ def test_set_wrapped_regular(lop): assert obj + 1 == 2 -@pytest.fixture(params=["pickle", "cPickle"]) +@pytest.fixture( + params=[ + 'pickle', + ] +) def pickler(request): return pytest.importorskip(request.param) -@pytest.mark.parametrize("obj", [ - 1, - 1.2, - "a", - ["b", "c"], - {"d": "e"}, - date(2015, 5, 1), - datetime(2015, 5, 1), - Decimal("1.2") -]) -@pytest.mark.parametrize("level", range(pickle.HIGHEST_PROTOCOL + 1)) +@pytest.mark.parametrize('obj', [1, 1.2, 'a', ['b', 'c'], {'d': 'e'}, date(2015, 5, 1), datetime(2015, 5, 1), Decimal('1.2')]) +@pytest.mark.parametrize('level', range(pickle.HIGHEST_PROTOCOL + 1)) def test_pickling(lop, obj, pickler, level): proxy = lop.Proxy(lambda: obj) dump = pickler.dumps(proxy, protocol=level) @@ -1731,34 +1776,32 @@ def test_pickling(lop, obj, pickler, level): assert obj == result -@pytest.mark.parametrize("level", range(pickle.HIGHEST_PROTOCOL + 1)) +@pytest.mark.parametrize('level', range(pickle.HIGHEST_PROTOCOL + 1)) def test_pickling_exception(lop, pickler, level): class BadStuff(Exception): pass def trouble_maker(): - raise BadStuff("foo") + raise BadStuff('foo') proxy = lop.Proxy(trouble_maker) pytest.raises(BadStuff, pickler.dumps, proxy, protocol=level) -@pytest.mark.skipif(platform.python_implementation() != 'CPython', - reason="Interpreter doesn't have reference counting") +@pytest.mark.skipif(platform.python_implementation() != 'CPython', reason="Interpreter doesn't have reference counting") def test_garbage_collection(lop): - leaky = lambda: "foobar" # noqa + leaky = lambda: 'foobar' # noqa proxy = lop.Proxy(leaky) leaky.leak = proxy ref = weakref.ref(leaky) - assert proxy == "foobar" + assert proxy == 'foobar' del leaky del proxy gc.collect() assert ref() is None -@pytest.mark.skipif(platform.python_implementation() != 'CPython', - reason="Interpreter doesn't have reference counting") +@pytest.mark.skipif(platform.python_implementation() != 'CPython', reason="Interpreter doesn't have reference counting") def test_garbage_collection_count(lop): obj = object() count = sys.getrefcount(obj) @@ -1767,10 +1810,10 @@ def test_garbage_collection_count(lop): assert count == sys.getrefcount(obj) -@pytest.mark.parametrize("name", ["slots", "cext", "simple", "django", "objproxies"]) +@pytest.mark.parametrize('name', ['slots', 'cext', 'simple', 'django', 'objproxies']) def test_perf(benchmark, name, lop_loader): implementation = lop_loader(name) - obj = "foobar" + obj = 'foobar' proxied = implementation.Proxy(lambda: obj) assert benchmark(partial(str, proxied)) == obj @@ -1778,14 +1821,15 @@ def test_perf(benchmark, name, lop_loader): empty = object() -@pytest.fixture(scope="module", params=["SimpleProxy", "LocalsSimpleProxy", "CachedPropertyProxy", - "LocalsCachedPropertyProxy"]) +@pytest.fixture(scope='module', params=['SimpleProxy', 'LocalsSimpleProxy', 'CachedPropertyProxy', 'LocalsCachedPropertyProxy']) def prototype(request): from lazy_object_proxy.simple import cached_property + name = request.param - if name == "SimpleProxy": - class SimpleProxy(object): + if name == 'SimpleProxy': + + class SimpleProxy: def __init__(self, factory): self.factory = factory self.object = empty @@ -1796,8 +1840,9 @@ def __str__(self): return str(self.object) return SimpleProxy - elif name == "CachedPropertyProxy": - class CachedPropertyProxy(object): + elif name == 'CachedPropertyProxy': + + class CachedPropertyProxy: def __init__(self, factory): self.factory = factory @@ -1809,8 +1854,9 @@ def __str__(self): return str(self.object) return CachedPropertyProxy - elif name == "LocalsSimpleProxy": - class LocalsSimpleProxy(object): + elif name == 'LocalsSimpleProxy': + + class LocalsSimpleProxy: def __init__(self, factory): self.factory = factory self.object = empty @@ -1821,8 +1867,9 @@ def __str__(self, func=str): return func(self.object) return LocalsSimpleProxy - elif name == "LocalsCachedPropertyProxy": - class LocalsCachedPropertyProxy(object): + elif name == 'LocalsCachedPropertyProxy': + + class LocalsCachedPropertyProxy: def __init__(self, factory): self.factory = factory @@ -1836,9 +1883,9 @@ def __str__(self, func=str): return LocalsCachedPropertyProxy -@pytest.mark.benchmark(group="prototypes") +@pytest.mark.benchmark(group='prototypes') def test_proto(benchmark, prototype): - obj = "foobar" + obj = 'foobar' proxied = prototype(lambda: obj) assert benchmark(partial(str, proxied)) == obj @@ -1853,7 +1900,7 @@ class LazyProxy(lop.Proxy): name = None def __init__(self, func, **lazy_attr): - super(LazyProxy, self).__init__(func) + super().__init__(func) for attr, val in lazy_attr.items(): setattr(self, attr, val) @@ -1864,7 +1911,7 @@ def __init__(self, func, **lazy_attr): def test_subclassing_dynamic_with_local_attr(lop): if lop.kind == 'cext': - pytest.skip("Not possible.") + pytest.skip('Not possible.') class Foo: pass @@ -1873,7 +1920,7 @@ class Foo: class LazyProxy(lop.Proxy): def __init__(self, func, **lazy_attr): - super(LazyProxy, self).__init__(func) + super().__init__(func) for attr, val in lazy_attr.items(): object.__setattr__(self, attr, val) @@ -1882,22 +1929,22 @@ def __init__(self, func, **lazy_attr): assert not called -class FSPathMock(object): +class FSPathMock: def __fspath__(self): - return '/tmp' + return '/foobar' -@pytest.mark.skipif(not hasattr(os, "fspath"), reason="No os.fspath support.") +@pytest.mark.skipif(not hasattr(os, 'fspath'), reason='No os.fspath support.') def test_fspath(lop): - assert os.fspath(lop.Proxy(lambda: '/tmp')) == '/tmp' - assert os.fspath(lop.Proxy(FSPathMock)) == '/tmp' + assert os.fspath(lop.Proxy(lambda: '/foobar')) == '/foobar' + assert os.fspath(lop.Proxy(FSPathMock)) == '/foobar' with pytest.raises(TypeError) as excinfo: os.fspath(lop.Proxy(lambda: None)) assert '__fspath__() to return str or bytes, not NoneType' in excinfo.value.args[0] def test_fspath_method(lop): - assert lop.Proxy(FSPathMock).__fspath__() == '/tmp' + assert lop.Proxy(FSPathMock).__fspath__() == '/foobar' def test_resolved_new(lop): @@ -1917,3 +1964,12 @@ def test_resolved_str(lop): assert obj.__resolved__ is False str(obj) assert obj.__resolved__ is True + + +def test_format(lop): + class WithFormat: + def __format__(self, format_spec): + return f'spec({format_spec!r})' + + obj = lop.Proxy(WithFormat) + assert f'{obj:stuff}' == "spec('stuff')" diff --git a/tox.ini b/tox.ini index 943f03d..56c22c9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,35 +1,34 @@ [testenv:bootstrap] deps = jinja2 - matrix tox skip_install = true commands = python ci/bootstrap.py --no-env passenv = * -; a generative tox configuration, see: https://tox.readthedocs.io/en/latest/config.html#generative-envlist +; a generative tox configuration, see: https://tox.wiki/en/latest/user_guide.html#generative-environments [tox] envlist = clean, check, docs, - {py36,py37,py38,py39,py310,pypy37,pypy38}-{cover,nocov}, + {py39,py310,py311,py312,py313,py313-ft,pypy39,pypy310,graalpy}-{cover,nocov}, report ignore_basepython_conflict = true [testenv] basepython = - pypy: {env:TOXPYTHON:pypy} - pypy37: {env:TOXPYTHON:pypy3.7} - pypy38: {env:TOXPYTHON:pypy3.8} - py27: {env:TOXPYTHON:python2.7} - py36: {env:TOXPYTHON:python3.6} - py37: {env:TOXPYTHON:python3.7} - py38: {env:TOXPYTHON:python3.8} + pypy39: {env:TOXPYTHON:pypy3.9} + pypy310: {env:TOXPYTHON:pypy3.10} py39: {env:TOXPYTHON:python3.9} py310: {env:TOXPYTHON:python3.10} + py311: {env:TOXPYTHON:python3.11} + py312: {env:TOXPYTHON:python3.12} + py313: {env:TOXPYTHON:python3.13} + py313ft: {env:TOXPYTHON:python3.13t} + graalpy: {env:TOXPYTHON:graalpy} {bootstrap,clean,check,report,docs,codecov,coveralls,extension-coveralls}: {env:TOXPYTHON:python3} setenv = PYTHONPATH={toxinidir}/tests @@ -40,34 +39,32 @@ passenv = usedevelop = cover: true nocov: false -wheel = - cover: false - nocov: true deps = pytest pytest-benchmark Django objproxies==0.9.4 hunter + setuptools cover: pytest-cov commands = cover: python setup.py clean --all build_ext --force --inplace nocov: {posargs:pytest -vv --ignore=src} - cover: {posargs:pytest --cov --cov-report=term-missing -vv} + cover: {posargs:pytest --cov --cov-report=term-missing --cov-report=xml -vv} [testenv:check] deps = docutils - flake8 + pre-commit readme-renderer pygments isort + setuptools setuptools-scm skip_install = true commands = python setup.py check --strict --metadata --restructuredtext - flake8 - isort --verbose --check-only --diff --filter-files . + pre-commit run --all-files --show-diff-on-failure [testenv:docs] usedevelop = true @@ -79,27 +76,6 @@ commands = sphinx-build {posargs:-E} -b html docs dist/docs sphinx-build -b linkcheck docs dist/docs -[testenv:coveralls] -deps = - coveralls -skip_install = true -commands = - coveralls {env:COVERALLS_EXTRAS:--merge=extension-coveralls.json} [] - -[testenv:extension-coveralls] -deps = - cpp-coveralls -skip_install = true -commands = - coveralls --build-root=. --include=src --dump=extension-coveralls.json [] - -[testenv:codecov] -deps = - codecov -skip_install = true -commands = - codecov --gcov-root=. [] - [testenv:report] deps = coverage @@ -109,7 +85,10 @@ commands = coverage html [testenv:clean] -commands = coverage erase +commands = + python setup.py clean + coverage erase skip_install = true deps = + setuptools coverage pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy