Skip to content

Commit d1c353e

Browse files
authored
Merge pull request #18 from xoviat/setup
Cleanup "setup" script.
2 parents acf2ba3 + 9913a7a commit d1c353e

23 files changed

+187
-744
lines changed

appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ install:
7979
) ELSE (
8080
%CMD_IN_ENV% pip install -U --disable-pip-version-check --timeout 5 --retries 2 -r tests/requirements-win.txt )"
8181

82-
- "%CMD_IN_ENV% pip install -v -v -v ."
82+
- "%CMD_IN_ENV% python setup.py build"
83+
- "%CMD_IN_ENV% pip install ."
8384

8485
build: none
8586

@@ -89,4 +90,5 @@ test_script:
8990
- "if not \"%APPVEYOR_SCHEDULED_BUILD%\" == \"True\" (%CMD_IN_ENV% %TEST1_CMD% )"
9091

9192
on_finish:
93+
# - "python .\\tests\\scripts\\list_sitepackages.py"
9294
- ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\junit-results.xml))
File renamed without changes.

com/win32comext/shell/src/shell.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ generates Windows .hlp files.
4646
#include "PyIPersistFolder.h"
4747
#include "PyIColumnProvider.h"
4848
#include "PyIDropTargetHelper.h"
49-
#include "PyIAsyncOperation.h"
49+
//#include "PyIAsyncOperation.h"
5050
#include "PyIQueryAssociations.h"
5151
#include "PyIDockingWindow.h"
5252
#include "PyIDeskBand.h"
@@ -3551,7 +3551,7 @@ static struct PyMethodDef shell_methods[]=
35513551
{ "SHCreateItemInKnownFolder", PySHCreateItemInKnownFolder, 1}, // @pymeth SHCreateItemInKnownFolder|Creates a Shell item object for a single file that exists inside a known folder.
35523552
{ "SHCreateItemWithParent", PySHCreateItemWithParent, 1}, // @pymeth SHCreateItemWithParent|Create a Shell item, given a parent folder and a child item ID.
35533553
{ "SHGetIDListFromObject", PySHGetIDListFromObject, 1}, // @pymeth SHGetIDListFromObject|Retrieves the PIDL of an object.
3554-
{ "SHGetInstanceExplorer", PySHGetInstanceExplorer, 1}, // @pymeth SHGetInstanceExplorer|Allows components that run in a Web browser (Iexplore.exe) or a nondefault Windows® Explorer (Explorer.exe) process to hold a reference to the process. The components can use the reference to prevent the process from closing prematurely.
3554+
{ "SHGetInstanceExplorer", PySHGetInstanceExplorer, 1}, // @pymeth SHGetInstanceExplorer|Allows components that run in a Web browser (Iexplore.exe) or a nondefault Windows Explorer (Explorer.exe) process to hold a reference to the process. The components can use the reference to prevent the process from closing prematurely.
35553555
{ "SHFileOperation", PySHFileOperation, 1}, // @pymeth SHFileOperation|Copies, moves, renames, or deletes a file system object.
35563556
{ "StringAsCIDA", PyStringAsCIDA, 1}, // @pymeth StringAsCIDA|Given a CIDA as a raw string, return pidl_folder, [pidl_children, ...]
35573557
{ "CIDAAsString", PyCIDAAsString, 1}, // @pymeth CIDAAsString|Given a (pidl, child_pidls) object, return a CIDA as a string
@@ -3580,7 +3580,7 @@ static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
35803580
PYCOM_INTERFACE_IID_ONLY (ShellLinkA),
35813581
PYCOM_INTERFACE_CLSID_ONLY (ShellLink),
35823582
PYCOM_INTERFACE_IID_ONLY (ShellLinkW),
3583-
PYCOM_INTERFACE_FULL(AsyncOperation),
3583+
// PYCOM_INTERFACE_FULL(AsyncOperation),
35843584
PYCOM_INTERFACE_FULL(ContextMenu),
35853585
PYCOM_INTERFACE_SERVER_ONLY(ContextMenu2),
35863586
PYCOM_INTERFACE_SERVER_ONLY(ContextMenu3),

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ timeout_method = thread
88
# Look for tests only in tests directories.
99
# Later we could change this to just "tests/**/test_*.py"
1010
# "tests/win32com/test_*.py"
11-
python_files = "tests/win32/test_*.py" "tests/win32com/test_ROT.py"
11+
python_files = "tests/win32/test_*.py" "tests/win32com/test_*.py"
1212

1313
# Display summary info for (s)skipped, (X)xpassed, (x)xfailed, (f)failed and (e)errored tests
1414
# Skip doctest text files

0 commit comments

Comments
 (0)