Merge branch 'common-diffpy-patches'

Author: pavoljuhas

src/diffpy/pdfgui/gitarchive.cfg .gitarchive.cfgsrc/diffpy/pdfgui/gitarchive.cfg renamed to .gitarchive.cfg

@@ -3,4 +3,4 @@
 /.travis.yml  export-ignore
 /conda-recipe/  export-ignore
 /devutils  export-ignore
-gitarchive.cfg  export-subst
+.gitarchive.cfg  export-subst

.gitattributes

@@ -8,7 +8,16 @@ exclude doc/manual/images/*.pdf
 recursive-exclude doc/manual Makefile *.py *.texinfo
 recursive-exclude doc/manual *.aux *.cp *.cps *.err *.log *.toc *.vr *.vrs
 recursive-include icons *.png *.ico
-recursive-exclude * .gitattributes .gitignore .DS_Store
+recursive-exclude icons *.m *.xcf
+global-exclude .gitattributes .gitignore .gitarchive.cfg
+global-exclude .DS_Store
 
 # Avoid user content in setup.cfg to make distribution reproducible.
 exclude setup.cfg
+
+# Exclude git-tracked files spuriously added by setuptools_scm
+exclude .coveragerc
+exclude .travis*
+prune conda-recipe
+prune devutils
+prune doc

MANIFEST.in

@@ -19,7 +19,7 @@
 # It must reside in the same directory as version.py.
 MYDIR = os.path.dirname(os.path.abspath(__file__))
 versioncfgfile = os.path.join(MYDIR, 'src/diffpy/pdfgui/version.cfg')
-gitarchivecfgfile = versioncfgfile.replace('version.cfg', 'gitarchive.cfg')
+gitarchivecfgfile = os.path.join(MYDIR, '.gitarchive.cfg')
 
 def gitinfo():
     from subprocess import Popen, PIPE
@@ -42,7 +42,7 @@ def getversioncfg():
     g = vd0.copy()
     cp0 = RawConfigParser(vd0)
     cp0.read(gitarchivecfgfile)
-    if '$Format:' not in cp0.get('DEFAULT', 'commit'):
+    if len(cp0.get('DEFAULT', 'commit')) > 20:
         g = cp0.defaults()
         mx = re.search(r'\btag: v(\d[^,]*)', g.pop('refnames'))
         if mx: