Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
zweistein-frm2 committed Jun 25, 2020
1 parent f49f7bb commit 309deff
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
23 changes: 23 additions & 0 deletions Charm-Mesytec-Histogram.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30128.36
MinimumVisualStudioVersion = 10.0.40219.1
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Charm-Mesytec-Histogram", "Charm-Mesytec-Histogram.pyproj", "{19FC8027-5A16-4548-97CE-E40450318DEB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{19FC8027-5A16-4548-97CE-E40450318DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19FC8027-5A16-4548-97CE-E40450318DEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {155B47C2-AAAE-4941-B169-C561CF04D157}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions version.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# *****************************************************************************

from __future__ import print_function

import re
import os.path
from subprocess import PIPE, Popen

Expand All @@ -42,7 +42,7 @@ def get_git_version(abbrev=0):
stdout=PIPE, stderr=PIPE)
stdout, _stderr = p.communicate()

GIT_LATEST_TAG = stdout.strip().decode('utf-8', 'ignore')
GIT_LATEST_TAG = re.sub("[^0-9]", "", stdout.strip().decode('utf-8', 'ignore'))

p = Popen(['git', '--git-dir=%s' % GIT_REPO,
'rev-list', '--tags %s ..HEAD' % GIT_LATEST_TAG,'--count'],
Expand Down

0 comments on commit 309deff

Please sign in to comment.