Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a5ead95
Add python 'language_name' for extension support
JonathanZhu11 Sep 24, 2020
03ec2b8
add language name to more front end parts
JonathanZhu11 Sep 24, 2020
4d6bfc7
more extensions work
JonathanZhu11 Sep 24, 2020
cc268d1
cleanup
JonathanZhu11 Sep 24, 2020
697a79b
Add Language Extension support for python
JonathanZhu11 Oct 1, 2020
1eb233a
language name to R
JonathanZhu11 Oct 2, 2020
e176fc1
fix tests
JonathanZhu11 Oct 2, 2020
3eb2dc9
test fixes
JonathanZhu11 Oct 2, 2020
e59bb4d
more test fixes
JonathanZhu11 Oct 2, 2020
ab7eb6d
fix R
JonathanZhu11 Oct 5, 2020
548d83b
fix helper
JonathanZhu11 Oct 5, 2020
7156eff
split a longer test in half to speed up?
JonathanZhu11 Oct 5, 2020
56f78b4
remove extra dependencies test
JonathanZhu11 Oct 6, 2020
ea0eb11
slow test, needs to be replaced
JonathanZhu11 Oct 6, 2020
428704f
reduce number of tests for speed
JonathanZhu11 Oct 6, 2020
c99f838
address comments and remove some places that had default language name
JonathanZhu11 Oct 8, 2020
034c961
update R to v1.0.0
JonathanZhu11 Oct 8, 2020
a564e14
revert
JonathanZhu11 Oct 9, 2020
569c8a5
remove default value from init
JonathanZhu11 Oct 9, 2020
1f3e8ac
syntax issue
JonathanZhu11 Oct 9, 2020
a8dcd17
fix test
JonathanZhu11 Oct 9, 2020
98a6aba
update requirements with wheel max version
JonathanZhu11 Oct 12, 2020
46de05d
typo
JonathanZhu11 Oct 12, 2020
6e8619a
fix wheel import and wheel max version
JonathanZhu11 Oct 12, 2020
bd3f60e
edit archive
JonathanZhu11 Oct 12, 2020
78984f2
use sysconfig
JonathanZhu11 Oct 12, 2020
10b6855
update zip
JonathanZhu11 Oct 13, 2020
044ebb8
merge
JonathanZhu11 Oct 13, 2020
011340d
Add links for dist
JonathanZhu11 Oct 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix wheel import and wheel max version
  • Loading branch information
JonathanZhu11 committed Oct 12, 2020
commit 6e8619a6c6558f0b3bd1ae6282b86a22c6c9ba5b
Binary file modified Python/dist/sqlmlutils-1.1.0.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion Python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ dill>=0.2.6
pkginfo>=1.4.2
requirements-parser>=0.2.0
pandas>=0.19.2
wheel>=0.32.3,<0.35
wheel>=0.32.3,<0.35.0
2 changes: 1 addition & 1 deletion Python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'pkginfo',
'requirements-parser',
'pandas',
'wheel'
'wheel<0.35.0'
],
python_requires='>=3.5'
)
14 changes: 9 additions & 5 deletions Python/sqlmlutils/packagemanagement/servermethods.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ def show_installed_packages():
def get_server_info():
from distutils.version import LooseVersion
import pip
if LooseVersion(pip.__version__) > LooseVersion("10"):
pipversion = LooseVersion(pip.__version__)

if pipversion >= LooseVersion("19.3"):
from wheel import pep425tags
elif pipversion > LooseVersion("10"):
from pip._internal import pep425tags
else:
from pip import pep425tags
return {
"impl_version_info": pep425tags.get_impl_version_info(), #(3,7)
"abbr_impl": pep425tags.get_abbr_impl(), #'cp'
"abi_tag": pep425tags.get_abi_tag(), #'cp37m'
"platform": pep425tags.get_platform() #'win_amd64', 'linux_x86_64'
"impl_version_info": pep425tags.get_impl_version_info(),
"abbr_impl": pep425tags.get_abbr_impl(),
"abi_tag": pep425tags.get_abi_tag(),
"platform": pep425tags.get_platform("")
}