@@ -172,7 +172,7 @@ def setupCalculator():
172
172
else :
173
173
subprocess .call (["xdg-open" , '"' + os .path .join (FUNZ_HOME ,"calculator.xml" )+ '"' ])
174
174
175
- import tempfile #, pkg_resources
175
+ import tempfile , importlib , importlib . metadata
176
176
def install_githubModel (model ,force = False , edit_script = False ):
177
177
""" Install Funz model plugin from central GitHub repository.
178
178
@param model model to install.
@@ -184,7 +184,7 @@ def install_githubModel(model,force=False, edit_script=False):
184
184
install_githubModel('Modelica')
185
185
}
186
186
"""
187
- major = re .sub (".post(.*)" ,"" ,Funz . __version__ ) #pkg_resources.get_distribution(" Funz").version )
187
+ major = re .sub (".post(.*)" ,"" ,importlib . metadata . version ( ' Funz' ) )
188
188
model_zip = os .path .join (tempfile .gettempdir (),"plugin-" + model + ".zip" )
189
189
for minor in range (11 )[::- 1 ]:
190
190
print ("." , end = '' )
@@ -285,7 +285,7 @@ def install_fileDesign(design_zip, force=False):
285
285
else :
286
286
print ("Installed Funz design " + design )
287
287
288
- import tempfile #, pkg_resources
288
+ import tempfile , importlib , importlib . metadata
289
289
def install_githubDesign (design ,force = False ):
290
290
""" Install Funz design plugin from central GitHub repository.
291
291
@param design design to install.
@@ -296,8 +296,7 @@ def install_githubDesign(design,force=False):
296
296
install_githubDesign('GradientDescent')
297
297
}
298
298
"""
299
- major = re .sub (".post(.*)" ,"" ,Funz .__version__ )
300
- #pkg_resources.get_distribution("Funz").version)
299
+ major = re .sub (".post(.*)" ,"" ,importlib .metadata .version ('Funz' ))
301
300
design_zip = os .path .join (tempfile .gettempdir (),"algorithm-" + design + ".zip" )
302
301
for minor in range (11 )[::- 1 ]:
303
302
print ("." , end = '' )
0 commit comments