Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-98940: Fix Mac/Extras.install.py File filter bug #98943

Merged
merged 6 commits into from
Nov 16, 2022

Conversation

zhangbo2012
Copy link
Contributor

gh-98940: Fix Mac/Extras.install.py Can not filter osx .DS_store file

Mac/Extras.install.py,Can not filter osx DS_store file

As

if name == '.DS_store': return 0

But in OSX, Real File Name is .DS_Store, like this

(venv) zhangbo@zhangbodeMacBook-Pro a2 % ll -a
total 16
drwxr-xr-x  4 zhangbo  staff   128 Oct 22 17:34 .
drwxr-xr-x  8 zhangbo  staff   256 Oct 22 17:18 ..
-rw-r--r--@ 1 zhangbo  staff  6148 Oct 22 17:17 .DS_Store
drwxr-xr-x  3 zhangbo  staff    96 Oct 22 17:23 123

So we need update .DS_store to .DS_Store

Thanks to @arhadthedev show a more clean code

@zhangbo2012 zhangbo2012 requested a review from a team as a code owner November 1, 2022 02:23
@zhangbo2012 zhangbo2012 changed the title Fix Mac/Extras.install.py File filter bug gh-98940: Fix Mac/Extras.install.py File filter bug Nov 1, 2022
@sobolevn sobolevn requested a review from zooba November 15, 2022 08:38
@zooba
Copy link
Member

zooba commented Nov 15, 2022

Sorry, you need @python/macos-team for this, not me.

@AlexWaygood AlexWaygood removed the request for review from zooba November 15, 2022 20:35
@sobolevn
Copy link
Member

Oh, sorry. You are from Windows team :)
My bad.

Copy link
Contributor

@ronaldoussoren ronaldoussoren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patch looks good to me.

@miss-islington
Copy link
Contributor

Thanks @zhangbo2012 for the PR, and @ronaldoussoren for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-99528 is a backport of this pull request to the 3.11 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 16, 2022
…8943)

Slightly simplify the script and fix a case issue in the name of ``.DS_Store`` files.

(cherry picked from commit ea88d34)

Co-authored-by: zhangbo <zhangbo2012@outlook.com>
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Nov 16, 2022
miss-islington added a commit that referenced this pull request Nov 16, 2022
Slightly simplify the script and fix a case issue in the name of ``.DS_Store`` files.

(cherry picked from commit ea88d34)

Co-authored-by: zhangbo <zhangbo2012@outlook.com>
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-bot
Copy link

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot wasm32-emscripten node (pthreads) 3.x has failed when building commit ea88d34.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/1050/builds/848) and take a look at the build logs.
  4. Check if the failure is related to this commit (ea88d34) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/1050/builds/848

Failed tests:

  • test___all__

Failed subtests:

  • test_all - test.test___all__.AllTest.test_all

Summary of the results of the build (if available):

== Tests result: FAILURE ==

338 tests OK.

10 slowest tests:

  • test_tokenize: 1 min 12 sec
  • test_unparse: 52.3 sec
  • test_io: 40.0 sec
  • test_lib2to3: 38.2 sec
  • test_capi: 34.9 sec
  • test_unicodedata: 20.7 sec
  • test_pickle: 18.9 sec
  • test_statistics: 18.7 sec
  • test_pathlib: 15.7 sec
  • test_zipfile: 15.0 sec

1 test failed:
test___all__

94 tests skipped:
test__xxsubinterpreters test_asyncgen test_asyncio
test_check_c_globals test_clinic test_cmd_line
test_concurrent_futures test_contextlib_async test_ctypes
test_curses test_dbm_gnu test_dbm_ndbm test_devpoll test_doctest
test_docxmlrpc test_dtrace test_embed test_epoll test_faulthandler
test_fcntl test_file_eintr test_fork1 test_ftplib test_gdb
test_grp test_httplib test_httpservers test_idle test_imaplib
test_interpreters test_ioctl test_kqueue test_launcher test_lzma
test_mmap test_msilib test_multiprocessing_fork
test_multiprocessing_forkserver test_multiprocessing_main_handling
test_multiprocessing_spawn test_nis test_openpty test_ossaudiodev
test_pdb test_peg_generator test_perf_profiler test_poll
test_poplib test_pty test_pwd test_readline test_regrtest
test_repl test_resource test_select test_selectors test_smtplib
test_smtpnet test_socket test_socketserver test_spwd test_ssl
test_stable_abi_ctypes test_startfile test_subprocess
test_sys_settrace test_syslog test_tcl test_telnetlib test_tix
test_tkinter test_tools test_ttk test_ttk_textonly test_turtle
test_urllib2 test_urllib2_localnet test_urllib2net test_urllibnet
test_venv test_wait3 test_wait4 test_webbrowser test_winconsoleio
test_winreg test_winsound test_wmi test_wsgiref test_xmlrpc
test_xmlrpc_net test_xxlimited test_zipfile64
test_zipimport_support test_zoneinfo
0:21:33 load avg: 6.59
0:21:33 load avg: 6.59 Re-running failed tests is not supported with --python host runner option.

Total duration: 21 min 33 sec

Click to see traceback logs
Traceback (most recent call last):
  File "/opt/buildbot/bcannon-wasm/3.x.bcannon-wasm.emscripten-node-pthreads/build/Lib/test/test___all__.py", line 129, in test_all
    self.check_all(modname)
  File "/opt/buildbot/bcannon-wasm/3.x.bcannon-wasm.emscripten-node-pthreads/build/Lib/test/test___all__.py", line 43, in check_all
    with warnings_helper.check_warnings(
  File "/opt/buildbot/bcannon-wasm/3.x.bcannon-wasm.emscripten-node-pthreads/build/Lib/contextlib.py", line 144, in __exit__
    next(self.gen)
  File "/opt/buildbot/bcannon-wasm/3.x.bcannon-wasm.emscripten-node-pthreads/build/Lib/test/support/warnings_helper.py", line 185, in _filterwarnings
    raise AssertionError("unhandled warning %s" % reraise[0])
AssertionError: unhandled warning {message : SyntaxWarning("invalid escape sequence '\\('"), category : 'SyntaxWarning', filename : '/opt/buildbot/bcannon-wasm/3.x.bcannon-wasm.emscripten-node-pthreads/build/Lib/test/test_enum.py', lineno : 1481, line : None}

@sobolevn
Copy link
Member

I've fixed this __all__ bug here: #99519

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.

6 participants