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 Jun 21, 2021
2 parents afb7448 + baff432 commit c3fd798
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
9 changes: 9 additions & 0 deletions BACKERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Sponsors & Backers

Emmett is a BSD-licensed open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome backers. If you'd like to join them, please consider:

- [Become a backer or sponsor on Github](https://github.com/sponsors/gi0baro).

## Sponsors

- Kkeller83
2 changes: 1 addition & 1 deletion emmett/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.2.2"
__version__ = "2.2.3"
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "Emmett"
version = "2.2.2"
version = "2.2.3"
description = "The web framework for inventors"
authors = ["Giovanni Barillari <[email protected]>"]
license = "BSD-3-Clause"
Expand Down Expand Up @@ -54,7 +54,7 @@ pyyaml = "^5.4"
renoir = "^1.3"
severus = "^1.1"
uvicorn = "0.13.4"
websockets = "^8.0"
websockets = "^9.1"

httptools = { version = "~0.1.1", markers = "sys_platform != 'win32'" }
uvloop = { version = "~0.15.2", markers = "sys_platform != 'win32'" }
Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
click==7.1.2
h11==0.10.0
h2==4.0.0
httptools==0.1.1; sys_platform != "win32"
hyperframe==6.0.0
h2==4.0.0;
httptools==0.1.2; sys_platform != "win32"
pendulum==2.1.2
pyaes==1.6.1
pydal==17.3
python-rapidjson==1.0
pyyaml==5.4.1
renoir==1.3.2
renoir==1.4.0
severus==1.1.1
uvicorn==0.13.4
uvloop==0.15.2; sys_platform != "win32"
websockets==8.1
websockets==9.1

0 comments on commit c3fd798

Please sign in to comment.