Skip to content

use setuptools_scm instead of setuptools-git-version #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amcadmus merged 3 commits into from
Jul 30, 2019
+12 −2
Merged

use setuptools_scm instead of setuptools-git-version #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
973730c
use setuptools_scm
njzjz Jul 30, 2019
4b82cfb
pin gcc to v4.8 in CI
njzjz Jul 30, 2019
b5b4314
specify CC and CXX in CI
njzjz Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
language: python
python: "3.6"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- g++-4.8
env:
global:
- CC=gcc-4.8
- CXX=g++-4.8
matrix:
- TENSORFLOW_VERSION=1.8
- TENSORFLOW_VERSION=1.12
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# install_requires = ['xml']
install_requires=['numpy', 'scipy']
setup_requires=['setuptools-git-version']
setup_requires=['setuptools_scm']

# add cmake as a build requirement if cmake>3.0 is not installed
try:
Expand All @@ -38,7 +38,7 @@
setup(
name="deepmd-kit",
setup_requires=setup_requires,
version_format='{tag}.dev{commitcount}_{gitsha}',
use_scm_version={'write_to': 'source/train/_version.py'},
author="Han Wang",
author_email="wang_han@iapcm.ac.cn",
description="A deep learning package for many-body potential energy representation and molecular dynamics",
Expand Down