Skip to content

Commit

Permalink
Merge branch 'release/v0.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
JaeyeongYang committed Oct 31, 2018
2 parents c052f35 + 536e907 commit 203561a
Show file tree
Hide file tree
Showing 33 changed files with 2,158 additions and 626 deletions.
15 changes: 2 additions & 13 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,17 @@ root = true

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

# Use 4 spaces & 119 characters per line for Python
[*.py]
indent_size = 4
max_line_length = 119

# Use 2 spaces for the HTML files
[*.html]
indent_size = 2

# Use 2 spaces for the reStructuredText files
[*.rst]
indent_size = 2
max_line_length = 79

# Use 4 spaces for the MATLAB files
[*.m]
indent_size = 4
max_line_length = 79

[*.tex]
indent_size = 2
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@ language: python
sudo: false
cache: pip

branches:
only:
- master
- develop

python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"

install:
- pip install .[test]
- pip install -e .[test]

script:
- pytest --cov=adopy
- flake8 adopy --format=pylint --statistics
- pytest --doctest-modules --cov=adopy
- codecov --token $CODECOV_TOKEN
695 changes: 674 additions & 21 deletions LICENSE

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions adopy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
"""
ADOR
====
ADOpy
=====
ADOR is the package of Adaptive Design Optimization wRapper.
The package is based on the code by Woojae Kim and Bryan Zake.
ADOpy is a Python package for Adaptive Design Optimization.
"""
from __future__ import absolute_import, division, print_function
from adopy import base
from adopy import functions
from adopy import tasks

from .generics import ADOGeneric
from adopy.base import Task, Model, Engine

__all__ = ['base', 'functions', 'tasks', 'Task', 'Model', 'Engine']
__version__ = '0.1.0'
8 changes: 8 additions & 0 deletions adopy/base/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"""
Base
----
Base classes for ADOpy.
"""
from ._meta import *
from ._engine import *
Loading

0 comments on commit 203561a

Please sign in to comment.