Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
gi0baro committed Dec 21, 2023
2 parents 76c5696 + 5ce3db7 commit ff4e2a4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']

services:
postgres:
Expand All @@ -27,11 +27,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1.3
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Install dependencies
Expand All @@ -47,16 +47,16 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1.3
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Install dependencies
Expand All @@ -70,16 +70,16 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1.3
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion emmett/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.5.6"
__version__ = "2.5.7"
9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "emmett"

[tool.poetry]
name = "emmett"
version = "2.5.6"
version = "2.5.7"
description = "The web framework for inventors"
authors = ["Giovanni Barillari <[email protected]>"]
license = "BSD-3-Clause"
Expand All @@ -26,6 +26,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries :: Python Modules"
]
Expand All @@ -48,9 +49,9 @@ python = "^3.8"
click = ">=6.0"
granian = "~0.7.0"
emmett-crypto = "^0.5"
pendulum = "~2.1.2"
pendulum = "~3.0.0"
pyDAL = "17.3"
python-rapidjson = "^1.0"
python-rapidjson = "^1.14"
pyyaml = "^6.0"
renoir = "^1.6"
severus = "^1.1"
Expand All @@ -60,7 +61,7 @@ orjson = { version = "~3.9", optional = true }
uvicorn = { version = "^0.19.0", optional = true }
h11 = { version = ">= 0.12.0", optional = true }
websockets = { version = "^10.0", optional = true }
httptools = { version = "~0.5.0", optional = true, markers = "sys_platform != 'win32'" }
httptools = { version = "~0.6.0", optional = true, markers = "sys_platform != 'win32'" }

[tool.poetry.dev-dependencies]
ipaddress = "^1.0"
Expand Down

0 comments on commit ff4e2a4

Please sign in to comment.