Update requirements, and a few minor fixes

buildRPNInstaller.bat

@@ -2,8 +2,6 @@ rem TCC script for building the RPN installer
 
 setlocal
 
-if not exist installer_dist mkdir installer_dist
-
 if exist version.txt rm version.txt
 
 echos VERSION= > version.txt

requirements.txt

@@ -1,19 +1,19 @@
-convertdate>=2.3.2
-python-dateutil>=2.8.2
-ephem>=4.1.4
+convertdate>=2.4.0
+python-dateutil>=2.9.0
+ephem>=4.1.5
 ethiopian-date-converter>=0.1.5
-geopy>=2.3.0
+geopy>=2.4.1
 gmpy2>=2.1.5
 hyperop>=1.1
-importlib_resources>=6.0.1
+importlib_resources>=6.3.1
 joblib>=1.3.2
 mpmath>=1.3.0
-numpy>=1.23.5
-pendulum>=2.1.2
-pyreadline3
+numpy>=1.26.4
+pendulum>=3.0.0
+pyreadline3>=3.4.1
 rpnChiladaData>=1.1.0
-setuptools>=65.5.1
-skyfield>=1.42
-timezonefinder>=6.2.0
-tzlocal>=4.2
-wheel>=0.41.2
+setuptools>=69.2.0
+skyfield>=1.48
+timezonefinder>=6.5.0
+tzlocal>=5.2
+wheel>=0.43.0

rpn/makeHelp.py

@@ -17312,7 +17312,7 @@ def makeHelp( ):
 #******************************************************************************
 
 def main( ):
-    unitsFile = Path( getUserDataPath( ) + os.sep + 'units.pckl.bz2' )
+    unitsFile = Path( getDataPath( ) + os.sep + 'units.pckl.bz2' )
 
     if not unitsFile.is_file( ):
         print( 'Please run "rpnMakeUnits" (or makeUnits.py) to initialize the unit conversion data files.' )

rpn/rpnVersion.py

@@ -21,7 +21,7 @@
 PROGRAM_NAME = 'rpnChilada'
 PROGRAM_VERSION = '8.999.9991'
 PROGRAM_VERSION_NAME = '9.0.beta1'
-COPYRIGHT_MESSAGE = 'copyright (c) 2023 (1988), Rick Gutleber ([email protected])'
+COPYRIGHT_MESSAGE = 'copyright (c) 2024 (1988), Rick Gutleber ([email protected])'
 
 if PROGRAM_VERSION != PROGRAM_VERSION_NAME:
     PROGRAM_VERSION_STRING = ' ' + PROGRAM_VERSION + ' (' + PROGRAM_VERSION_NAME + ')'

rpn/util/rpnUtils.py

@@ -80,7 +80,9 @@ def getDataPath( ):
 @lru_cache( 1 )
 def getUserDataPath( ):
     '''Returns the path for the cache files.'''
-    if sys.platform in ( 'win32', 'darwin', 'linux', 'freebsd' ):
+    if getattr( sys, 'frozen', False ):
+        userDataPath = os.path.expanduser( '~' ) + os.sep + '.' + g.dataDir
+    elif sys.platform in ( 'win32', 'darwin', 'linux', 'freebsd' ):
         userDataPath = getDataPath( )
     else:
         userDataPath = os.path.expanduser( '~' ) + os.sep + '.' + g.dataDir