Use setuptools_scm to determinate project version

diff --git a/.gitignore b/.gitignore
index a31344088d914e832b910588bf9bb6736fc72eba..5e7aaa43f9369e5693e2d725db5fb5832a95b057 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ dist/
 music_sampler/__pycache__/
 __pycache__/
 .pyinstaller_commit
 music_sampler/__pycache__/
 __pycache__/
 .pyinstaller_commit

+music_sampler.egg-info/

diff --git a/documentation_fr.md b/documentation_fr.md
index 377b69ca3327936e2f6b51b6dbf99cae2c3f53d9..ccfcf9b75d551d4514cce59afc14d5c5c0e89ee0 100644 (file)
--- a/documentation_fr.md
+++ b/documentation_fr.md
@@ -23,7 +23,7 @@ Si vous utilisez la version compilée de Music Sampler (cf. plus bas pour un lie
 | Kivy        | 1.9.1            |                                  |
 | Markdown    | 2.6.6            | pour la documentation uniquement |
 | pydub       | 0.16.4           |                                  |
 | Kivy        | 1.9.1            |                                  |
 | Markdown    | 2.6.6            | pour la documentation uniquement |
 | pydub       | 0.16.4           |                                  |

-| Pygame      | 1.9.2pre         | utilisée par Kivy                |
+| Pygame      | 1.9.2.dev1       | utilisée par Kivy                |

 | Pygments    | 2.1.3            | pour la documentation uniquement |
 | sounddevice | 0.3.3            |                                  |
 | transitions | 0.4.1            |                                  |
 | Pygments    | 2.1.3            | pour la documentation uniquement |
 | sounddevice | 0.3.3            |                                  |
 | transitions | 0.4.1            |                                  |

diff --git a/music_sampler.spec b/music_sampler.spec
index 791cd686ec7d02798c4dabe25d5c5c3b3f0d24d0..5549b767f957bf77f38eb89c7dd11edb6ba8a84f 100644 (file)
--- a/music_sampler.spec
+++ b/music_sampler.spec
@@ -1,5 +1,6 @@
 # -*- mode: python -*-
 import os
 # -*- mode: python -*-
 import os

+import setuptools_scm

 from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\
         hookspath, runtime_hooks
 
 from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\
         hookspath, runtime_hooks
 


@@ -22,7 +23,7 @@ excluded_and_hidden_modules['hiddenimports'] += [
         'packaging.specifiers',
         'packaging.requirements' ]
 
         'packaging.specifiers',
         'packaging.requirements' ]
 

-commit_message = os.popen('git log -1 --format="%h  %ci"').read()
+commit_message = setuptools_scm.get_version()

 pyinstaller_file = open(".pyinstaller_commit", "w")
 pyinstaller_file.write(commit_message)
 pyinstaller_file.close()
 pyinstaller_file = open(".pyinstaller_commit", "w")
 pyinstaller_file.write(commit_message)
 pyinstaller_file.close()