Skip to content

Commit

Permalink
Merge pull request #8 from Amertz08/pin-ujson
Browse files Browse the repository at this point in the history
Pin ujson<2
  • Loading branch information
Amertz08 authored Mar 9, 2020
2 parents 61010bd + b179e54 commit df486a7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
- h3 heading
- X.X.X - YYYY-MM-DD

### 1.5.1 - 2020-03-09

- Pin `ujson<2`

### 1.5.0 - 2020-02-13

- Dropped support for `python<3.6`
Expand Down Expand Up @@ -34,4 +38,3 @@
- Added `MANIFEST.in`
- included `README.md`
- included `LICENSE`

2 changes: 1 addition & 1 deletion drf_ujson/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__author__ = "y.gavenchuk aka murminathor"
__version__ = (1, 5, 0)
__version__ = (1, 5, 1)
10 changes: 2 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,9 @@
author_email="[email protected]",
url="https://github.com/Amertz08/drf-ujson2",
packages=find_packages(exclude=["tests"]),
install_requires=["django", "ujson>=1.35", "djangorestframework"],
install_requires=["django", "ujson>=1.35,<2", "djangorestframework"],
extras_require={
"dev": [
"pytest",
"pytest-django",
"pytest-runner",
"pytest-cov",
"pytest-mock",
]
"dev": ["pytest", "pytest-django", "pytest-runner", "pytest-cov", "pytest-mock"]
},
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down

0 comments on commit df486a7

Please sign in to comment.