Windows support

Author: ijl

Cargo.toml

@@ -19,10 +19,11 @@ crate-type = ["cdylib"]
 classifier = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
-    "License :: OSI Approved",
     "License :: OSI Approved :: Apache Software License",
     "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved",
     "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.6",

build

@@ -5,6 +5,6 @@ py_min=$(python -c 'import sys; print(str(sys.version_info.minor))')
 
 rm -f target/wheels/*
 
-CARGO_INCREMENTAL=0 pyo3-pack build -i "python${py_maj}.${py_min}" --release "$@"
+pyo3-pack build -i "python${py_maj}.${py_min}" --release "$@"
 
 pip install --force $(find target/wheels -name "*cp${py_maj}${py_min}*")

ci/azure-linux.yml

@@ -1,3 +1,4 @@
 steps:
 - bash: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
+  displayName: rustup
 - bash: sudo apt-get update && sudo apt-get install -y wrk

ci/azure-macos.yml

@@ -1,4 +1,5 @@
 steps:
 - bash: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
+  displayName: rustup
 - bash: /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 - bash: brew install wrk

ci/azure-pipelines.yml

@@ -63,3 +63,33 @@ jobs:
   - checkout: self
   - template: ./azure-macos.yml
   - template: ./azure-posix.yml
+
+- job: win_python37
+  pool:
+    vmImage: vs2017-win2016
+  variables:
+    interpreter: C:\hostedtoolcache\windows\Python\3.7.0\x64\python.exe
+    target: x86_64-pc-windows-msvc
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.7'
+      addToPath: true
+      architecture: 'x64'
+  - checkout: self
+  - template: ./azure-win.yml
+
+- job: win_python36
+  pool:
+    vmImage: vs2017-win2016
+  variables:
+    interpreter: C:\hostedtoolcache\windows\Python\3.6.4\x64\python.exe
+    target: x86_64-pc-windows-msvc
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.6'
+      addToPath: true
+      architecture: 'x64'
+  - checkout: self
+  - template: ./azure-win.yml

ci/azure-posix.yml

@@ -4,7 +4,8 @@ parameters:
 
 steps:
 - bash: pip install --upgrade pip wheel pyo3-pack pytest hypothesis mypy psutil pendulum pytz arrow gunicorn flask twine
-- bash: PATH=$HOME/.cargo/bin:$PATH CARGO_INCREMENTAL=0 pyo3-pack build --release --strip --interpreter $(interpreter) --target $(target)
+  displayName: python dependencies
+- bash: PATH=$HOME/.cargo/bin:$PATH pyo3-pack build --release --strip --interpreter $(interpreter) --target $(target)
   displayName: build
 - bash: pip install target/wheels/orjson*.whl
   displayName: install
@@ -16,7 +17,7 @@ steps:
   displayName: thread
 - bash: ./integration/run gunicorn
   displayName: gunicorn
-- bash: ./deploy
+- bash: ./deploy target/wheels/*.whl
   displayName: deploy
   env:
     TWINE_PASSWORD: $(TWINE_PASSWORD)

ci/azure-win.yml

@@ -0,0 +1,23 @@
+parameters:
+  interpreter: ''
+  target: ''
+
+steps:
+- script: |
+    curl https://win.rustup.rs/x86_64 -o rustup-init.exe
+    rustup-init.exe -y --default-host $(target) --default-toolchain nightly
+    set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+    echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
+  displayName: rustup
+- script: python.exe -m pip install --upgrade pip wheel
+  displayName: pip upgrade
+- script: python.exe -m pip install --upgrade pyo3-pack pytest hypothesis psutil pendulum pytz arrow twine
+  displayName: python dependencies
+- script: pyo3-pack.exe build --release --strip --interpreter $(interpreter) --target $(target)
+  displayName: build
+- script: python.exe -m pip install orjson --find-links=D:\a\1\s\target\wheels\
+  displayName: install
+- script: python.exe -m pytest -v test
+  displayName: pytest
+- script: python.exe integration\thread
+  displayName: thread

deploy

@@ -11,4 +11,4 @@ if [[ "$tag" == "undefined" ]]; then
     exit 0
 fi
 
-twine upload target/wheels/*.whl
+twine upload "$1"

src/decode.rs

@@ -102,14 +102,14 @@ impl<'de, 'a> Visitor<'de> for JsonValue {
     where
         E: de::Error,
     {
-        Ok(unsafe { pyo3::ffi::PyLong_FromLong(value) })
+        Ok(unsafe { pyo3::ffi::PyLong_FromLongLong(value) })
     }
 
     fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
     where
         E: de::Error,
     {
-        Ok(unsafe { pyo3::ffi::PyLong_FromLong(value as i64) })
+        Ok(unsafe { pyo3::ffi::PyLong_FromLongLong(value as i64) })
     }
 
     fn visit_f64<E>(self, value: f64) -> Result<Self::Value, E>

src/encode.rs

@@ -81,7 +81,7 @@ impl<'p> Serialize for SerializePyObject {
         } else if unsafe { obj_ptr == FLOAT_PTR } {
             serializer.serialize_f64(unsafe { pyo3::ffi::PyFloat_AsDouble(self.ptr) })
         } else if unsafe { obj_ptr == INT_PTR } {
-            let val = unsafe { pyo3::ffi::PyLong_AsLong(self.ptr) };
+            let val = unsafe { pyo3::ffi::PyLong_AsLongLong(self.ptr) };
             if unsafe {
                 std::intrinsics::unlikely(val == -1 && !pyo3::ffi::PyErr_Occurred().is_null())
             } {