Up.

ionelmc · Mar 23, 2024 · 8d7192d · 8d7192d
1 parent 4af5e6c
commit 8d7192d
Show file tree

Hide file tree

Showing 23 changed files with 1,389 additions and 580 deletions.
diff --git a/.cookiecutterrc b/.cookiecutterrc
@@ -1,8 +1,6 @@
 # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
 default_context:
-    allow_tests_inside_package: 'no'
-    c_extension_function: longest
     c_extension_module: _nameless
     c_extension_optional: 'yes'
     c_extension_support: cython
@@ -21,6 +19,7 @@ default_context:
     github_actions_osx: 'yes'
     github_actions_windows: 'yes'
     license: BSD 2-Clause License
+    module_name: core
     package_name: nameless
     pre_commit: 'yes'
     project_name: Nameless
@@ -40,6 +39,7 @@ default_context:
     sphinx_doctest: 'yes'
     sphinx_theme: sphinx-rtd-theme
     test_matrix_separate_coverage: 'yes'
+    tests_inside_package: 'yes'
     version: 1.0.0
     version_manager: bump2version
     website: https://blog.ionelmc.ro

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -19,89 +19,6 @@ jobs:
             toxpython: 'python3.11'
             tox_env: 'docs'
             os: 'ubuntu-latest'
-          - name: 'py37-cover (ubuntu/x86_64)'
-            python: '3.7'
-            toxpython: 'python3.7'
-            python_arch: 'x64'
-            tox_env: 'py37-cover'
-            cover: true
-            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'
-            cover: true
-            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'
-            cover: true
-            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'
@@ -434,56 +351,88 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: 'cp311-*'
             os: 'macos-latest'
-          - name: 'pypy37-cover (ubuntu/x86_64)'
-            python: 'pypy-3.7'
-            toxpython: 'pypy3.7'
+          - name: 'py312-cover (ubuntu/x86_64)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'pypy37-cover'
+            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)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'pypy37-cover'
+            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/x86_64)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'pypy37-cover'
+            tox_env: 'py312-cover'
             cover: true
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
-          - name: 'pypy37-nocov (ubuntu/x86_64/manylinux)'
-            python: 'pypy-3.7'
-            toxpython: 'pypy3.7'
+          - name: 'py312-nocov (ubuntu/x86_64/manylinux)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'pypy37-nocov'
+            tox_env: 'py312-nocov'
             cibw_arch: 'x86_64'
-            cibw_build: false
+            cibw_build: 'cp312-*manylinux*'
+            os: 'ubuntu-latest'
+          - name: 'py312-nocov (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*'
+            os: 'ubuntu-latest'
+          - name: 'py312-nocov (ubuntu/aarch64/manylinux)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-nocov'
+            cibw_arch: 'aarch64'
+            cibw_build: 'cp312-*manylinux*'
+            os: 'ubuntu-latest'
+          - name: 'py312-nocov (ubuntu/aarch64/musllinux)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x64'
+            tox_env: 'py312-nocov'
+            cibw_arch: 'aarch64'
+            cibw_build: 'cp312-*musllinux*'
             os: 'ubuntu-latest'
-          - name: 'pypy37-nocov (windows/AMD64)'
-            python: 'pypy-3.7'
-            toxpython: 'pypy3.7'
+          - name: 'py312-nocov (windows/AMD64)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'pypy37-nocov'
+            tox_env: 'py312-nocov'
             cibw_arch: 'AMD64'
-            cibw_build: false
+            cibw_build: 'cp312-*'
+            os: 'windows-latest'
+          - name: 'py312-nocov (windows/x86)'
+            python: '3.12'
+            toxpython: 'python3.12'
+            python_arch: 'x86'
+            tox_env: 'py312-nocov'
+            cibw_arch: 'x86'
+            cibw_build: 'cp312-*'
             os: 'windows-latest'
-          - name: 'pypy37-nocov (macos/x86_64)'
-            python: 'pypy-3.7'
-            toxpython: 'pypy3.7'
+          - name: 'py312-nocov (macos/x86_64)'
+            python: '3.12'
+            toxpython: 'python3.12'
             python_arch: 'x64'
-            tox_env: 'pypy37-nocov'
+            tox_env: 'py312-nocov'
             cibw_arch: 'x86_64'
-            cibw_build: false
+            cibw_build: 'cp312-*'
             os: 'macos-latest'
           - name: 'pypy38-cover (ubuntu/x86_64)'
             python: 'pypy-3.8'
@@ -587,15 +536,66 @@ jobs:
             cibw_arch: 'x86_64'
             cibw_build: false
             os: 'macos-latest'
+          - name: 'pypy310-cover (ubuntu/x86_64)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-cover'
+            cover: true
+            cibw_arch: 'x86_64'
+            cibw_build: false
+            os: 'ubuntu-latest'
+          - name: 'pypy310-cover (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/x86_64)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-cover'
+            cover: true
+            cibw_arch: 'x86_64'
+            cibw_build: false
+            os: 'macos-latest'
+          - name: 'pypy310-nocov (ubuntu/x86_64/manylinux)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-nocov'
+            cibw_arch: 'x86_64'
+            cibw_build: false
+            os: 'ubuntu-latest'
+          - name: 'pypy310-nocov (windows/AMD64)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-nocov'
+            cibw_arch: 'AMD64'
+            cibw_build: false
+            os: 'windows-latest'
+          - name: 'pypy310-nocov (macos/x86_64)'
+            python: 'pypy-3.10'
+            toxpython: 'pypy3.10'
+            python_arch: 'x64'
+            tox_env: 'pypy310-nocov'
+            cibw_arch: 'x86_64'
+            cibw_build: false
+            os: 'macos-latest'
     steps:
-    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-qemu-action@v3
       if: matrix.cibw_arch == 'aarch64'
       with:
         platforms: arm64
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_arch }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,17 +5,17 @@
 exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.263
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.4
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --show-fixes]
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.3.0
     hooks:
       - id: black
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude_types:

diff --git 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/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog
 =========
 
-0.1.0 (2023-05-01)
+1.0.0 (2024-03-23)
 ------------------
 
 * First release on PyPI.
diff --git a/README.rst b/README.rst
@@ -10,14 +10,11 @@ Overview
     * - docs
       - |docs|
     * - tests
-      - | |github-actions|
-        | |coveralls| |codecov|
-        | |scrutinizer| |codeclimate|
+      - |github-actions| |coveralls| |codecov| |scrutinizer| |codeclimate|
     * - package
-      - | |version| |wheel| |supported-versions| |supported-implementations|
-        | |commits-since|
+      - |version| |wheel| |supported-versions| |supported-implementations| |commits-since|
 .. |docs| image:: https://readthedocs.org/projects/python-nameless/badge/?style=flat
-    :target: https://python-nameless.readthedocs.io/
+    :target: https://readthedocs.org/projects/python-nameless/
     :alt: Documentation Status
 
 .. |github-actions| image:: https://github.com/ionelmc/python-nameless/actions/workflows/github-actions.yml/badge.svg

diff --git a/ci/bootstrap.py b/ci/bootstrap.py
@@ -64,7 +64,7 @@ def main():
     tox_environments = [line for line in tox_environments if line.startswith("py")]
     for template in templates_path.rglob("*"):
         if template.is_file():
-            template_path = str(template.relative_to(templates_path))
+            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))

diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml
@@ -22,9 +22,9 @@ jobs:
 {% for env in tox_environments %}
 {% set prefix = env.split('-')[0] -%}
 {% 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:] }}{% endset %}
 {% else %}
 {% set python %}{{ prefix[2] }}.{{ prefix[3:] }}{% endset %}
 {% set cpython %}cp{{ prefix[2:] }}{% endset %}
@@ -61,14 +61,14 @@ jobs:
 {% endfor %}
 {% endfor %}
     steps:
-    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-qemu-action@v3
       if: matrix.cibw_arch == 'aarch64'
       with:
         platforms: arm64
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: {{ '${{ matrix.python }}' }}
         architecture: {{ '${{ matrix.python_arch }}' }}