Skip to content

Commit e6ad968

Browse files
committed
ci template
1 parent f099aca commit e6ad968

File tree

8 files changed

+33
-154
lines changed

8 files changed

+33
-154
lines changed

.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
image:
22
- Visual Studio 2017
3-
- Ubuntu
3+
- Ubuntu1804
44

55
stack: python 3
66

@@ -19,7 +19,7 @@ init:
1919
install:
2020
- pip install -e .[tests]
2121

22-
- cd bin
22+
- cd build
2323
- cmd: cmake -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
2424
- sh: cmake ..
2525
- cmake --build .

.coveragerc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[run]
2+
cover_pylib = false
3+
omit =
4+
/home/travis/virtualenv/*
5+
*/site-packages/*
6+
*/bin/*
7+
8+
[report]
9+
exclude_lines =
10+
pragma: no cover
11+
def __repr__
12+
except RuntimeError
13+
except NotImplementedError
14+
except ImportError
15+
except FileNotFoundError
16+
except CalledProcessError
17+
logging.warning
18+
logging.error
19+
logging.critical
20+
if __name__ == .__main__.:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
build/
13
.pytest_cache/
24
bin/
35

.travis.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: python
22
group: travis_latest
3+
dist: xenial
34

45
git:
56
depth: 3
@@ -19,23 +20,15 @@ addons:
1920
packages: gfortran-6
2021

2122

22-
before_install:
23-
- if [[ $TRAVIS_OS_NAME == osx ]]; then
24-
brew update > /dev/null;
25-
brew install gcc > /dev/null || brew link --overwrite gcc > /dev/null;
26-
export FC=gfortran;
27-
brew install opencoarrays > /dev/null;
28-
fi
29-
3023
install:
31-
- pip install -e .[tests]
24+
- pip install -e .[tests,cov]
3225

33-
- cd bin
26+
- cd build
3427
- cmake ..
3528
- cmake --build .
3629

3730
script:
38-
- ctest -V
31+
- ctest --output-on-failure
3932
- cd ..
4033

4134
- pytest -rsv
@@ -44,7 +37,7 @@ script:
4437

4538
after_success:
4639
- if [[ $TRAVIS_PYTHON_VERSION == 3.6* ]]; then
47-
pytest --cov --cov-config=setup.cfg;
40+
pytest --cov
4841
coveralls;
4942
fi
5043

README.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
[![Coverage Status](https://coveralls.io/repos/github/scivision/lineclipping-python-fortran/badge.svg?branch=master)](https://coveralls.io/github/scivision/lineclipping-python-fortran?branch=master)
33
[![AppVeyor](https://ci.appveyor.com/api/projects/status/cr0omkhjvgwcyxiy?svg=true)](https://ci.appveyor.com/project/scivision/lineclipping-python-fortran)
44
[![PyPi versions](https://img.shields.io/pypi/pyversions/pylineclip.svg)](https://pypi.python.org/pypi/pylineclip)
5-
[![PyPi wheels](https://img.shields.io/pypi/format/pylineclip.svg)](https://pypi.python.org/pypi/pylineclip)
65
[![PyPi Download stats](http://pepy.tech/badge/pylineclip)](http://pepy.tech/project/pylineclip)
76

87
# Line clipping
98

10-
- `lineClipping.jl` Cohen-Sutherland line clipping algorithm for Julia.
11-
Input scalars, output intersection length, or `None` if no intersection.
129
- `lineclipping.f90` Cohen-Sutherland line clipping algorithm for
1310
massively parallel coarray modern Fortran. Input scalars or arrays,
1411
output intersections or `NaN` if no intersection.
1512
- `lineClipping.py` Cohen-Sutherland line clipping algorithm for Python.
1613
Input scalars, output intersection length, or `None` if no intersection.
14+
15+
16+
Julia line clipping is at https://github.com/scivision/lineclipping-julia
1717

1818
## Install
1919

@@ -71,11 +71,3 @@ The arguments are:
7171
in - endpoints of line
7272
out - intersection points with box. If no intersection, all NaN
7373

74-
### Julia
75-
76-
Simliar to Python, except `nothing` is returned if no intersection
77-
found.
78-
79-
```julia
80-
cohensutherland(xmin, ymax, xmax, ymin, x1, y1, x2, y2)
81-
```
File renamed without changes.

lineClipping.jl

Lines changed: 0 additions & 109 deletions
This file was deleted.

setup.cfg

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ install_requires =
3636
[options.extras_require]
3737
tests =
3838
pytest
39+
cov =
3940
pytest-cov
4041
coveralls
4142
flake8
@@ -49,23 +50,3 @@ console_scripts =
4950
max-line-length = 132
5051
exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/
5152

52-
[coverage:run]
53-
cover_pylib = false
54-
omit =
55-
/home/travis/virtualenv/*
56-
*/site-packages/*
57-
*/bin/*
58-
59-
[coverage:report]
60-
exclude_lines =
61-
pragma: no cover
62-
def __repr__
63-
except RuntimeError
64-
except NotImplementedError
65-
except ImportError
66-
except FileNotFoundError
67-
except CalledProcessError
68-
logging.warning
69-
logging.error
70-
logging.critical
71-
if __name__ == .__main__.:

0 commit comments

Comments
 (0)