cargo, rust update

Author: ijl

Cargo.lock

@@ -55,7 +55,7 @@ encoding_rs = { version = "0.8", default_features = false, features = ["simd-acc
 inlinable_string = { version = "0.1" }
 itoa = { version = "0.4", default_features = false }
 once_cell = { version = "1", default_features = false }
-pyo3 = { version = "0.11", default_features = false, features = ["extension-module"]}
+pyo3 = { version = "0.12", default_features = false, features = ["extension-module"]}
 ryu = { version = "1" }
 serde = { version = "1", default_features = false }
 serde_json = { path = "./json", default_features = false, features = ["std"] }

Cargo.toml

@@ -1136,7 +1136,7 @@ maturin build --no-sdist --release --strip --manylinux off
 ```
 
 Problems with the Rust nightly channel may require pinning a version.
-`nightly-2020-06-09` is known to be ok.
+`nightly-2020-09-14` is known to be ok.
 
 orjson is tested for amd64 and aarch64 on Linux, macOS, and Windows. It
 may not work on 32-bit targets. It should be compiled with

README.md

@@ -4,7 +4,7 @@ pr:
     - '*'
 
 variables:
-  toolchain: nightly-2020-07-01
+  toolchain: nightly-2020-09-14
 
 jobs:
 
@@ -156,7 +156,7 @@ jobs:
   pool:
     vmImage: windows-2019
   variables:
-    interpreter: C:\hostedtoolcache\windows\Python\3.7.8\x64\python.exe
+    interpreter: C:\hostedtoolcache\windows\Python\3.7.9\x64\python.exe
     target: x86_64-pc-windows-msvc
   steps:
   - task: UsePythonVersion@0
@@ -181,45 +181,3 @@ jobs:
       architecture: 'x64'
   - checkout: self
   - template: ./azure-win.yml
-
-- job: linux_python38_amd64_manylinux1
-  pool:
-    vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux1_x86_64:latest
-  variables:
-    interpreter: python3.8
-    manylinux: 1
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp38-cp38/bin:/opt/rh/devtoolset-2/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    target: x86_64-unknown-linux-gnu
-    verifyManylinux: true
-  steps:
-  - checkout: self
-  - template: ./azure-linux-container.yml
-
-- job: linux_python37_amd64_manylinux1
-  pool:
-    vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux1_x86_64:latest
-  variables:
-    interpreter: python3.7
-    manylinux: 1
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp37-cp37m/bin:/opt/rh/devtoolset-2/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    target: x86_64-unknown-linux-gnu
-    verifyManylinux: true
-  steps:
-  - checkout: self
-  - template: ./azure-linux-container.yml
-
-- job: linux_python36_amd64_manylinux1
-  pool:
-    vmImage: ubuntu-20.04
-  container: quay.io/pypa/manylinux1_x86_64:latest
-  variables:
-    interpreter: python3.6
-    manylinux: 1
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp36-cp36m/bin:/opt/rh/devtoolset-2/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    target: x86_64-unknown-linux-gnu
-    verifyManylinux: true
-  steps:
-  - checkout: self
-  - template: ./azure-linux-container.yml

ci/azure-pipelines.yml

@@ -14,7 +14,7 @@ steps:
     TWINE_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-07-01 --profile minimal -y
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-09-14 --profile minimal -y
     - python3.9 -m pip install --upgrade pip maturin
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.9
     - python3.9 -m pip install target/wheels/orjson*.whl
@@ -38,7 +38,7 @@ steps:
     TWINE_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-07-01 --profile minimal -y
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-09-14 --profile minimal -y
     - python3.8 -m pip install --upgrade pip maturin
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.8
     - python3.8 -m pip install target/wheels/orjson*.whl
@@ -62,7 +62,7 @@ steps:
     TWINE_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-07-01 --profile minimal -y
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-09-14 --profile minimal -y
     - python3.7 -m pip install --upgrade pip maturin
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.7
     - python3.7 -m pip install target/wheels/orjson*.whl
@@ -86,7 +86,7 @@ steps:
     TWINE_PASSWORD:
       from_secret: twine_password
   commands:
-    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-07-01 --profile minimal -y
+    - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-09-14 --profile minimal -y
     - python3.6 -m pip install --upgrade pip maturin
     - maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.6
     - python3.6 -m pip install target/wheels/orjson*.whl

ci/drone.yml

@@ -1,3 +1,3 @@
 flask;sys_platform!="win"
 gunicorn;sys_platform!="win"
-httpx;sys_platform!="win"
+httpx==0.14.3;sys_platform!="win"

integration/requirements.txt

@@ -65,7 +65,8 @@ table = []
 for lib_name in LIBRARIES:
     if lib_name == "json":
         as_dict = timeit(
-            lambda: json.dumps(objects_as_dict).encode("utf-8"), number=ITERATIONS,
+            lambda: json.dumps(objects_as_dict).encode("utf-8"),
+            number=ITERATIONS,
         )
         as_dataclass = timeit(
             lambda: json.dumps(objects_as_dataclass, default=default).encode("utf-8"),
@@ -84,12 +85,14 @@ for lib_name in LIBRARIES:
         )
     elif lib_name == "ujson":
         as_dict = timeit(
-            lambda: ujson.dumps(objects_as_dict).encode("utf-8"), number=ITERATIONS,
+            lambda: ujson.dumps(objects_as_dict).encode("utf-8"),
+            number=ITERATIONS,
         )
         as_dataclass = None
     elif lib_name == "rapidjson":
         as_dict = timeit(
-            lambda: rapidjson.dumps(objects_as_dict).encode("utf-8"), number=ITERATIONS,
+            lambda: rapidjson.dumps(objects_as_dict).encode("utf-8"),
+            number=ITERATIONS,
         )
         as_dataclass = timeit(
             lambda: rapidjson.dumps(objects_as_dataclass, default=default).encode(

pydataclass

@@ -58,21 +58,25 @@ for lib_name in LIBRARIES:
     print(f"{lib_name}...")
     if lib_name == "json":
         time_as_str = timeit(
-            lambda: json.dumps(data_as_str).encode("utf-8"), number=ITERATIONS,
+            lambda: json.dumps(data_as_str).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj = timeit(
-            lambda: json.dumps(data_as_obj).encode("utf-8"), number=ITERATIONS,
+            lambda: json.dumps(data_as_obj).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj_sorted = (
             None  # TypeError: '<' not supported between instances of 'str' and 'int'
         )
         correct = False
     elif lib_name == "simplejson":
         time_as_str = timeit(
-            lambda: simplejson.dumps(data_as_str).encode("utf-8"), number=ITERATIONS,
+            lambda: simplejson.dumps(data_as_str).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj = timeit(
-            lambda: simplejson.dumps(data_as_obj).encode("utf-8"), number=ITERATIONS,
+            lambda: simplejson.dumps(data_as_obj).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj_sorted = timeit(
             lambda: simplejson.dumps(data_as_obj, sort_keys=True).encode("utf-8"),
@@ -83,16 +87,19 @@ for lib_name in LIBRARIES:
         )
     elif lib_name == "ujson":
         time_as_str = timeit(
-            lambda: ujson.dumps(data_as_str).encode("utf-8"), number=ITERATIONS,
+            lambda: ujson.dumps(data_as_str).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj = timeit(
-            lambda: ujson.dumps(data_as_obj).encode("utf-8"), number=ITERATIONS,
+            lambda: ujson.dumps(data_as_obj).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj_sorted = None  # segfault
         correct = False
     elif lib_name == "rapidjson":
         time_as_str = timeit(
-            lambda: rapidjson.dumps(data_as_str).encode("utf-8"), number=ITERATIONS,
+            lambda: rapidjson.dumps(data_as_str).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_as_obj = None
         time_as_obj_sorted = None

pynonstr

@@ -83,7 +83,10 @@ for lib_name in LIBRARIES:
         mem = None
         correct = False
     else:
-        total_latency = timeit(func, number=ITERATIONS,)
+        total_latency = timeit(
+            func,
+            number=ITERATIONS,
+        )
         latency = per_iter_latency(total_latency)
         time.sleep(1)
         mem = max(memory_usage((func,), interval=0.001, timeout=latency * 2))

pynumpy

@@ -49,30 +49,35 @@ table = []
 for lib_name in LIBRARIES:
     if lib_name == "json":
         time_unsorted = timeit(
-            lambda: json.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: json.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_sorted = timeit(
-            lambda: json.dumps(data, sort_keys=True).encode("utf-8"), number=ITERATIONS,
+            lambda: json.dumps(data, sort_keys=True).encode("utf-8"),
+            number=ITERATIONS,
         )
     elif lib_name == "simplejson":
         time_unsorted = timeit(
-            lambda: simplejson.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: simplejson.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_sorted = timeit(
             lambda: simplejson.dumps(data, sort_keys=True).encode("utf-8"),
             number=ITERATIONS,
         )
     elif lib_name == "ujson":
         time_unsorted = timeit(
-            lambda: ujson.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: ujson.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_sorted = timeit(
             lambda: ujson.dumps(data, sort_keys=True).encode("utf-8"),
             number=ITERATIONS,
         )
     elif lib_name == "rapidjson":
         time_unsorted = timeit(
-            lambda: rapidjson.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: rapidjson.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_sorted = timeit(
             lambda: rapidjson.dumps(data, sort_keys=True).encode("utf-8"),
@@ -81,7 +86,8 @@ for lib_name in LIBRARIES:
     elif lib_name == "orjson":
         time_unsorted = timeit(lambda: orjson.dumps(data), number=ITERATIONS)
         time_sorted = timeit(
-            lambda: orjson.dumps(data, None, orjson.OPT_SORT_KEYS), number=ITERATIONS,
+            lambda: orjson.dumps(data, None, orjson.OPT_SORT_KEYS),
+            number=ITERATIONS,
         )
         orjson_time_sorted = per_iter_latency(time_sorted)
     else: