Merge branch 'master' into graph-dataset-2 (76733f9d) · Commits · 钟慕尧 / deepchem

.coveragerc

deleted100644 → 0

+0 −4

Original line number	Original line	Diff line number	Diff line
	[report]
	omit =
	/python?.?/
	/site-packages/nose/

.style.yapf

deleted100644 → 0

+0 −3

Original line number	Original line	Diff line number	Diff line
	[style]
	based_on_style = google
	indent_width = 2

.travis.yml

+48 −34

Original line number	Original line	Diff line number	Diff line
	@@ -14,29 +14,43 @@ jobs:
	language: c		language: c
	python: '3.7'		python: '3.7'
	os: windows		os: windows

	install:		install:
	- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh		- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
	-O miniconda.sh; export python_version=$TRAVIS_PYTHON_VERSION; bash miniconda.sh		wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
	-b -p $HOME/miniconda; source "$HOME/miniconda/etc/profile.d/conda.sh"; fi		export python_version=$TRAVIS_PYTHON_VERSION;
	- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install miniconda3 --params="'/JustMe		bash miniconda.sh -b -p $HOME/miniconda;
	/AddToPath:1'"; export PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:/c/tools/miniconda3/Library/bin:$PATH";		source "$HOME/miniconda/etc/profile.d/conda.sh";
	source /c/tools/miniconda3/etc/profile.d/conda.sh; fi		fi
			- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
			choco install miniconda3 --params="'/JustMe /AddToPath:1'";
			export PATH="/c/tools/miniconda3/:/c/tools/miniconda3/Scripts:/c/tools/miniconda3/Library/bin:$PATH";
			source /c/tools/miniconda3/etc/profile.d/conda.sh;
			fi
			- hash -r
	- conda config --set always_yes yes --set changeps1 no		- conda config --set always_yes yes --set changeps1 no
	- conda update -q conda		- conda update -q conda
	- bash scripts/install_deepchem_conda.sh deepchem		- bash scripts/install_deepchem_conda.sh deepchem
	- conda activate deepchem		- conda activate deepchem
	- python setup.py install		- python setup.py install
	- pip install coveralls yapf==0.22.0		- pip install coveralls mypy yapf==0.22.0

	script:		script:
			- bash devtools/run_yapf.sh
			- mypy -p deepchem
	- pytest -m "not slow" --cov=deepchem deepchem		- pytest -m "not slow" --cov=deepchem deepchem
	- if [ $TRAVIS_PYTHON_VERSION == '3.7' ]; then		- if [ $TRAVIS_PYTHON_VERSION == '3.7' ]; then
	find ./deepchem -name ".py" ! -name 'load_dataset_template.py' \| xargs python -m doctest -v; fi		cd docs && pip install -r requirements.txt;
	- bash devtools/travis-ci/test_format_code.sh		make clean html && cd ..;
			fi
	- if [ $TRAVIS_PYTHON_VERSION == '3.7' ]; then		- if [ $TRAVIS_PYTHON_VERSION == '3.7' ]; then
	cd docs && pip install -r requirements.txt && make clean html && cd ..; fi		find ./deepchem -name ".py" ! -name 'load_dataset_template.py' \| xargs python -m doctest -v;
			fi

	after_success:		after_success:
	- echo $TRAVIS_SECURE_ENV_VARS		- echo $TRAVIS_SECURE_ENV_VARS
	- coveralls		- coveralls

	deploy:		deploy:
	provider: pypi		provider: pypi
	username: __token__		username: __token__

deepchem/data/init.py

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,8 @@ from deepchem.data.supports import *
	from deepchem.data.data_loader import DataLoader		from deepchem.data.data_loader import DataLoader
	from deepchem.data.data_loader import CSVLoader		from deepchem.data.data_loader import CSVLoader
	from deepchem.data.data_loader import UserCSVLoader		from deepchem.data.data_loader import UserCSVLoader
			from deepchem.data.data_loader import JsonLoader
	from deepchem.data.data_loader import SDFLoader		from deepchem.data.data_loader import SDFLoader
	from deepchem.data.data_loader import FASTALoader		from deepchem.data.data_loader import FASTALoader
	from deepchem.data.data_loader import ImageLoader		from deepchem.data.data_loader import ImageLoader
			from deepchem.data.data_loader import InMemoryLoader

Admin message