File tree 6 files changed +8
-8
lines changed
6 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 1
- name : Windows-MacOS
1
+ name : Windows-macOS
2
2
3
3
on :
4
4
push :
Original file line number Diff line number Diff line change @@ -538,7 +538,7 @@ def determine_clipboard():
538
538
if which ("wslconfig.exe" ):
539
539
return init_wsl_clipboard ()
540
540
541
- # Setup for the MAC OS X platform:
541
+ # Setup for the macOS platform:
542
542
if os .name == "mac" or platform .system () == "Darwin" :
543
543
try :
544
544
import AppKit
@@ -587,7 +587,7 @@ def set_clipboard(clipboard):
587
587
the copy() and paste() functions interact with the operating system to
588
588
implement the copy/paste feature. The clipboard parameter must be one of:
589
589
- pbcopy
590
- - pyobjc (default on Mac OS X )
590
+ - pyobjc (default on macOS )
591
591
- qt
592
592
- xclip
593
593
- xsel
Original file line number Diff line number Diff line change @@ -69,14 +69,14 @@ def s3_base(worker_id):
69
69
os .environ .setdefault ("AWS_SECRET_ACCESS_KEY" , "foobar_secret" )
70
70
if is_ci_environment ():
71
71
if is_platform_arm () or is_platform_mac () or is_platform_windows ():
72
- # NOT RUN on Windows/MacOS /ARM, only Ubuntu
72
+ # NOT RUN on Windows/macOS /ARM, only Ubuntu
73
73
# - subprocess in CI can cause timeouts
74
74
# - Github Actions do not support
75
75
# container services for the above OSs
76
76
# - CircleCI will probably hit the Docker rate pull limit
77
77
pytest .skip (
78
78
"S3 tests do not have a corresponding service in "
79
- "Windows, MacOS or ARM platforms"
79
+ "Windows, macOS or ARM platforms"
80
80
)
81
81
else :
82
82
yield "http://localhost:5000"
Original file line number Diff line number Diff line change 22
22
is_ci_environment () and (is_platform_windows () or is_platform_mac ()),
23
23
reason = "On GHA CI, Windows can fail with "
24
24
"'Windows fatal exception: stack overflow' "
25
- "and MacOS can timeout" ,
25
+ "and macOS can timeout" ,
26
26
)
27
27
28
28
Original file line number Diff line number Diff line change 19
19
is_ci_environment () and (is_platform_windows () or is_platform_mac ()),
20
20
reason = "On GHA CI, Windows can fail with "
21
21
"'Windows fatal exception: stack overflow' "
22
- "and MacOS can timeout" ,
22
+ "and macOS can timeout" ,
23
23
)
24
24
25
25
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ the [advanced installation page]({{ base_url}}/docs/getting_started/install.html
29
29
Detailed instructions on how to install Anaconda can be found in the
30
30
[ Anaconda documentation] ( https://docs.anaconda.com/anaconda/install/ ) .
31
31
32
- 2 . In the Anaconda prompt (or terminal in Linux or MacOS ), start JupyterLab:
32
+ 2 . In the Anaconda prompt (or terminal in Linux or macOS ), start JupyterLab:
33
33
34
34
<img class =" img-fluid " alt =" " src =" {{ base_url }}/static/img/install/anaconda_prompt.png " />
35
35
You can’t perform that action at this time.
0 commit comments