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

Commit 6cc6587

Browse files
authored
Ron/remove win64 (#165)
* Removing win64 related processes. * Fixing tox dependency installation command.
1 parent 61a36fd commit 6cc6587

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ def publish_official(platforms_names):
152152
supported_platforms = [
153153
'win32',
154154
'win_amd64',
155-
'win64',
156155
'macosx_10_11_intel',
157156
'manylinux1_x86_64',
158157
'manylinux1_i686']

mssql-scripter.pyproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,10 @@
6666
<Compile Include="mssqlscripter\tests\test_sqltoolsclient.py" />
6767
<Compile Include="mssqlscripter\__init__.py" />
6868
<Compile Include="mssqlscripter\__main__.py" />
69-
<Compile Include="mssqltoolsservice\buildwheels.py" />
70-
<Compile Include="mssqltoolsservice\mssqltoolsservice\__init__.py" />
71-
<Compile Include="mssqltoolsservice\setup.py" />
72-
<Compile Include="register_upload.py" />
69+
<Compile Include="mssqlscripter\mssqltoolsservice\__init__.py" />
70+
<Compile Include="mssqlscripter\mssqltoolsservice\external.py" />
7371
<Compile Include="setup.py" />
7472
<Compile Include="utility.py" />
75-
<Compile Include="verify_packaging.py" />
7673
</ItemGroup>
7774
<ItemGroup>
7875
<Folder Include="doc\" />
@@ -83,8 +80,7 @@
8380
<Folder Include="mssqlscripter\jsonrpc\contracts\tests\scripting_baselines" />
8481
<Folder Include="mssqlscripter\jsonrpc\tests" />
8582
<Folder Include="mssqlscripter\tests" />
86-
<Folder Include="mssqltoolsservice\" />
87-
<Folder Include="mssqltoolsservice\mssqltoolsservice\" />
83+
<Folder Include="mssqlscripter\mssqltoolsservice\" />
8884
</ItemGroup>
8985
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
9086
</Project>

mssqlscripter/mssqltoolsservice/external.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
'manylinux1_x86_64': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz',
2222
'manylinux1_i686': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz',
2323
'macosx_10_11_intel': SQLTOOLSSERVICE_BASE + 'macosx_10_11_intel/' + 'Microsoft.SqlTools.ServiceLayer-osx-x64-netcoreapp2.0.tar.gz',
24-
'win_amd64': SQLTOOLSSERVICE_BASE + 'win64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
25-
'win64': SQLTOOLSSERVICE_BASE + 'win64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
24+
'win_amd64': SQLTOOLSSERVICE_BASE + 'winamd64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
2625
'win32': SQLTOOLSSERVICE_BASE + 'win32/' + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip'
2726
}
2827

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

4544
copy_file_path = SUPPORTED_PLATFORMS[platform]

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ setenv =
1313
PYTHONIOENCODING=utf-8
1414

1515
deps=
16-
-r dev_requirements.txt
16+
-rdev_requirements.txt
1717

1818
install_commands =
1919
commands=

0 commit comments

Comments
 (0)