Skip to content

Commit

Permalink
still use 3.5 on windows, but 3.6 on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesabel committed Mar 13, 2017
1 parent 4170bf7 commit 2e4a7f7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
9 changes: 8 additions & 1 deletion osnap/const.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@

import platform

package_name = 'osnap'

# this is the same as the launcher uses
python_folder = 'osnapy'

default_python_version = '3.6.0'
if platform.system().lower()[0] == 'w':
# on windows, we can't install pip yet on 3.6 in the embedded Python
default_python_version = '3.5.3'
else:
default_python_version = '3.6.0'


main_program_py = 'main.py'

Expand Down
1 change: 1 addition & 0 deletions osnap/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

LOGGER = logging.getLogger(__name__)


def is_windows():
return platform.system().lower()[0] == 'w'

Expand Down
9 changes: 8 additions & 1 deletion test_example/test_example/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@

import platform

# PEP 440 compliant
__version__ = '0.0.dev0'

# required for OSNAP
__author__ = 'test_author'
__application_name__ = 'test_example'
__python_version__ = '3.5.2'

if platform.system().lower()[0] == 'w':
# on windows, we can't install pip yet on 3.6 in the embedded Python
__python_version__ = '3.5.3'
else:
__python_version__ = '3.6.0'

0 comments on commit 2e4a7f7

Please sign in to comment.