Merge branch 'maint'

* normalize line ends in Windows `.bat` files
* fix remaining links to Anaconda Python
* replace deprecated unit test method
* fix data paths when running in package base
* require wxpython 3 for conda package

Author: pavoljuhas

.gitattributes

@@ -4,3 +4,4 @@
 /conda-recipe/  export-ignore
 /devutils  export-ignore
 .gitarchive.cfg  export-subst
+*.bat  text eol=crlf

conda-recipe/bld.bat

@@ -1,17 +1,17 @@
-%PYTHON% setup.py install
-if errorlevel 1 exit 1
-
-:: Add more build steps here, if they are necessary.
-
-set MENU_DIR=%PREFIX%\Menu
-if not exist (%MENU_DIR%) mkdir %MENU_DIR%
-
-cd %RECIPE_DIR%
-%PYTHON% expandpdfguibase.py menu-windows.json > %MENU_DIR%\menu-windows.json
-if errorlevel 1 exit 1
-
-copy pdfgui.ico %MENU_DIR%\
-if errorlevel 1 exit 1
-
-:: See http://docs.continuum.io/conda/build.html
-:: for a list of environment variables that are set during the build process.
+%PYTHON% setup.py install
+if errorlevel 1 exit 1
+
+:: Add more build steps here, if they are necessary.
+
+set MENU_DIR=%PREFIX%\Menu
+if not exist (%MENU_DIR%) mkdir %MENU_DIR%
+
+cd %RECIPE_DIR%
+%PYTHON% expandpdfguibase.py menu-windows.json > %MENU_DIR%\menu-windows.json
+if errorlevel 1 exit 1
+
+copy pdfgui.ico %MENU_DIR%\
+if errorlevel 1 exit 1
+
+:: See http://docs.continuum.io/conda/build.html
+:: for a list of environment variables that are set during the build process.

conda-recipe/meta.yaml

@@ -38,7 +38,7 @@ requirements:
     - python
     - setuptools
     - matplotlib
-    - wxpython
+    - wxpython 3.*
     - menuinst                  [win]
     - diffpy.pdffit2
     - diffpy.structure 1.*

doc/manual/pdfgui.html

@@ -297,7 +297,7 @@ information about DiffPy products visit the project homepage at
 @subsection Installation for Anaconda Python
 
 As of version 1.1 PDFgui is distributed as a pre-built package for
-@url{https://www.continuum.io, Anaconda Python}.  This method makes it
+@url{https://www.anaconda.com, Anaconda Python}.  This method makes it
 easier to distribute software updates and also results in the same
 installation procedure on all supported platforms.
 

doc/manual/pdfgui.texinfo

@@ -28,7 +28,8 @@
 isAltered = False
 
 # Resolve APPDATADIR base path to application data files.
-_upbasedir = os.path.normpath(resource_filename(__name__, '../../..'))
+_mydir = os.path.abspath(resource_filename(__name__, ''))
+_upbasedir = os.path.normpath(_mydir + '/../../..')
 _development_mode = (
     os.path.basename(_upbasedir) == "src" and
     os.path.isfile(os.path.join(_upbasedir, "../setup.py"))

src/diffpy/pdfgui/gui/pdfguiglobals.py

@@ -73,7 +73,7 @@ def rgriddata(calc):
         # range should cover the argument range.
         self.calc.setRGrid(1, 0.7, 10)
         self.assertEqual(1, self.calc.rmin)
-        self.failUnless(10 < self.calc.rmax)
+        self.assertTrue(10 < self.calc.rmax)
         self.assertEqual(0.7, self.calc.rstep)
         return
 

src/diffpy/pdfgui/tests/TestCalculation.py

@@ -33,7 +33,7 @@ def setUp(self):
     def test___init__(self):
         """check Constraint.__init__()
         """
-        self.failUnless(1 in self.c.parguess)
+        self.assertTrue(1 in self.c.parguess)
         self.assertEqual(1, len(self.c.parguess))
         c1 = Constraint('2*@2 + 3.0', 13.0)
         self.assertEqual(1, len(c1.parguess))

src/diffpy/pdfgui/tests/TestConstraint.py

@@ -200,7 +200,7 @@ def test__resampledPDFDataSet(self):
         # reduce fitrmax to one half
         fds.fitrmax = fds.rmax / 2.0
         npts1 = len(fds.rcalc)
-        self.failUnless(npts1 < npts)
+        self.assertTrue(npts1 < npts)
         rds1 = fds._resampledPDFDataSet()
         self.assertEqual(npts1, len(rds1.robs))
         self.assertEqual(npts1, len(rds1.drobs))

src/diffpy/pdfgui/tests/TestFitDataSet.py

@@ -55,7 +55,7 @@ def test___getattr__(self):
         """check FitStructure.__getattr__()
         """
         stru = self.stru
-        self.failUnless(stru is stru.initial)
+        self.assertTrue(stru is stru.initial)
         self.assertRaises(AttributeError, eval,
                 'stru.notdefined', locals())
         return
@@ -156,9 +156,9 @@ def test_insertAtoms(self):
         stru.insertAtoms(0, [Atom('Na', (0, 0, 0))])
         self.assertEqual(5, len(stru))
         self.assertEqual(1, len(stru.constraints))
-        self.failUnless(cns is stru.constraints['x(3)'])
+        self.assertTrue(cns is stru.constraints['x(3)'])
         stru.insertAtoms(5, [Atom('Cl', (0, 0, 0))])
-        self.failUnless(['x(3)'] == stru.constraints.keys())
+        self.assertTrue(['x(3)'] == stru.constraints.keys())
         return
 
 
@@ -171,10 +171,10 @@ def test_deleteAtoms(self):
         stru.constraints['x(2)'] = cns
         stru.deleteAtoms([3])
         self.assertEqual(['x(2)'], stru.constraints.keys())
-        self.failUnless(cns is stru.constraints.values()[0])
+        self.assertTrue(cns is stru.constraints.values()[0])
         stru.deleteAtoms([0])
         self.assertEqual(['x(1)'], stru.constraints.keys())
-        self.failUnless(cns is stru.constraints.values()[0])
+        self.assertTrue(cns is stru.constraints.values()[0])
         stru.deleteAtoms([0])
         self.assertEqual({}, stru.constraints)
         return