From 4b2355309f18184687aec83f3327517caa5d9f51 Mon Sep 17 00:00:00 2001 From: Theron Luhn Date: Wed, 20 Oct 2021 12:03:37 -0700 Subject: [PATCH] Add support for Pyramid 2.0 --- .github/workflows/tests.yml | 7 +++++-- setup.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ddf656..937e300 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,8 +14,11 @@ jobs: - "3.9" - "3.10" - "pypy3" + pyramid_version: + - "<2" + - ">=2" - name: "Python: ${{ matrix.py }}" + name: "Python: ${{ matrix.py }}, Pyramid: ${{ matrix.pyramid_version }}" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -24,7 +27,7 @@ jobs: with: python-version: ${{ matrix.py }} - name: Install - run: pip install .[testing] + run: pip install .[testing] "pyramid${{ matrix.pyramid_version }}" - name: Running tests run: pytest tests -v diff --git a/setup.py b/setup.py index c4aa590..ef84b98 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ ] REQUIRES = [ - "pyramid~=1.7", + "pyramid>=1.7", "marshmallow~=3.0" ]