Skip to content

Commit e4b2a85

Browse files
committed
Merge branch 'develop' into hotfix/0.1.1
* develop: [edit] Add an import statement to code in README.md [change] Remove main from src/multi_svr.py [change] Change --source from tests to src in coverage in .travis.yml [change] Change .travis and setup.py [change] Change test_suite in setup.py from 'tests' to 'multi_svr_test.suite' [change] Add "--source=multi_svr_test" to coverage in .travis.yml [fix] Remove --source from coverage in .travis.yml [edit] Add missing '>' to README.md # Conflicts: # multi_svr/__init__.py
2 parents 8754bb5 + 463525d commit e4b2a85

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install:
2424
- pip install coveralls
2525

2626
script:
27-
- coverage run --source=nwtgck_hello_test setup.py test
27+
- coverage run --source=src setup.py test
2828

2929
- pip3 install --upgrade git+https://github.com/nwtgck/multi-svr-python.git@$TRAVIS_BRANCH
3030
- python examples/example1.py

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Support Vector Regression (SVR) for multidimensional labels
1313
## Usage
1414

1515
```python
16+
import multi_svr
17+
1618
X = [
1719
[0, 0],
1820
[0, 10],
@@ -44,6 +46,6 @@ errs = metrics.mean_squared_error(y, pred_y)
4446
## How to test
4547

4648
```bash
47-
cd <this repo
49+
cd <this repo>
4850
python setup.py test
4951
```

multi_svr/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,3 @@ def predict(self, X):
4141

4242
pred = np.column_stack(tuple(preds))
4343
return pred
44-
45-

0 commit comments

Comments
 (0)