diff --git a/.circleci/config.yml b/.circleci/config.yml index bee9071d..c97c4bfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/python:3.9.6 + - image: cimg/python:3.10.5 working_directory: ~/repo @@ -43,34 +43,15 @@ jobs: command: | sudo apt-get install -y graphviz - - run: - name: Install libproj - command: | - sudo apt-get install -y libgeos-dev libproj-dev proj-data graphviz - - run: name: Install standard libraries command: | - python -m venv venv - . venv/bin/activate - pip install scipy matplotlib numpy cython pandas - - - run: - name: Install pyproj, shapely, cartopy - command: | - python -m venv venv - . venv/bin/activate - pip install pyproj - pip uninstall -y shapely - pip install --no-binary shapely shapely - pip install cartopy + python -m pip install scipy matplotlib numpy cython pandas - run: name: install dependencies command: | - python -m venv venv - . venv/bin/activate - pip install -r requirements.txt + python -m pip install -r requirements.txt - save_cache: paths: @@ -80,27 +61,22 @@ jobs: - run: name: check list of dependencies command: | - python -m venv venv - . venv/bin/activate - pip freeze + python -m pip freeze apt list --installed - run: name: compile and build command: | - . venv/bin/activate python setup.py build_ext --inplace - run: name: run tests command: | - . venv/bin/activate python setup.py unittests -d 9 - run: name: wheel command: | - . venv/bin/activate python setup.py bdist_wheel mkdir -p test-reports/dist cp dist/*.whl test-reports/dist @@ -121,4 +97,4 @@ jobs: - store_artifacts: path: test-reports - destination: test-reports \ No newline at end of file + destination: test-reports diff --git a/.travis.yml b/.travis.yml index ccb7602b..07246680 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ language: python matrix: include: - - python: 3.9 - name: "Py39-024+" + - python: 3.10 + name: "Py310" env: - - sklver=">=0.24.2" + - sklver=">=1.1" - jlver=">=1.0" before_install: diff --git a/LICENSE.txt b/LICENSE.txt index 47eced03..97ea4c01 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017-2021, Xavier Dupré +Copyright (c) 2017-2022, Xavier Dupré Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/appveyor.yml b/appveyor.yml index af396400..a013ac8b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,8 @@ image: - Visual Studio 2019 environment: matrix: - - PYTHON: "C:\\Python39-x64" - PYTHON_VERSION: "3.9.x" + - PYTHON: "C:\\Python310-x64" + PYTHON_VERSION: "3.10.x" PYTHON_ARCH: "64" SKL: '>=1.0' - PYTHON: "C:\\Python39-x64" @@ -16,10 +16,10 @@ init: install: - "%PYTHON%\\python -m pip install --upgrade pip" # for many packages + - pip install llvmlite numba - "%PYTHON%\\Scripts\\pip install -r requirements-win.txt" # install precompiled versions not available on pypi - - "%PYTHON%\\Scripts\\pymy_install3 llvmlite numba" - - "%PYTHON%\\Scripts\\pip install torch==1.7.1+cpu torchvision==0.8.2+cpu torchaudio===0.7.2 -f https://download.pytorch.org/whl/torch_stable.html" + - "%PYTHON%\\Scripts\\pip install torch torchvision torchaudio" # other dependencies - "%PYTHON%\\Scripts\\pip install -r requirements.txt --no-deps" - "%PYTHON%\\Scripts\\pip install scikit-learn%SKL%" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f402c96e..d29610d7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,8 +4,8 @@ jobs: vmImage: 'ubuntu-latest' strategy: matrix: - Python39-Linux: - python.version: '3.9' + Python310-Linux: + python.version: '3.10' maxParallel: 3 steps: - task: UsePythonVersion@0 @@ -51,8 +51,8 @@ jobs: python -m pip install cibuildwheel export CIBW_MANYLINUX_X86_64_IMAGE="manylinux_2_24" export CIBW_BEFORE_BUILD="pip install pybind11 cython numpy scipy pyquickhelper scikit-learn pandas pandas_streaming" - export CIBW_BUILD="cp39-manylinux_x86_64" - python -m cibuildwheel --output-dir dist/wheelhouse39 --platform linux + export CIBW_BUILD="cp39-manylinux_x86_64 cp310-manylinux_x86_64" + python -m cibuildwheel --output-dir dist/wheelhouse_2 --platform linux displayName: 'Build Package manylinux_x_y' - script: | python -m pip install cibuildwheel @@ -71,8 +71,8 @@ jobs: vmImage: 'windows-latest' strategy: matrix: - Python39-Windows: - python.version: '3.9' + Python310-Windows: + python.version: '3.10' maxParallel: 3 steps: - task: UsePythonVersion@0 @@ -92,7 +92,7 @@ jobs: - script: | python -m pip install cibuildwheel set CIBW_BEFORE_BUILD=pip install pybind11 cython numpy scipy pyquickhelper scikit-learn pandas pandas_streaming - set CIBW_BUILD=cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 + set CIBW_BUILD=cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 python -m cibuildwheel --output-dir dist/wheelhouse displayName: 'Build Package many' - task: PublishPipelineArtifact@0 @@ -105,8 +105,8 @@ jobs: vmImage: 'macOS-latest' strategy: matrix: - Python39-MacOs: - python.version: '3.9' + Python310-MacOs: + python.version: '3.10' maxParallel: 3 steps: - task: UsePythonVersion@0 @@ -159,7 +159,7 @@ jobs: - script: | python -m pip install cibuildwheel export CIBW_BEFORE_BUILD="pip install pybind11 cython numpy scipy pyquickhelper scikit-learn pandas pandas_streaming" - export CIBW_BUILD="cp37-macosx_x86_64 cp38-macosx_x86_64 cp39-macosx_x86_64" + export CIBW_BUILD="cp37-macosx_x86_64 cp38-macosx_x86_64 cp39-macosx_x86_64 cp310-macosx_x86_64" python -m cibuildwheel --output-dir dist/wheelhouse displayName: 'Build Package many' - task: PublishPipelineArtifact@0 diff --git a/requirements.txt b/requirements.txt index a9c4318f..9580f4b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,9 +6,11 @@ cython joblib jupyter_sphinx>=0.2 jyquickhelper +llvmlite matplotlib memory_profiler>=0.55 nbconvert>=6.0.2 +numba numpy onnx onnxruntime