Skip to content

Commit 0d18db4

Browse files
committed
Merge branch 'master' into coordinates
2 parents 22a02da + a4f670b commit 0d18db4

38 files changed

Lines changed: 298 additions & 37 deletions

.gitignore

Lines changed: 131 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,131 @@
1-
*.pyc
2-
*.swp
3-
*.swo
4-
.spyder*
5-
scikit_aero.egg-info/*
1+
2+
# Created by https://www.gitignore.io/api/python
3+
# Edit at https://www.gitignore.io/?templates=python
4+
5+
### Python ###
6+
# Byte-compiled / optimized / DLL files
7+
__pycache__/
8+
*.py[cod]
9+
*$py.class
10+
11+
# C extensions
12+
*.so
13+
14+
# Distribution / packaging
15+
.Python
16+
build/
17+
develop-eggs/
18+
dist/
19+
downloads/
20+
eggs/
21+
.eggs/
22+
lib/
23+
lib64/
24+
parts/
25+
sdist/
26+
var/
27+
wheels/
28+
pip-wheel-metadata/
29+
share/python-wheels/
30+
*.egg-info/
31+
.installed.cfg
32+
*.egg
33+
MANIFEST
34+
35+
# PyInstaller
36+
# Usually these files are written by a python script from a template
37+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
38+
*.manifest
39+
*.spec
40+
41+
# Installer logs
42+
pip-log.txt
43+
pip-delete-this-directory.txt
44+
45+
# Unit test / coverage reports
46+
htmlcov/
47+
.tox/
48+
.nox/
49+
.coverage
50+
.coverage.*
51+
.cache
52+
nosetests.xml
53+
coverage.xml
54+
*.cover
55+
.hypothesis/
56+
.pytest_cache/
57+
58+
# Translations
59+
*.mo
60+
*.pot
61+
62+
# Django stuff:
63+
*.log
64+
local_settings.py
65+
db.sqlite3
66+
db.sqlite3-journal
67+
68+
# Flask stuff:
69+
instance/
70+
.webassets-cache
71+
72+
# Scrapy stuff:
73+
.scrapy
74+
75+
# Sphinx documentation
76+
docs/_build/
77+
78+
# PyBuilder
79+
target/
80+
81+
# Jupyter Notebook
82+
.ipynb_checkpoints
83+
84+
# IPython
85+
profile_default/
86+
ipython_config.py
87+
88+
# pyenv
89+
.python-version
90+
91+
# pipenv
92+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
93+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
94+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
95+
# install all needed dependencies.
96+
#Pipfile.lock
97+
98+
# celery beat schedule file
99+
celerybeat-schedule
100+
101+
# SageMath parsed files
102+
*.sage.py
103+
104+
# Environments
105+
.env
106+
.venv
107+
env/
108+
venv/
109+
ENV/
110+
env.bak/
111+
venv.bak/
112+
113+
# Spyder project settings
114+
.spyderproject
115+
.spyproject
116+
117+
# Rope project settings
118+
.ropeproject
119+
120+
# mkdocs documentation
121+
/site
122+
123+
# mypy
124+
.mypy_cache/
125+
.dmypy.json
126+
dmypy.json
127+
128+
# Pyre type checker
129+
.pyre/
130+
131+
# End of https://www.gitignore.io/api/python

.travis.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
language: python
2+
dist: xenial
3+
matrix:
4+
include:
5+
- python: 3.6
6+
env:
7+
- TOXENV=check
8+
- python: 3.6
9+
env:
10+
- TOXENV=coverage
11+
- python: 3.6
12+
env:
13+
- TOXENV=py36
14+
- python: 3.7
15+
env: TOXENV=py37
16+
- python: 3.8
17+
env: TOXENV=py38
18+
install:
19+
- pip install tox
20+
- pip install codecov
21+
script:
22+
tox -e $TOXENV
23+
after_success:
24+
- codecov

README.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
:target: https://aeropython.github.io/scikit-aero/
1414
:alt: Docs
1515

16+
.. image:: https://img.shields.io/travis/com/aeropython/scikit-aero/master?style=for-the-badge
17+
:target: https://travis-ci.com/aeropython/scikit-aero
18+
:alt: Travis
19+
1620
.. image:: https://img.shields.io/badge/mailing%20list-groups.io-8cbcd1.svg?style=for-the-badge
1721
:target: aeropython@groups.io
1822
:alt: Email
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

doc/source/examples/Convergent-divergent nozzle.ipynb renamed to docs/source/examples/Convergent-divergent nozzle.ipynb

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)