Merge pull request #76 from adrianeboyd/chore/v1.0.6

Updates related to python 3.11, set version to v1.0.6
explosion · Oct 18, 2022 · 8b7c64a · 8b7c64a
2 parents abcbdef + 1523fbe
commit 8b7c64a
Show file tree

Hide file tree

Showing 13 changed files with 4,298 additions and 951 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,57 +9,57 @@ jobs:
 - job: 'Test'
   strategy:
     matrix:
-      Python27Linux:
-        imageName: 'ubuntu-16.04'
-        python.version: '2.7'
-      Python27Mac:
-        imageName: 'macos-10.14'
-        python.version: '2.7'
-      Python35Linux:
-        imageName: 'ubuntu-16.04'
-        python.version: '3.5'
-      Python35Windows:
-        imageName: 'vs2017-win2016'
-        python.version: '3.5'
-      Python35Mac:
-        imageName: 'macos-10.14'
-        python.version: '3.5'
       Python36Linux:
-        imageName: 'ubuntu-16.04'
+        imageName: 'ubuntu-latest'
         python.version: '3.6'
       Python36Windows:
-        imageName: 'vs2017-win2016'
-        python.version: '3.6'
-      Python36Mac:
-        imageName: 'macos-10.14'
+        imageName: 'windows-2019'
         python.version: '3.6'
       Python37Linux:
-        imageName: 'ubuntu-16.04'
+        imageName: 'ubuntu-latest'
         python.version: '3.7'
       Python37Windows:
-        imageName: 'vs2017-win2016'
+        imageName: 'windows-latest'
         python.version: '3.7'
       Python37Mac:
-        imageName: 'macos-10.14'
+        imageName: 'macos-latest'
         python.version: '3.7'
       Python38Linux:
-        imageName: 'ubuntu-16.04'
+        imageName: 'ubuntu-latest'
         python.version: '3.8'
       Python38Windows:
-        imageName: 'vs2017-win2016'
+        imageName: 'windows-latest'
         python.version: '3.8'
       Python38Mac:
-        imageName: 'macos-10.14'
+        imageName: 'macos-latest'
         python.version: '3.8'
       Python39Linux:
-        imageName: 'ubuntu-16.04'
+        imageName: 'ubuntu-latest'
         python.version: '3.9'
       Python39Windows:
-        imageName: 'vs2017-win2016'
+        imageName: 'windows-latest'
         python.version: '3.9'
       Python39Mac:
-        imageName: 'macos-10.14'
+        imageName: 'macos-latest'
         python.version: '3.9'
+      Python310Linux:
+        imageName: 'ubuntu-latest'
+        python.version: '3.10'
+      Python310Windows:
+        imageName: 'windows-latest'
+        python.version: '3.10'
+      Python310Mac:
+        imageName: 'macos-latest'
+        python.version: '3.10'
+      Python311Linux:
+        imageName: 'ubuntu-latest'
+        python.version: '3.11.0-rc.2'
+      Python311Windows:
+        imageName: 'windows-latest'
+        python.version: '3.11.0-rc.2'
+      Python311Mac:
+        imageName: 'macos-latest'
+        python.version: '3.11.0-rc.2'
     maxParallel: 4
   pool:
     vmImage: $(imageName)
@@ -69,6 +69,7 @@ jobs:
     inputs:
       versionSpec: '$(python.version)'
       architecture: 'x64'
+      allowUnstable: true
 
   - script: |
       python -m pip install --upgrade pip setuptools

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,10 @@
 pathlib==1.0.1; python_version < "3.4"
 # Development requirements
 cython>=0.29.1,<0.30.0
-pytest>=4.0.0,<5.0.0
+pytest>=5.2.0,!=7.1.0
 pytest-timeout>=1.3.3,<2.0.0
 unittest2==1.1.0; python_version < "3.4"
 pytz==2018.7
 mock>=2.0.0,<3.0.0
 numpy>=1.15.0
+psutil
diff --git a/setup.py b/setup.py
@@ -150,8 +150,8 @@ def setup_package():
             url=about["__uri__"],
             license=about["__license__"],
             ext_modules=cythonize(ext_modules, language_level=2),
-            setup_requires=["cython>=0.29.1,<0.30.0"],
-            install_requires=['pathlib==1.0.1; python_version < "3.4"'],
+            setup_requires=["cython>=0.29.1,<3.0"],
+            python_requires=">=3.6",
             classifiers=[
                 "Development Status :: 5 - Production/Stable",
                 "Environment :: Console",
@@ -162,15 +162,12 @@ def setup_package():
                 "Operating System :: MacOS :: MacOS X",
                 "Operating System :: Microsoft :: Windows",
                 "Programming Language :: Cython",
-                "Programming Language :: Python :: 2",
-                "Programming Language :: Python :: 2.7",
-                "Programming Language :: Python :: 3",
-                "Programming Language :: Python :: 3.4",
-                "Programming Language :: Python :: 3.5",
                 "Programming Language :: Python :: 3.6",
                 "Programming Language :: Python :: 3.7",
                 "Programming Language :: Python :: 3.8",
                 "Programming Language :: Python :: 3.9",
+                "Programming Language :: Python :: 3.10",
+                "Programming Language :: Python :: 3.11",
                 "Topic :: Scientific/Engineering",
             ],
             cmdclass={"build_ext": build_ext_subclass},

diff --git a/srsly/about.py b/srsly/about.py
@@ -1,5 +1,5 @@
 __title__ = "srsly"
-__version__ = "1.0.5"
+__version__ = "1.0.6"
 __summary__ = "Modern high-performance serialization utilities for Python"
 __uri__ = "https://explosion.ai"
 __author__ = "Explosion AI"

diff --git a/srsly/cloudpickle/__init__.py b/srsly/cloudpickle/__init__.py
@@ -1,3 +1,8 @@
-from .cloudpickle import *
+from .cloudpickle import *  # noqa
+from .cloudpickle_fast import CloudPickler, dumps, dump  # noqa
 
-__version__ = "1.2.2"
+# Conform to the convention used by python serialization libraries, which
+# expose their Pickler subclass at top-level under the  "Pickler" name.
+Pickler = CloudPickler
+
+__version__ = '2.2.0'