Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

keep up to date #2

Merged
merged 2 commits into from
May 2, 2021
Merged

keep up to date #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5c431
fix tests directory name in Makefile (#134)
taybin Apr 28, 2021
46e961e
allow using 3.x of orjson. Use orjson in tests (#135)
taybin Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DMYPY ?= dmypy
BANDIT ?= bandit
RENDER_CONFIGREF ?= extra/tools/render_configuration_reference.py
CONFIGREF_TARGET ?= docs/includes/settingref.txt
TESTDIR ?= t
TESTDIR ?= tests
EXAMPLESDIR ?= examples
SPHINX_DIR ?= docs/
SPHINX_BUILDDIR ?= "${SPHINX_DIR}/_build"
Expand Down
2 changes: 1 addition & 1 deletion requirements/extras/orjson.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
orjson>=2.0,<3.0
orjson>=2.0,<4.0
3 changes: 2 additions & 1 deletion requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ wheel
-r extras/redis.txt
-r extras/statsd.txt
-r extras/yaml.txt
-r extras/prometheus.txt
-r extras/prometheus.txt
-r extras/orjson.txt
4 changes: 2 additions & 2 deletions tests/functional/web/test_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ async def test_redis__url(
password=password,
db=db,
skip_full_coverage_check=True,
**settings
**settings,
)


Expand Down Expand Up @@ -432,7 +432,7 @@ async def model_response(
*,
expected_status: int = 200,
expected_content_type: str = "application/json",
model=ResponseModel
model=ResponseModel,
):
assert response.status == 200
assert response.content_type == expected_content_type
Expand Down