Skip to content

Commit 9cfecd1

Browse files
committed
Merge branch 'release/0.1.2'
2 parents 57b72f6 + 8cdbfe8 commit 9cfecd1

File tree

5 files changed

+303
-15
lines changed

5 files changed

+303
-15
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ before_install:
2020
- pip install -U pip setuptools wheel # (from: https://github.com/dnouri/nolearn/blob/master/.travis.yml)
2121

2222
install:
23-
- travis_wait travis_retry pip install -r requirements.txt # (from: https://github.com/dnouri/nolearn/blob/master/.travis.yml)
24-
- pip install coveralls
23+
- pip install pipenv
2524

2625
script:
27-
- coverage run --source=src setup.py test
26+
- pipenv install
27+
- pipenv install --dev
28+
- pipenv run coverage run --source=multi_svr setup.py test
2829

29-
- pip3 install --upgrade git+https://github.com/nwtgck/multi-svr-python.git@$TRAVIS_BRANCH
30+
- pip3 install --upgrade git+https://github.com/nwtgck/multi-svr-python.git#$TRAVIS_COMMIT
3031
- python examples/example1.py
3132

3233
after_success:

Pipfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[[source]]
2+
verify_ssl = true
3+
name = "pypi"
4+
url = "https://pypi.org/simple"
5+
6+
[dev-packages]
7+
toml = "*"
8+
coveralls = "*"
9+
10+
[packages]
11+
certifi = "==2017.11.5"
12+
chardet = "==3.0.4"
13+
docopt = "==0.6.2"
14+
idna = "==2.6"
15+
numpy = "==1.13.3"
16+
requests = "==2.18.4"
17+
scikit-learn = "==0.19.1"
18+
scipy = "==1.0.0"
19+
"urllib3" = "==1.22"
20+
21+
[requires]
22+
python_version = "3.5"

Pipfile.lock

Lines changed: 263 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

requirements.txt

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

setup.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,27 @@
44

55
from setuptools import setup, find_packages
66
import sys
7+
import toml
8+
9+
def name_ver_join(name, ver):
10+
if ver == "*":
11+
return name
12+
else:
13+
return name + ver
14+
with open("Pipfile") as f:
15+
pipfile_dict = toml.load(f)
16+
install_requires = [name_ver_join(name, ver) for name, ver in pipfile_dict['packages'].items()]
17+
718

819
sys.path.append('./tests')
920

1021
setup(
1122
name='multi_svr',
12-
version='0.1.1',
23+
version='0.1.2',
1324
description='SVR for multidimensional label',
1425
author='Ryo Ota',
1526
author_email='[email protected]',
16-
install_requires=['scikit-learn', 'numpy', 'SciPy'],
27+
install_requires=install_requires,
1728
py_modules=["multi_svr"],
1829
packages=find_packages(),
1930
test_suite='tests'

0 commit comments

Comments
 (0)