Skip to content
This repository was archived by the owner on May 7, 2024. It is now read-only.

Ron/remove win64 #165

Merged
merged 2 commits into from
Nov 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ def publish_official(platforms_names):
supported_platforms = [
'win32',
'win_amd64',
'win64',
'macosx_10_11_intel',
'manylinux1_x86_64',
'manylinux1_i686']
Expand Down
10 changes: 3 additions & 7 deletions mssql-scripter.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,10 @@
<Compile Include="mssqlscripter\tests\test_sqltoolsclient.py" />
<Compile Include="mssqlscripter\__init__.py" />
<Compile Include="mssqlscripter\__main__.py" />
<Compile Include="mssqltoolsservice\buildwheels.py" />
<Compile Include="mssqltoolsservice\mssqltoolsservice\__init__.py" />
<Compile Include="mssqltoolsservice\setup.py" />
<Compile Include="register_upload.py" />
<Compile Include="mssqlscripter\mssqltoolsservice\__init__.py" />
<Compile Include="mssqlscripter\mssqltoolsservice\external.py" />
<Compile Include="setup.py" />
<Compile Include="utility.py" />
<Compile Include="verify_packaging.py" />
</ItemGroup>
<ItemGroup>
<Folder Include="doc\" />
Expand All @@ -83,8 +80,7 @@
<Folder Include="mssqlscripter\jsonrpc\contracts\tests\scripting_baselines" />
<Folder Include="mssqlscripter\jsonrpc\tests" />
<Folder Include="mssqlscripter\tests" />
<Folder Include="mssqltoolsservice\" />
<Folder Include="mssqltoolsservice\mssqltoolsservice\" />
<Folder Include="mssqlscripter\mssqltoolsservice\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
</Project>
5 changes: 2 additions & 3 deletions mssqlscripter/mssqltoolsservice/external.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
'manylinux1_x86_64': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz',
'manylinux1_i686': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz',
'macosx_10_11_intel': SQLTOOLSSERVICE_BASE + 'macosx_10_11_intel/' + 'Microsoft.SqlTools.ServiceLayer-osx-x64-netcoreapp2.0.tar.gz',
'win_amd64': SQLTOOLSSERVICE_BASE + 'win64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
'win64': SQLTOOLSSERVICE_BASE + 'win64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
'win_amd64': SQLTOOLSSERVICE_BASE + 'winamd64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
'win32': SQLTOOLSSERVICE_BASE + 'win32/' + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip'
}

Expand All @@ -39,7 +38,7 @@ def copy_sqltoolsservice(platform):
if not platform or platform not in SUPPORTED_PLATFORMS:
print('{} is not supported.'.format(platform))
print('Please provide a valid platform flag.' +
'[win32, win_amd64, win64, manylinux1_x86_64, manylinux1_i686, macosx_10_11_intel]')
'[win32, win_amd64, manylinux1_x86_64, manylinux1_i686, macosx_10_11_intel]')
sys.exit(1)

copy_file_path = SUPPORTED_PLATFORMS[platform]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ setenv =
PYTHONIOENCODING=utf-8

deps=
-r dev_requirements.txt
-rdev_requirements.txt

install_commands =
commands=
Expand Down