Attempting to find the data files on Mac

ConceptJunkie · Jun 3, 2020 · fdec4b1 · fdec4b1
1 parent 737ad36
commit fdec4b1
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 28 deletions.
diff --git a/rpn/makeHelp.py b/rpn/makeHelp.py
@@ -12235,7 +12235,7 @@ def main( ):
     unitsFile = Path( getUserDataPath( ) + os.sep + 'units.pckl.bz2' )
 
     if not unitsFile.is_file( ):
-        print( 'Please run "makeUnits" to initialize the unit conversion data files.' )
+        print( 'Please run "rpnMakeUnits" (or makeUnits.py) to initialize the unit conversion data files.' )
         sys.exit( 0 )
 
     from rpn.rpnConstantOperators import constantOperators

diff --git a/rpn/rpn.py b/rpn/rpn.py
@@ -654,7 +654,7 @@ def main( ):
     os.chdir( getUserDataPath( ) )     # SkyField doesn't like running in the root directory
 
     if not unitsFile.is_file( ):
-        print( 'Please run "makeUnits" to initialize the unit conversion data files.' )
+        print( 'Please run "rpnMakeUnits" (or makeUnits.py) to initialize the unit conversion data files.' )
         sys.exit( 0 )
 
     helpFile = Path( getUserDataPath( ) + os.sep + 'help.pckl.bz2' )

diff --git a/rpn/rpnNumberTheory.py b/rpn/rpnNumberTheory.py
@@ -958,11 +958,11 @@ def makeEulerBrick( _a, _b, _c ):
     return sorted( result )
 
 
-# //******************************************************************************
-# //
-# //  getNthFibonorial
-# //
-# //******************************************************************************
+#******************************************************************************
+#
+#  getNthFibonorial
+#
+#******************************************************************************
 
 @oneArgFunctionEvaluator( )
 def getNthFibonorial( n ):
@@ -974,13 +974,13 @@ def getNthFibonorial( n ):
     return result
 
 
-# //******************************************************************************
-# //
-# //  getExtendedGCD
-# //
-# //  adapted from http://ccgi.gladman.plus.com/wp/?page_id=1500
-# //
-# //******************************************************************************
+#******************************************************************************
+#
+#  getExtendedGCD
+#
+#  adapted from http://ccgi.gladman.plus.com/wp/?page_id=1500
+#
+#******************************************************************************
 
 @twoArgFunctionEvaluator( )
 def getExtendedGCD( a, b ):
@@ -1003,11 +1003,11 @@ def getExtendedGCD( a, b ):
     return ( u, v, a ) if a > 0 else ( -u, -v, -a )
 
 
-# //******************************************************************************
-# //
-# //  getLCM
-# //
-# //******************************************************************************
+#******************************************************************************
+#
+#  getLCM
+#
+#******************************************************************************
 
 def getLCMOfList( args ):
     if isinstance( args[ 0 ], ( list, RPNGenerator ) ):

diff --git a/rpn/rpnUtils.py b/rpn/rpnUtils.py
@@ -76,7 +76,7 @@ def getDataPath( ):
 @lru_cache( 1 )
 def getUserDataPath( ):
     '''Returns the path for the cache files.'''
-    if os.name == 'nt':
+    if sys.platform in ( 'win32', 'darwin' ):
         userDataPath = getDataPath( )
     else:
         userDataPath = os.path.expanduser( '~' ) + os.sep + '.' + g.dataDir

diff --git a/rpn/rpnVersion.py b/rpn/rpnVersion.py
@@ -19,8 +19,8 @@
 # //******************************************************************************
 
 PROGRAM_NAME = 'rpnChilada'
-PROGRAM_VERSION = '8.3.0'
-PROGRAM_VERSION_NAME = '8.3.0'
+PROGRAM_VERSION = '8.3.1'
+PROGRAM_VERSION_NAME = '8.3.1'
 COPYRIGHT_MESSAGE = 'copyright (c) 2020 (1988), Rick Gutleber ([email protected])'
 
 if PROGRAM_VERSION != PROGRAM_VERSION_NAME:

diff --git a/rpn/testRPN.py b/rpn/testRPN.py
@@ -5459,7 +5459,7 @@ def main( ):
     unitsFile = Path( getUserDataPath( ) + os.sep + 'units.pckl.bz2' )
 
     if not unitsFile.is_file( ):
-        print( 'Please run "makeUnits" to initialize the unit conversion data files.' )
+        print( 'Please run "rpnMakeUnits" (or makeUnits.py) to initialize the unit conversion data files.' )
         sys.exit( 0 )
 
     helpFile = Path( getUserDataPath( ) + os.sep + 'help.pckl.bz2' )

diff --git a/setup.py b/setup.py
@@ -31,7 +31,6 @@ def read( *paths ):
 setup(
     name = 'rpnChilada',
     version = PROGRAM_VERSION_NAME,
-    #description = 'command-line RPN calculator with arbitrary precision',
     description = 'command-line RPN calculator',
     long_description =
 '''
@@ -50,7 +49,7 @@ def read( *paths ):
 800 unique operators.  rpnChilada supports lists, but not matrices.
 
 rpnChilada comes with integrated help, which isn't complete, but has at
-least a basic description of every operator, and over 1300 built-in
+least a basic description of every operator, and over 1500 built-in
 examples.  Help now includes descriptions for constants and units as well,
 although a lot of these still need to be filled in.
 
@@ -116,9 +115,9 @@ def read( *paths ):
         'console_scripts': [
             'rpn = rpn.rpn:main',
             'rpnChilada = rpn.rpn:main',
-            #'makeRPNHelp = rpn.makeHelp:main',
-            #'makeRPNUnits = rpn.makeUnits:main',
-            #'prepareRPNPrimeData = rpn.preparePrimeData:main',
+            'rpnMakeHelp = rpn.makeHelp:main',
+            'rpnMakeUnits = rpn.makeUnits:main',
+            #'rpnPreparePrimeData = rpn.preparePrimeData:main',
             'testRPN = rpn.testRPN:main',
         ],
     }