FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-29585: Define PYTHONFRAMEWORK in PC/pyconfig.h by vstinner · Pull Request #2477 · python/cpython · GitHub

Repository navigation

bpo-29585: Define PYTHONFRAMEWORK in PC/pyconfig.h - #2477

Merged
vstinner merged 3 commits into
python:masterfrom
vstinner:win
Jun 28, 2017
Merged

vstinner merged 3 commits into
python:masterfrom
vstinner:win

Conversation

Copy link
Copy Markdown
Member

Fix also PC/pyconfig.h whitespaces: run "make patchcheck".

Copy link
Copy Markdown
Member Author

Crap. Tests fail on Windows:

======================================================================
FAIL: test_get_path (test.test_site.HelperFunctionsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\projects\cpython\lib\test\test_site.py", line 188, in test_get_path
    sysconfig.get_path('purelib', os.name + '_user'))
AssertionError: 'C:\\Users\\appveyor\\AppData\\Roaming\\Python/Python37/site-packages' != 'C:\\Users\\appveyor\\AppData\\Roaming\\Python\\Python37\\site-packages'
- C:\Users\appveyor\AppData\Roaming\Python/Python37/site-packages
?                                         ^        ^
+ C:\Users\appveyor\AppData\Roaming\Python\Python37\site-packages
?                                         ^        ^
======================================================================
FAIL: test_s_option (test.test_site.HelperFunctionsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\projects\cpython\lib\test\test_site.py", line 195, in test_s_option
    self.assertIn(usersite, sys.path)
AssertionError: 'C:\\Users\\appveyor\\AppData\\Roaming\\Python/Python37/site-packages' not found in ['', 'C:\\projects\\cpython\\PCbuild\\win32\\python37.zip', 'C:\\projects\\cpython\\DLLs', 'C:\\projects\\cpython\\lib', 'C:\\projects\\cpython\\PCbuild\\win32', 'C:\\projects\\cpython', 'C:\\projects\\cpython\\lib\\site-packages']

Copy link
Copy Markdown
Member Author

This PR fixes a regression of the PR #136.

vstinner merged commit b01c574 into python:master Jun 28, 2017
vstinner deleted the win branch June 28, 2017 16:34

methane commented Jun 28, 2017

Copy link
Copy Markdown
Member

thanks

Copy link
Copy Markdown
Member Author

thanks

You're welcome. I hesitated to just revert your PR to get more time to fix it, but at the end, I found a way to repair the Windows buildbots, so it's fine.

Hey, don't forget our macOS buildbots which are also broken!

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants


Back | FazBrowse Home | New Git URL