Merge remote-tracking branch 'upstream/master' into conda

Author: clee-ai

.github/workflows/deploy.yaml

@@ -17,7 +17,7 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
-                  pip install torch "numpy<1.20" scikit-learn flake8 setuptools wheel twine numba
+                  pip install torch "numpy<=1.21" scikit-learn flake8 setuptools wheel twine numba
             - name: Build package
               run: |
                   python setup.py build_ext --inplace

.github/workflows/tests.yaml

@@ -23,7 +23,7 @@ jobs:
         - name: Install dependencies
           run: |
               python -m pip install --upgrade pip
-              pip install "numpy<1.20" scikit-learn flake8 setuptools numba==0.49.1
+              pip install "numpy<=1.21" scikit-learn flake8 setuptools numba
 
         - name: Install torch ${{ matrix.torch-version }} windows + linux
           if: ${{matrix.os != 'macos-latest'}}

.pre-commit-config.yaml

@@ -2,14 +2,14 @@ exclude: "build|egg-info|dist"
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
       - id: end-of-file-fixer
 
   - repo: https://github.com/psf/black
-    rev: 21.9b0
+    rev: 22.3.0
     hooks:
       - id: black
         language_version: python3.7

setup.py

@@ -81,7 +81,7 @@ def get_cmdclass():
 with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
-requirements = ["torch>=1.1.0", "numba", "numpy<1.20", "scikit-learn"]
+requirements = ["torch>=1.1.0", "numba", "numpy<=1.21", "scikit-learn"]
 
 url = "https://github.com/nicolas-chaulet/torch-points-kernels"
 __version__ = "0.7.1"