Skip to content
This repository has been archived by the owner on Jan 13, 2024. It is now read-only.

Commit

Permalink
migration to python 3.4 + bug fix for exe modules
Browse files Browse the repository at this point in the history
  • Loading branch information
sdpython committed Mar 18, 2014
1 parent e35f16c commit c916221
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 34 deletions.
1 change: 0 additions & 1 deletion _unittests/run_unittests.py
@@ -1,4 +1,3 @@
# coding: latin-1
"""
@file
@brief run all unit tests
Expand Down
1 change: 0 additions & 1 deletion _unittests/ut_install/test_download.py
@@ -1,4 +1,3 @@
# coding: latin-1
"""
@brief test log(time=20s)
"""
Expand Down
22 changes: 18 additions & 4 deletions build_setup_help_on_windows.bat
@@ -1,19 +1,33 @@
rem we remove everything from dist
echo off
del /Q dist\*.*

rem python 3.3

set pythonexe="c:\python33_x64\python"
%pythonexe% clean_pyd.py
%pythonexe% setup.py build bdist_wininst --plat-name=win-amd64

set pythonexe="c:\python33\python"
%pythonexe% clean_pyd.py
%pythonexe% setup.py sdist --formats=gztar,zip --verbose
%pythonexe% setup.py bdist_wininst

set pythonexe="c:\python33_x64\python"
rem python 3.4

set pythonexe="c:\python34_x64\python"
%pythonexe% clean_pyd.py
%pythonexe% setup.py build bdist_wininst --plat-name=win-amd64

set pythonexe="c:\python33\python"
set pythonexe="c:\python34\python"
%pythonexe% clean_pyd.py
%pythonexe% setup.py sdist --formats=gztar,zip --verbose
%pythonexe% setup.py bdist_wininst

rem help

%pythonexe% make_help.py
if not exist dist\html mkdir dist\html
xcopy /E /C /I /Y _doc\sphinxdoc\build\html dist\html

rem we open a browser with on the generated help
rem dist\html\index.html

2 changes: 1 addition & 1 deletion publish_on_pipy.bat
@@ -1,5 +1,5 @@

set pythonexe="c:\python33\python"
set pythonexe="c:\python34\python"
%pythonexe% setup.py sdist register upload


24 changes: 1 addition & 23 deletions setup.py
@@ -1,6 +1,4 @@
# coding: utf-8

# Copyright (C) 2013 ---------------
# Copyright (C) 2014 ---------------
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -72,26 +70,6 @@
'Development Status :: 5 - Production/Stable'
]

#############################################################
# begin checking
#############################################################

def remove_existing_build_setup() :
if "bdist_wininst" not in sys.argv :
for p in ["dist", "src/dist"] :
if os.path.exists (p) :
for exe in os.listdir (p) :
if ".exe" in exe or ".zip" in exe or ".gz" in exe :
print ("removing ", exe)
os.remove (os.path.join(p, exe))

remove_existing_build_setup()

#############################################################
# end checking
#############################################################


if "bdist_wininst" not in sys.argv :
EXT_MODULES = [
#Extension(project_var_name + '.subproject.sample_module',
Expand Down
6 changes: 2 additions & 4 deletions src/pymyinstall/installhelper/install_cmd.py
Expand Up @@ -229,7 +229,7 @@ def get_exe_url_link(self) :
text = text.replace(""","'")
self.cached_page = text

page = self.cached_page
page = self.cached_page.replace("‑","-")
all = expre.findall(page)
if len(all) == 0 :
raise Exception("unable to find regex with pattern: " + pattern)
Expand Down Expand Up @@ -442,8 +442,6 @@ def complete_installation():
@endcode
"""
return [
ModuleInstall("setuptools", "exe"),
ModuleInstall("pip", "exe"),
ModuleInstall("numpy", "exe"),
ModuleInstall("scipy", "exe"),
ModuleInstall("matplotlib", "exe"),
Expand All @@ -469,7 +467,7 @@ def complete_installation():
ModuleInstall("python-dateutil", "pip", "dateutil"),
ModuleInstall("six", "pip"),
ModuleInstall("networkx", "exe"),
#ModuleInstall("cvxopt", "exe"),
ModuleInstall("cvxopt", "exe"),
ModuleInstall("coverage", "pip"),
ModuleInstall("pyreadline", "pip"),
ModuleInstall("scikit-learn", "exe", mname="sklearn"),
Expand Down

0 comments on commit c916221

Please sign in to comment.