diff options
author | Gard Spreemann <gspr@nonempty.org> | 2021-12-29 19:26:03 +0100 |
---|---|---|
committer | Gard Spreemann <gspr@nonempty.org> | 2021-12-29 19:26:03 +0100 |
commit | edab1c60630f95b38db430017585d06253c92817 (patch) | |
tree | 4cb2340c51157da0c81aae0907327417ffddd8ab /.github | |
parent | 1a283cb0c77f79d6f36de7c01fa61dc8d9696bca (diff) | |
parent | 5ed61689a41350fac40ce995515e6cbcb7203f48 (diff) |
Merge tag '0.8.1' into dfsg/latest
Diffstat (limited to '.github')
-rw-r--r-- | .github/CONTRIBUTING.md | 7 | ||||
-rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 13 | ||||
-rw-r--r-- | .github/requirements_test_windows.txt | 2 | ||||
-rw-r--r-- | .github/workflows/build_tests.yml | 21 | ||||
-rw-r--r-- | .github/workflows/build_wheels.yml | 4 | ||||
-rw-r--r-- | .github/workflows/build_wheels_weekly.yml | 2 |
6 files changed, 32 insertions, 17 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 54e7e42..9bc8e87 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -182,11 +182,10 @@ reStructuredText documents live in the source code repository under the doc/ directory. You can edit the documentation using any text editor and then generate -the HTML output by typing ``make html`` from the doc/ directory. +the HTML output by typing ``make html`` from the ``docs/`` directory. Alternatively, ``make`` can be used to quickly generate the -documentation without the example gallery. The resulting HTML files will -be placed in ``_build/html/`` and are viewable in a web browser. See the -``README`` file in the ``doc/`` directory for more information. +documentation without the example gallery with `make html-noplot`. The resulting HTML files will +be placed in `docs/build/html/` and are viewable in a web browser. For building the documentation, you will need [sphinx](http://sphinx.pocoo.org/), diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7cfe4e6..f2c6606 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,10 +1,6 @@ ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> -- [ ] Docs change / refactoring / dependency upgrade -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Motivation and context / Related issue @@ -13,16 +9,19 @@ <!--- (we recommend to have an existing issue for each pull request) --> + ## How has this been tested (if it applies) <!--- Please describe here how your modifications have been tested. --> -## Checklist + +## PR checklist <!-- - Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> -- [ ] The documentation is up-to-date with the changes I made. - [ ] I have read the [**CONTRIBUTING**](CONTRIBUTING.md) document. -- [ ] All tests passed, and additional code has been covered with new tests. +- [ ] The documentation is up-to-date with the changes I made (check build artifacts). +- [ ] All tests passed, and additional code has been **covered with new tests**. +- [ ] I have added the PR and Issue fix to the [**RELEASES.md**](RELEASES.md) file. <!--- In any case, don't hesitate to join and ask questions if you need on slack (https://pot-toolbox.slack.com/), gitter (https://gitter.im/PythonOT/community), or the mailing list (https://mail.python.org/mm3/mailman3/lists/pot.python.org/). --> diff --git a/.github/requirements_test_windows.txt b/.github/requirements_test_windows.txt index 331dd57..b94392f 100644 --- a/.github/requirements_test_windows.txt +++ b/.github/requirements_test_windows.txt @@ -4,7 +4,7 @@ cython matplotlib autograd pymanopt==0.2.4; python_version <'3' -pymanopt; python_version >= '3' +pymanopt==0.2.6rc1; python_version >= '3' cvxopt scikit-learn pytest
\ No newline at end of file diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index ee5a435..3c99da8 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -22,7 +22,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ "3.6", "3.7", "3.8", "3.9"] + python-version: ["3.7", "3.8", "3.9"] steps: - uses: actions/checkout@v1 @@ -128,12 +128,29 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} + - name: RC.exe + run: | + function Invoke-VSDevEnvironment { + $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" + $installationPath = & $vswhere -prerelease -legacy -latest -property installationPath + $Command = Join-Path $installationPath "Common7\Tools\vsdevcmd.bat" + & "${env:COMSPEC}" /s /c "`"$Command`" -no_logo && set" | Foreach-Object { + if ($_ -match '^([^=]+)=(.*)') { + [System.Environment]::SetEnvironmentVariable($matches[1], $matches[2]) + } + } + } + Invoke-VSDevEnvironment + Get-Command rc.exe | Format-Table -AutoSize + - name: Update pip + run : | + python -m pip install --upgrade pip setuptools + python -m pip install cython - name: Install POT run: | python -m pip install -e . - name: Install dependencies run: | - python -m pip install --upgrade pip python -m pip install -r .github/requirements_test_windows.txt python -m pip install torch==1.8.1+cpu -f https://download.pytorch.org/whl/torch_stable.html python -m pip install pytest "pytest-cov<2.6" diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a935a5e..c746eb8 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -36,7 +36,7 @@ jobs: - name: Build wheels env: - CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp*" # remove pypy on mac and win (wrong version) + CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp36*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse @@ -80,7 +80,7 @@ jobs: - name: Build wheels env: - CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl*" # remove pypy on mac and win (wrong version) + CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl* cp36*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU CIBW_ARCHS_MACOS: x86_64 universal2 arm64 diff --git a/.github/workflows/build_wheels_weekly.yml b/.github/workflows/build_wheels_weekly.yml index 2964844..dbf342f 100644 --- a/.github/workflows/build_wheels_weekly.yml +++ b/.github/workflows/build_wheels_weekly.yml @@ -41,7 +41,7 @@ jobs: - name: Build wheels env: - CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl*" # remove pypy on mac and win (wrong version) + CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp* cp*musl* cp36*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU CIBW_ARCHS_MACOS: x86_64 universal2 arm64 |