Merge pull request #100 from yoshida-lab/feature/remove_py35_supprot_…

…and_add_appveyor_ci

Remove py35 support and add Appveyor CI

.travis.yml

@@ -9,10 +9,6 @@ git:
 
 matrix:
   include:
-    - os: linux
-      dist: xenial # use ubuntu 14.04lts
-      sudo: false #  runs each build in a container on a shared host via Docker
-      env: PYENV=py35
     - os: linux
       dist: xenial
       sudo: false
@@ -23,14 +19,10 @@ matrix:
       dist: xenial
       sudo: false
       env: PYENV=py37
-    - os: osx
-      language: generic
-      env: PYENV=py35
     - os: osx
       language: generic
       env: PYENV=py36
     - os: osx
-      #       skip: true
       language: generic
       env: PYENV=py37
 

README.md

@@ -1,10 +1,11 @@
 # What is XenonPy project
 
-[![Join the chat at https://gitter.im/yoshida-lab/XenonPy](https://badges.gitter.im/yoshida-lab/XenonPy.svg)](https://gitter.im/yoshida-lab/XenonPy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/yoshida-lab/XenonPy.svg?branch=master)](https://travis-ci.org/yoshida-lab/XenonPy)
+[![Build status](https://ci.appveyor.com/api/projects/status/vnh350xqffp6t9nk/branch/master?svg=true)](https://ci.appveyor.com/project/TsumiNa/xenonpy/branch/master)
 [![codecov](https://codecov.io/gh/yoshida-lab/XenonPy/branch/master/graph/badge.svg)](https://codecov.io/gh/yoshida-lab/XenonPy)
 [![Version](https://img.shields.io/github/tag/yoshida-lab/XenonPy.svg?maxAge=360)](https://github.com/yoshida-lab/XenonPy/releases/latest)
 [![Python Versions](https://img.shields.io/pypi/pyversions/xenonpy.svg)](https://pypi.org/project/xenonpy/)
+[![Join the chat at https://gitter.im/yoshida-lab/XenonPy](https://badges.gitter.im/yoshida-lab/XenonPy.svg)](https://gitter.im/yoshida-lab/XenonPy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 **XenonPy** is a Python library that implements a comprehensive set of machine learning tools
 for materials informatics. Its functionalities partially depend on PyTorch and R.

conda_env/xepy36_cpu_linux.yml → conda_env/xepy36_cpu.yml

@@ -1,4 +1,4 @@
-name: xepy36_cpu_linux
+name: xepy36_cpu
 channels:
   - defaults
   - pytorch

conda_env/xepy37_cpu_linux.yml → conda_env/xepy37_cpu.yml

@@ -1,4 +1,4 @@
-name: xepy37_cpu_linux
+name: xepy37_cpu
 channels:
   - defaults
   - pytorch

devtools/conda_py36.yml

@@ -23,5 +23,7 @@ dependencies:
       - ruamel.yaml
       - pymatgen==2019.3.13
       - jupyterlab
+      - pybtex
+      - mordred
       - yapf
       - tqdm

devtools/conda_py37.yml

@@ -23,5 +23,7 @@ dependencies:
       - ruamel.yaml
       - pymatgen==2019.3.13
       - jupyterlab
+      - pybtex
+      - mordred
       - yapf
       - tqdm

docs/source/index.rst

@@ -7,14 +7,15 @@
 ========================
 What is XenonPy project
 ========================
-.. image:: https://badges.gitter.im/yoshida-lab/XenonPy.svg
-    :alt: Join the chat at https://gitter.im/yoshida-lab/XenonPy
-    :target: https://gitter.im/yoshida-lab/XenonPy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
 .. image:: https://travis-ci.org/yoshida-lab/XenonPy.svg?branch=master
     :alt: Build Status
     :target: https://travis-ci.org/yoshida-lab/XenonPy
 
+.. image:: https://ci.appveyor.com/api/projects/status/vnh350xqffp6t9nk/branch/master?svg=true
+    :alt: Build Status
+    :target: https://ci.appveyor.com/project/TsumiNa/xenonpy
+
 .. image:: https://codecov.io/gh/yoshida-lab/XenonPy/branch/master/graph/badge.svg
   :target: https://codecov.io/gh/yoshida-lab/XenonPy
 
@@ -26,6 +27,9 @@ What is XenonPy project
     :alt: Python Versions
     :target: https://pypi.org/project/xenonpy/
 
+.. image:: https://badges.gitter.im/yoshida-lab/XenonPy.svg
+    :alt: Join the chat at https://gitter.im/yoshida-lab/XenonPy
+    :target: https://gitter.im/yoshida-lab/XenonPy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
 --------
 Overview

tests/datatools/test_storage.py

@@ -39,7 +39,8 @@ def setup():
 
 def test_storage_1(setup):
     saver = setup['saver']
-    ret = '<{}> under `{}/.xenonpy/userdata` includes:'.format(setup['user_dataset'], Path.home())
+    ret = '<{}> under `{}` includes:'.format(setup['user_dataset'],
+                                             Path.home() / '.xenonpy' / 'userdata')
     assert str(saver) == ret, 'no files'
 
 

travis/before_install.sh

@@ -31,10 +31,6 @@ conda info -a
 case "${TRAVIS_OS_NAME}" in
     osx)
         case "${PYENV}" in
-            py35)
-                conda env create -f travis/osx/py35.yml
-                source activate xepy35
-                ;;
             py36)
                 conda env create -f travis/osx/py36.yml
                 source activate xepy36
@@ -47,16 +43,12 @@ case "${TRAVIS_OS_NAME}" in
         ;;
     linux)
         case "${PYENV}" in
-            py35)
-                conda env create -f travis/linux/py35.yml
-                source activate xepy35
-                ;;
             py36)
-                conda env create -f travis/linux/py36.yml
+                conda env create -f travis/linux-win/py36.yml
                 source activate xepy36
                 ;;
             py37)
-                conda env create -f travis/linux/py37.yml
+                conda env create -f travis/linux-win/py37.yml
                 source activate xepy37
                 ;;
         esac

xenonpy/datatools/dataset.py

@@ -51,7 +51,8 @@ def _nest(_f):
             for f in files:
                 # select data
                 f = Path(f).resolve()
-                parent = str(f.parent).split('/')[-1]
+                parent = re.split(r'[\\/]', str(f.parent))[-1]
+                # parent = str(f.parent).split('/')[-1]
                 fn = f.name[:-(1 + len(patten))]
                 fn = self.__re__.sub('_', fn)
                 if parent in prefix: