Skip to content

PR: Add latest version of ujson for py>3 #39

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added .DS_Store
Binary file not shown.
21 changes: 16 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
#!/usr/bin/env python
from setuptools import find_packages, setup
import os
import sys
import versioneer

README = open('README.rst', 'r').read()


install_requires = [
'future>=0.14.0; python_version<"3"',
'futures; python_version<"3.2"',
]

if sys.version_info[0] == 2:
if os.name != 'nt':
install_requires.append('ujson<=1.35')
else:
install_requires.append('ujson>=2')



setup(
name='python-jsonrpc-server',

Expand All @@ -31,11 +46,7 @@
# your project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/requirements.html
install_requires=[
'future>=0.14.0; python_version<"3"',
'futures; python_version<"3.2"',
'ujson<=1.35; platform_system!="Windows"',
],
install_requires=install_requires,

# List additional groups of dependencies here (e.g. development
# dependencies). You can install these using the following syntax,
Expand Down
3 changes: 2 additions & 1 deletion test/test_streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# pylint: disable=redefined-outer-name
from io import BytesIO
import os
import sys
import mock
import pytest

Expand Down Expand Up @@ -79,7 +80,7 @@ def test_writer(wfile, writer):
'params': {}
})

if os.name == 'nt':
if os.name == 'nt' and sys.version_info[0] == 2:
assert wfile.getvalue() == (
b'Content-Length: 49\r\n'
b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n'
Expand Down