Skip to content

Commit 8ca4d30

Browse files
authored
Merge branch 'master' into rm_travis
2 parents f963816 + bacb0b9 commit 8ca4d30

File tree

298 files changed

+266
-27652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+266
-27652
lines changed

.github/workflows/build_wheels.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Build dist and wheels
2+
3+
on:
4+
release:
5+
6+
jobs:
7+
build_wheels:
8+
name: ${{ matrix.os }}
9+
runs-on: ${{ matrix.os }}
10+
strategy:
11+
matrix:
12+
os: [ubuntu-18.04]
13+
# macosx-latest, windows-latest
14+
15+
steps:
16+
- uses: actions/checkout@v1
17+
- name: Set up Python 3.8
18+
uses: actions/setup-python@v1
19+
with:
20+
python-version: 3.8
21+
22+
- name: Install dependencies
23+
run: |
24+
python -m pip install --upgrade pip
25+
pip install -r requirements.txt
26+
pip install -U "cython"
27+
28+
- name: Install cibuildwheel
29+
run: |
30+
python -m pip install cibuildwheel==1.3.0
31+
32+
- name: Install Visual C++ for Python 2.7
33+
if: startsWith(matrix.os, 'windows')
34+
run: |
35+
choco install vcpython27 -f -y
36+
37+
- name: Build wheel
38+
env:
39+
CIBW_BEFORE_BUILD: "pip install numpy cython"
40+
run: |
41+
python -m cibuildwheel --output-dir wheelhouse
42+
43+
- uses: actions/upload-artifact@v1
44+
with:
45+
name: wheels
46+
path: ./wheelhouse

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
name: circleci-redirector
12
on: [status]
23
jobs:
34
circleci_artifacts_redirector_job:

.github/workflows/pythonpackage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test Package
1+
name: build
22

33
on:
44
push:
@@ -34,7 +34,7 @@ jobs:
3434
# stop the build if there are Python syntax errors or undefined names
3535
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
3636
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
37-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
37+
flake8 examples/ ot/ test/ --count --max-line-length=127 --statistics
3838
- name: Install POT
3939
run: |
4040
pip install -e .

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ release_test :
5858

5959
rdoc :
6060
pandoc --from=markdown --to=rst --output=docs/source/readme.rst README.md
61+
sed -i 's,https://pythonot.github.io/auto_examples/,auto_examples/,g' docs/source/readme.rst
6162

6263
notebook :
6364
ipython notebook --matplotlib=inline --notebook-dir=notebooks/

README.md

Lines changed: 53 additions & 59 deletions

codecov.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ coverage:
1212
comment:
1313
layout: "header, diff, sunburst, uncovered"
1414
behavior: default
15+
codecov:
16+
token: 057953e4-d263-41c0-913c-5d45c0371df9

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ sphinx_rtd_theme
33
numpydoc
44
memory_profiler
55
pillow
6+
networkx

docs/requirements_rtd.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
sphinx_gallery
2+
numpydoc
3+
memory_profiler
4+
pillow
5+
networkx
6+
numpy
7+
scipy>=1.0
8+
cython
9+
matplotlib
10+
autograd
11+
pymanopt==0.2.4; python_version <'3'
12+
pymanopt; python_version >= '3'
13+
cvxopt
14+
scikit-learn

docs/rtd/conf.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from recommonmark.parser import CommonMarkParser
2+
3+
source_parsers = {'.md': CommonMarkParser}
4+
5+
source_suffix = ['.md']
6+
master_doc = 'index'

docs/rtd/index.md

Lines changed: 5 additions & 0 deletions

0 commit comments

Comments
 (0)