Skip to content

Commit

Permalink
builds and runs under Python3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
cmigliorini committed Jul 14, 2020
1 parent eba4842 commit d441f30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ def apply_folder_join(item):
return os.path.join(BIN_FOLDER, item)


if os.name is 'nt':
if os.name == 'nt':
bin_scripts = ['symoro-bin.py']
else:
bin_scripts = ['symoro-bin']
bin_scripts = map(apply_folder_join, bin_scripts)

bin_scripts = [apply_folder_join(x) for x in bin_scripts]

setup(
name='symoro',
Expand All @@ -34,9 +33,9 @@ def apply_folder_join(item):
scripts=bin_scripts,
packages=find_packages(exclude=['*.tests', '*.tests.*', 'tests.*', 'tests']),
install_requires=[
'sympy==0.7.3',
'sympy>=0.7.3',
'numpy>=1.6.1',
'wxPython>=2.8.11',
'wxPython==4.0.7',
'PyOpenGL>=3.0.1b2'
],
dependency_links=[
Expand Down
4 changes: 2 additions & 2 deletions symoroui/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ def params_in_grid(self, szr_grd, elements, rows, cols, width=70):
place = elements[key].place
handler = getattr(self, elements[key].handler)
field_id = int(elements[key].id)
if control is 'cmb':
if control == 'cmb':
ctrl = wx.ComboBox(
parent=self.panel, style=wx.CB_READONLY,
size=(width, -1), name=name
)
ctrl.Bind(wx.EVT_COMBOBOX, handler)
elif control is 'lbl':
elif control == 'lbl':
ctrl = wx.StaticText(
parent=self.panel, size=(width, -1), name=name
)
Expand Down
2 changes: 1 addition & 1 deletion symoroutils/configfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def get_prog_config_path():
A string specifying the path to store SYMORO settings.
"""
prog_name = 'symoro'
if os.name is 'nt':
if os.name == 'nt':
return os.path.join(os.environ['APPDATA'], prog_name)
else:
return os.path.join(os.environ['HOME'], '.config', prog_name)
Expand Down

0 comments on commit d441f30

Please sign in to comment.