Skip to content

Commit

Permalink
Merge pull request #380 from loriab/lastminute
Browse files Browse the repository at this point in the history
modify version slightly for rc
  • Loading branch information
loriab committed May 13, 2016
2 parents 8775cc4 + 02a4ea2 commit 15fc63c
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion share/python/p4const/physconst.py
Original file line number Diff line number Diff line change
@@ -52,4 +52,4 @@
psi_kcalmol2wavenumbers = 349.7551 # kcal mol$^{-1}$ to cm$^{-1}$ conversion factor
psi_e0 = 8.854187817E-12 # Vacuum permittivity (Fm$^{-1}$)
psi_na = 6.02214179E23 # Avagadro's number
psi_me = 9.10938215E-31 # Electron rest mass (in kg)
psi_me = 9.10938215E-31 # Electron rest mass (in kg)
3 changes: 2 additions & 1 deletion share/python/p4const/psifiles.py
Original file line number Diff line number Diff line change
@@ -208,4 +208,5 @@
PSIF_DFOCC_AMPS = 277 # DFOCC Amplitudes
PSIF_DFOCC_DENS = 278 # DFOCC PDMs
PSIF_DFOCC_IABC = 279 # DFOCC (IA|BC)
PSIF_DFOCC_TEMP = 280 # DFOCC temporary storage
PSIF_DFOCC_TEMP = 280 # DFOCC temporary storage

7 changes: 5 additions & 2 deletions src/bin/psi4/gitversion.py
Original file line number Diff line number Diff line change
@@ -100,7 +100,10 @@ def write_version(branch, mmp, ghash, status):

# major-minor-patch
if len(fields) == 2:
mmp = '.'.join(fields)
if fields[0].endswith('rc'):
mmp = ''.join(fields)
else:
mmp = '.'.join(fields)
else:
mmp = ''

@@ -131,4 +134,4 @@ def write_version(branch, mmp, ghash, status):
ghash = ''
mmp = ''

write_version(branch, mmp, ghash, status)
write_version(branch, mmp, ghash, status)

0 comments on commit 15fc63c

Please sign in to comment.