some CI changed

yoshida-lab · Jan 28, 2018 · c64c087 · c64c087
1 parent 4d4cc09
commit c64c087
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,3 +36,10 @@ script:
  - make unittest
 
 after_script: conda remove --name xenonpy --all
+deploy:
+  provider: pypi
+  user: "tsumina"
+  password:
+    secure: L35FqByerbSDiyGyuzR5An7+OjNy3nSu33y9774ih927tlEKlOM8yYedMmrIvkYpHxDeHp8/MLdfWCRwL8VF2nlspJvP8Mqa+mpzLs/Dv9QU9lKmcc3xaqpaka/cI9+Dueev6M2fSLmEQuY8LQib7GsiIDKiOFfBrDnzf3/nfDwBe/f1m6itybsqXNWOLiFEyrRi3v6YQZC/QUfb0bHx0+5brLH0K250Z3jfDSwyGiuqT7JIMS8fEwium7Abu6Ge16FtOjINk1rZE1DpkNU3w34MTI+c5qCuHkXlUiOAyrMoeZZE0BmkVV6ed6sGk9WeZdgX27oKNww93QCeir0NGzt2N51aY9m0Klj9O9lKiv7BdGcoyafpmCJQknjPxdrntHVlg5KMuUhbmgQ17X1TKXm4tR7yZa4cY/U/oOX4d+flEyZalRMzIgaxj3xVUGVoNSjBL+ZVyuXj+jmUnNB7Bf2gYk8XvxNYi5tB3axqmpgtQdVP40MorqUHYkBojoVEwv45E2bNKw3dnIQomWhrP76VwQt7jdCXVEITvUmI7IUio3Ewhnkyx3O++KQjcwS53hF7JCmF5e7qhGB52IT0MBD7XpaIkHA3wTQkPmMwNP8GccBo5HHUc8p+1z4HcRi8OZPSw/3o5alw0C7nuwfUZiIHbfhG0mcSuk0lPbb5tfg=
+  on:
+    tags: true
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -0,0 +1,7 @@
+Changes
+=======
+
+0.1.0b7:
+
+* (**import**)Change anaconda-channel from ``youshida-lab`` to ``conda-forge``.
+* Split ``PyTorch`` from runtime dependence. Now you need ``PyTorch`` only with nn modules.
diff --git a/environment_py35.yml b/environment_py35.yml
@@ -16,6 +16,12 @@ dependencies:
 - scipy
 - pytorch
 - pyyaml
+- pytest
+- pytest-cov
+- pylint
+- sphinx
+- sphinx_rtd_theme
+- jupyter
 - pip:
   - pymonad
   - pymatgen

diff --git a/environment_py36.yml b/environment_py36.yml
@@ -17,6 +17,12 @@ dependencies:
 - scipy
 - pytorch
 - pyyaml
+- pytest
+- pytest-cov
+- pylint
+- sphinx
+- sphinx_rtd_theme
+- jupyter
 - pip:
   - pymonad
   - matminer
diff --git a/environment_win_py35.yml b/environment_win_py35.yml
@@ -16,6 +16,12 @@ dependencies:
 - scipy
 - pytorch
 - pyyaml
+- pytest
+- pytest-cov
+- pylint
+- sphinx
+- sphinx_rtd_theme
+- jupyter
 - pip:
   - pymatgen
   - pymonad

diff --git a/requirements_others.txt b/requirements_others.txt
@@ -0,0 +1,3 @@
+pylint
+sphinx
+sphinx_rtd_theme
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,5 +1,2 @@
-pylint
 pytest
 pytest-cov
-sphinx
-sphinx_rtd_theme
diff --git a/xenonpy/__init__.py b/xenonpy/__init__.py
@@ -14,8 +14,6 @@
 
 cfg_root = '.' + __name__
 
-dataset_ver = 'v0.1.0b6'
-
 
 def get_conf(key: str = None):
     """
@@ -59,12 +57,7 @@ def _get_dataset_url(fname: str):
     str
         binary file url.
     """
-
-    return 'https://github.com/' + \
-           __github_username__ + '/' + \
-           __name__ + '/releases/download/' + \
-           dataset_ver + '/' + \
-           fname + '.pkl'
+    return 'https://github.com/' + __github_username__ + '/dataset/releases/download/v0.1' + '/' + fname + '.pkl'
 
 
 def _init_cfg_file(force=False):
@@ -109,8 +102,8 @@ def _init_cfg_file(force=False):
 _init_cfg_file()
 
 from . import descriptor
+from . import model
 # from .pipeline import *
 # from .preprocess import *
 from . import utils
 from . import visualization
-from . import model
diff --git a/xenonpy/model/nn/__init__.py b/xenonpy/model/nn/__init__.py
@@ -9,7 +9,7 @@
     try:
         import torch
     except ImportError:
-        warnings.warn("Can't fing pytorch, will not load Neorul Network modules.", RuntimeWarning)
+        warnings.warn("Can't fing pytorch, will not load neural network modules.", RuntimeWarning)
     else:
         from .base_model import *
         from .layer import *