Skip to content

Commit

Permalink
Merge e62ccb6 into 7e5476b
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed May 21, 2020
2 parents 7e5476b + e62ccb6 commit 6b17fa2
Show file tree
Hide file tree
Showing 153 changed files with 1,766 additions and 709 deletions.
20 changes: 20 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[bumpversion]
current_version = 0.3.0 dev
commit = True
tag = True

[bumpversion:file:setup.py]
search = version='{current_version}'
replace = version='{new_version}'

[bumpversion:file:README.rst]
search = v{current_version}.
replace = v{new_version}.

[bumpversion:file:docs/conf.py]
search = version = release = '{current_version}'
replace = version = release = '{new_version}'

[bumpversion:file:src/tespy/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'
14 changes: 14 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[paths]
source =
src

[run]
branch = true
source =
src
parallel = true

[report]
show_missing = true
precision = 2
omit = *migrations*
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# see https://editorconfig.org/
root = true

[*]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4
charset = utf-8

[*.{bat,cmd,ps1}]
end_of_line = crlf

[*.{yml,yaml}]
indent_size = 2
135 changes: 49 additions & 86 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,108 +1,71 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
__pycache__

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
# Packages
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
*.egg-info
dist
build
eggs
.eggs
parts
bin
var
sdist
wheelhouse
develop-eggs
.installed.cfg
lib
lib64
venv*/
pyvenv*/
pip-wheel-metadata/

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.tox
.coverage.*
.cache
.pytest_cache/
nosetests.xml
coverage.xml
*.cover
.hypothesis/
htmlcov

# Translations
*.mo
*.pot

# Django stuff:
*.log
.static_storage/
.media/
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
# Mr Developer
.mr.developer.cfg
.project
.pydevproject
.idea
*.iml
*.komodoproject

# Complexity
output/*.html
output/*/index.html

# Sphinx
docs/_build

.DS_Store
*~
.*.sw[po]
.build
.ve
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site
.cache
.pytest
.benchmarks
.bootstrap
.appveyor.token
*.bak

# mypy
# Mypy Cache
.mypy_cache/

# other IDEs
.idea/

10 changes: 10 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
version: 2
sphinx:
configuration: docs/conf.py
formats: all
python:
install:
- requirements: docs/requirements.txt
- method: pip
path: .
69 changes: 44 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,49 @@
language: python

dist: xenial
cache: false
env:
global:
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
- SEGFAULT_SIGNALS=all
matrix:
include:
- name: "python 3.6 on xenial Linux"
python: 3.6
dist: xenial
- name: "python 3.7 on xenial Linux"
python: 3.7
dist: xenial
- name: "python 3.8 on xenial Linux"
python: 3.8
dist: xenial
# - name: "Python 3.7.3 on Windows"
# os: windows
# language: shell
# before_install: choco install python3
# env: PATH=/c/Python37:/c/Python37/Scripts:$PATH

- python: '3.6'
env:
- TOXENV=check
- python: '3.6'
env:
- TOXENV=docs
- env:
- TOXENV=py36,coveralls
python: '3.6'
- env:
- TOXENV=py37,coveralls
python: '3.7'
- env:
- TOXENV=py38,coveralls
python: '3.8'
before_install:
- python --version
- uname -a
- lsb_release -a || true
- |
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
[[ $TOXENV =~ py3 ]] && brew upgrade python
[[ $TOXENV =~ py2 ]] && brew install python@2
export PATH="/usr/local/opt/python/libexec/bin:${PATH}"
fi
install:
- pip install .
- pip install pytest-cov
- pip install coveralls

# command to run tests
- python -mpip install --progress-bar=off tox -rci/requirements.txt
- virtualenv --version
- easy_install --version
- pip --version
- tox --version
script:
- python -m pytest ./tespy --doctest-modules ./tests --cov=tespy

after_success:
- coveralls
- tox -v
after_failure:
- more .tox/log/* | cat
- more .tox/*/log/* | cat
notifications:
email:
on_success: never
on_failure: always
5 changes: 5 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

Authors
=======

* Francesco Witte - https://oemof.org
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 oemof developer group
Copyright (c) 2017-2020, oemof developer group

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
23 changes: 23 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
graft docs
graft src
graft ci
graft tests

include .bumpversion.cfg
include .coveragerc
include .cookiecutterrc
include .editorconfig

include AUTHORS.rst
include CHANGELOG.rst
include CONTRIBUTING.rst
include LICENSE
include README.rst
include *.md
include *.yml
include *.bib
recursive-include tutorial *.py

include tox.ini

global-exclude *.py[cod] __pycache__/* *.so *.dylib

0 comments on commit 6b17fa2

Please sign in to comment.