Update around travis and version number

.travis.yml

@@ -19,6 +19,7 @@ before_install:
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
     - conda update --yes conda
+    - echo $TRAVIS_TAG
 
 install:
     - conda install --yes python=$TRAVIS_PYTHON_VERSION pip numpy h5py pyyaml matplotlib setuptools setuptools_scm
@@ -35,6 +36,7 @@ deploy:
     - provider: pypi
       server: https://test.pypi.org/legacy/
       skip_cleanup: true
+      skip_existing: true
       distributions: sdist
       user: atztogo
       password:
@@ -58,6 +60,7 @@ deploy:
     # production pypi
     - provider: pypi
       skip_cleanup: true
+      skip_existing: true
       distributions: sdist
       user: atztogo
       password:

conda/anaconda_deploy.sh

@@ -5,7 +5,7 @@ export TKN=$2
 export GIT_BRANCH=$3
 
 cd conda
-sed s/version_from_shell/`git describe --tags --dirty | sed -e 's/-\(.*\)-g.*/+\1/' -e 's/^[vr]//g'`/ meta.yaml > meta.tmp.yaml
+sed s/version_from_shell/`git describe --tags --dirty | sed -e 's/-\(.*\)-g.*/+\1/' -e 's/^[vr]//g' -e 's/dirty/0/'`/ meta.yaml > meta.tmp.yaml
 mv meta.tmp.yaml meta.yaml
 cd ..
 conda install conda-build anaconda-client --yes
@@ -13,4 +13,3 @@ conda build conda --no-anaconda-upload
 TRG=`conda build conda --output |sed -e 's/--/-*-/'`
 echo "Uploading: $TRG"
 anaconda --token $TKN upload --label $LBL $TRG
-

setup.py

@@ -168,11 +168,13 @@ if __name__ == '__main__':
         print("Failed to get version number in setup.py.")
         raise
 
-    version_number = ".".join(["%d" % n for n in version_nums])
+    version = ".".join(["%d" % n for n in version_nums[:3]])
+    if len(version_nums) > 3:
+        version += "-%d" % version_nums[3]
 
     if use_setuptools:
         setup(name='phonopy',
-              version=version_number,
+              version=version,
               description='This is the phonopy module.',
               author='Atsushi Togo',
               author_email='atz.togo@gmail.com',
@@ -186,7 +188,7 @@ if __name__ == '__main__':
               tests_require=['nose'])
     else:
         setup(name='phonopy',
-              version=version_number,
+              version=version,
               description='This is the phonopy module.',
               author='Atsushi Togo',
               author_email='atz.togo@gmail.com',