Merge branch 'release/1.15.0'

GrahamDumpleton · Feb 27, 2023 · 0634a79 · 0634a79
2 parents f2f1a68 + ba845c6
commit 0634a79
Show file tree

Hide file tree

Showing 27 changed files with 1,041 additions and 171 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu-20.04
         python-version:
           - 2.7
           - 3.5
@@ -19,62 +19,63 @@ jobs:
           - 3.8
           - 3.9
           - "3.10"
-          - 3.11-dev
+          - 3.11
+          - 3.12-dev
           - pypy-2.7
-          - pypy-3.6
-          - pypy-3.7
+          - pypy-3.8
+          - pypy-3.9
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Update pip
       run: python -m pip install -U pip wheel setuptools
     - name: Install tox
-      run: python -m pip install tox tox-gh-actions
+      run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
     - name: Test with tox
       run: python -m tox
     - name: Store partial coverage reports
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: coverage
         path: .coverage.*
 
-  test_aarch64_linux:
-    name: Test (${{ matrix.python.os }}, ${{ matrix.python.python-version }}, aarch64)
-    runs-on: ${{ matrix.python.os }}
-    strategy:
-      matrix:
-        python:
-          #- {os: ubuntu-latest,  python-version: 3.7, pyver: py37}
-          #- {os: ubuntu-latest,  python-version: 3.8, pyver: py38}
-          #- {os: ubuntu-latest,  python-version: 3.9, pyver: py39}
-          - {os: ubuntu-latest,  python-version: "3.10", pyver: py310}
-    env:
-      py: python${{ matrix.python.python-version }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v1
-    - name: Test with tox
-      run: |
-            docker run --rm -v ${{ github.workspace }}:/io:rw --workdir=/io \
-            arm64v8/ubuntu \
-            bash -exc 'apt-get update && \
-            apt install software-properties-common -y && \
-            add-apt-repository ppa:deadsnakes/ppa -y && \
-            apt install -y ${{ env.py }} && \
-            apt install -y ${{ env.py }}-venv && \
-            ${{ env.py }} -m venv .env && \
-            source .env/bin/activate && \
-            pip install -U pip wheel setuptools && \
-            pip install tox tox-gh-actions && \
-            tox -e ${{ matrix.python.pyver }} && \
-            deactivate'
+  # test_aarch64_linux:
+  #   name: Test (${{ matrix.python.os }}, ${{ matrix.python.python-version }}, aarch64)
+  #   runs-on: ${{ matrix.python.os }}
+  #   strategy:
+  #     matrix:
+  #       python:
+  #         #- {os: ubuntu-20.04,  python-version: 3.7, pyver: py37}
+  #         #- {os: ubuntu-20.04,  python-version: 3.8, pyver: py38}
+  #         #- {os: ubuntu-20.04,  python-version: 3.9, pyver: py39}
+  #         - {os: ubuntu-20.04,  python-version: "3.10", pyver: py310}
+  #   env:
+  #     py: python${{ matrix.python.python-version }}
+  #   steps:
+  #   - name: Checkout
+  #     uses: actions/checkout@v2
+  #   - name: Set up QEMU
+  #     id: qemu
+  #     uses: docker/setup-qemu-action@v1
+  #   - name: Test with tox
+  #     run: |
+  #           docker run --rm -v ${{ github.workspace }}:/io:rw --workdir=/io \
+  #           arm64v8/ubuntu \
+  #           bash -exc 'apt-get update && \
+  #           apt install software-properties-common -y && \
+  #           add-apt-repository ppa:deadsnakes/ppa -y && \
+  #           apt install -y ${{ env.py }} && \
+  #           apt install -y ${{ env.py }}-venv && \
+  #           ${{ env.py }} -m venv .env && \
+  #           source .env/bin/activate && \
+  #           pip install -U pip wheel setuptools && \
+  #           pip install "tox<4.0.0" "tox-gh-actions<3.0.0" && \
+  #           tox -e ${{ matrix.python.pyver }} && \
+  #           deactivate'
 
   test_macos:
     name: Test (${{ matrix.os }}, ${{ matrix.python-version }})
@@ -91,25 +92,25 @@ jobs:
           - 3.8
           - 3.9
           - "3.10"
-          - 3.11-dev
+          - 3.11
           - pypy-2.7
-          #- pypy-3.6
-          - pypy-3.7
+          - pypy-3.8
+          - pypy-3.9
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Update pip
       run: python -m pip install -U pip wheel setuptools
     - name: Install tox
-      run: python -m pip install tox tox-gh-actions
+      run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
     - name: Test with tox
       run: python -m tox
     - name: Store partial coverage reports
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: coverage
         path: .coverage.*
@@ -125,15 +126,15 @@ jobs:
           - 2.7
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Update pip
       run: python -m pip install -U pip wheel setuptools
     - name: Install tox
-      run: python -m pip install tox tox-gh-actions
+      run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
     - name: Test with tox
       run: python -m tox -e py27,py27-without-extensions
 
@@ -151,21 +152,21 @@ jobs:
           - 3.8
           - 3.9
           - "3.10"
-          - 3.11-dev
+          - 3.11
           - pypy-2.7
-          - pypy-3.6
-          - pypy-3.7
+          - pypy-3.8
+          - pypy-3.9
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Update pip
       run: python -m pip install -U pip wheel setuptools
     - name: Install tox
-      run: python -m pip install tox tox-gh-actions
+      run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
     - name: Test with tox
       run: python -m tox
 
@@ -175,20 +176,24 @@ jobs:
     - test_linux
     - test_macos
     - test_windows
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.9
-    - name: Build source distribution
+    - name: Build full source distribution as tar.gz
       run: python setup.py sdist
+    - name: Install the wheel package
+      run: pip install wheel
+    - name: Build pure Python source wheel
+      run: WRAPT_INSTALL_EXTENSIONS=false python setup.py bdist_wheel
     - name: Store built wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist/*
@@ -203,9 +208,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-latest, macos-latest]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build wheels
         uses: pypa/cibuildwheel@v1.11.1.post1
         with:
@@ -215,7 +220,7 @@ jobs:
             CIBW_BUILD: cp27* cp35*
             CIBW_SKIP: cp27-win*
             CIBW_BUILD_VERBOSITY: 1
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/*.whl
@@ -224,35 +229,35 @@ jobs:
     name: Build wheels (3.6+) on ${{ matrix.os }} for ${{ matrix.arch }}
     needs:
     - test_linux
-    - test_aarch64_linux
+    #- test_aarch64_linux
     - test_macos
     - test_windows_py27
     - test_windows
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-latest, macos-latest]
         arch: [auto]
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             arch: aarch64
           - os: macos-latest
             arch: arm64
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up QEMU
         if: ${{ matrix.arch == 'aarch64' }}
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.4.0
+        uses: pypa/cibuildwheel@v2.11.4
         with:
           output-dir: dist
         env:
             WRAPT_INSTALL_EXTENSIONS: true
             CIBW_SKIP: pp*
             CIBW_BUILD_VERBOSITY: 1
             CIBW_ARCHS: ${{ matrix.arch }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/*.whl
@@ -265,18 +270,18 @@ jobs:
     - test_macos
     - test_windows_py27
     - test_windows
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Setup Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.9
     - name: Install coverage package
       run: python -m pip install -U coverage
     - name: Download partial coverage reports
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: coverage
     - name: Combine coverage

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2022, Graham Dumpleton
+Copyright (c) 2013-2023, Graham Dumpleton
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/Makefile b/Makefile
@@ -11,8 +11,11 @@ package :
 release : clean package
 	twine upload dist/*
 
-clean :
-	rm -rf build dist wrapt.egg-info
+mostlyclean:
+	rm -rf .coverage.*
+
+clean: mostlyclean
+	rm -rf build dist src/wrapt.egg-info .tox
 
 test :
 	tox --skip-missing-interpreters