Skip to content

Commit 6936f64

Browse files
authored
Updates the py api doc build (#14173)
* Added requirements.txt to doc build environment For the API documentation as sphinx autogenerates the api docs from the code it needs the dependent Python packages. This change adds those to the tox docs build environment. * Updated Sphinx version within docs/requirements.txt Bring Sphinx version up to the latest Python 3.8 suported version, v7.1.2. This change was made within py/docs/requirements.txt. It should be noted that there is a seperate version requirement given within py/tox.ini which I need to test and see which one is grabed using the selenium build process. (I supsect it will be the one within py/tox.ini.) * Added step in api doc build to regenerate the autodoc stub pages Instead of using the commited stub files which contain "pre-compiled" outlines for the api doc this will regenrate them. It should be noted this might add some time to the build process so a future change might be to see how store and update either commited files or previous build artifacts. I also and working though the output directory which is currently set to `-o docs/source`. This seem to dump all the sub files into the main source directory insted of neatly organied into child directories. Going to try to reowrk this but wanted to commit so as not to lose how I did this the first time ;) * wip adding new files in api.rst Credit goes to @iampopovich for these changes * wip alphabetical order in api.rst Credit goes to @iampopovich for these changes * Removed previous generated api doc stub files Prefer instead to auto-generate these as part of the build. Also ignore those sub-directories. * Updated the tox api doc build steps - Use the docs/requirements.txt file instead of repeating the build versions for jinja and sphinx - Removed the output directory option on sphinx-autogen as that was putting everything in a flat directory structure at the root instead of the well organized folders
1 parent aba09e4 commit 6936f64

File tree

75 files changed

+47
-2205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+47
-2205
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ py/selenium/webdriver/remote/findElements.js
7474
py/selenium/webdriver/remote/getAttribute.js
7575
py/selenium/webdriver/remote/isDisplayed.js
7676
py/docs/build/
77+
py/docs/source/**/*
7778
py/build/
7879
py/LICENSE
7980
py/pytestdebug.log

py/docs/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Jinja2==3.1.4
2-
Sphinx==1.8.2
2+
Sphinx==7.1.2

py/docs/source/api.rst

+36-14
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,32 @@ Webdriver.common
2424
selenium.webdriver.common.alert
2525
selenium.webdriver.common.by
2626
selenium.webdriver.common.desired_capabilities
27+
selenium.webdriver.common.driver_finder
2728
selenium.webdriver.common.keys
2829
selenium.webdriver.common.log
30+
selenium.webdriver.common.options
2931
selenium.webdriver.common.print_page_options
3032
selenium.webdriver.common.proxy
31-
selenium.webdriver.common.utils
33+
selenium.webdriver.common.selenium_manager
3234
selenium.webdriver.common.service
33-
selenium.webdriver.common.options
3435
selenium.webdriver.common.timeouts
36+
selenium.webdriver.common.utils
37+
selenium.webdriver.common.virtual_authenticator
3538
selenium.webdriver.common.window
3639
selenium.webdriver.common.actions.action_builder
3740
selenium.webdriver.common.actions.input_device
3841
selenium.webdriver.common.actions.interaction
3942
selenium.webdriver.common.actions.key_actions
4043
selenium.webdriver.common.actions.key_input
4144
selenium.webdriver.common.actions.mouse_button
42-
selenium.webdriver.common.actions.pointer_input
4345
selenium.webdriver.common.actions.pointer_actions
44-
selenium.webdriver.common.actions.wheel_input
46+
selenium.webdriver.common.actions.pointer_input
4547
selenium.webdriver.common.actions.wheel_actions
46-
selenium.webdriver.common.virtual_authenticator
48+
selenium.webdriver.common.actions.wheel_input
49+
selenium.webdriver.common.bidi.cdp
50+
selenium.webdriver.common.bidi.console
51+
selenium.webdriver.common.bidi.script
52+
selenium.webdriver.common.bidi.session
4753

4854
Webdriver.support
4955
-----------------
@@ -55,9 +61,11 @@ Webdriver.support
5561
selenium.webdriver.support.abstract_event_listener
5662
selenium.webdriver.support.color
5763
selenium.webdriver.support.event_firing_webdriver
64+
selenium.webdriver.support.events
5865
selenium.webdriver.support.expected_conditions
5966
selenium.webdriver.support.relative_locator
6067
selenium.webdriver.support.select
68+
selenium.webdriver.support.ui
6169
selenium.webdriver.support.wait
6270

6371
Webdriver.chrome
@@ -68,6 +76,7 @@ Webdriver.chrome
6876
:toctree: webdriver_chrome
6977

7078
selenium.webdriver.chrome.options
79+
selenium.webdriver.chrome.remote_connection
7180
selenium.webdriver.chrome.service
7281
selenium.webdriver.chrome.webdriver
7382

@@ -79,8 +88,8 @@ Webdriver.chromium
7988
:toctree: webdriver_chromium
8089

8190
selenium.webdriver.chromium.options
82-
selenium.webdriver.chromium.service
8391
selenium.webdriver.chromium.remote_connection
92+
selenium.webdriver.chromium.service
8493
selenium.webdriver.chromium.webdriver
8594

8695
Webdriver.edge
@@ -91,6 +100,7 @@ Webdriver.edge
91100
:toctree: webdriver_edge
92101

93102
selenium.webdriver.edge.options
103+
selenium.webdriver.edge.remote_connection
94104
selenium.webdriver.edge.service
95105
selenium.webdriver.edge.webdriver
96106

@@ -101,13 +111,12 @@ Webdriver.firefox
101111
.. autosummary::
102112
:toctree: webdriver_firefox
103113

104-
selenium.webdriver.firefox.extension_connection
105-
selenium.webdriver.firefox.remote_connection
106114
selenium.webdriver.firefox.firefox_binary
107-
selenium.webdriver.firefox.options
108115
selenium.webdriver.firefox.firefox_profile
109-
selenium.webdriver.firefox.webdriver
116+
selenium.webdriver.firefox.options
117+
selenium.webdriver.firefox.remote_connection
110118
selenium.webdriver.firefox.service
119+
selenium.webdriver.firefox.webdriver
111120

112121
Webdriver.ie
113122
------------
@@ -127,18 +136,19 @@ Webdriver.remote
127136
.. autosummary::
128137
:toctree: webdriver_remote
129138

130-
selenium.webdriver.remote.command
131139
selenium.webdriver.remote.bidi_connection
140+
selenium.webdriver.remote.command
132141
selenium.webdriver.remote.errorhandler
142+
selenium.webdriver.remote.file_detector
133143
selenium.webdriver.remote.mobile
134144
selenium.webdriver.remote.remote_connection
145+
selenium.webdriver.remote.script_key
135146
selenium.webdriver.remote.shadowroot
147+
selenium.webdriver.remote.switch_to
136148
selenium.webdriver.remote.utils
137149
selenium.webdriver.remote.webdriver
138150
selenium.webdriver.remote.webelement
139-
selenium.webdriver.remote.file_detector
140-
selenium.webdriver.remote.script_key
141-
selenium.webdriver.remote.switch_to
151+
selenium.webdriver.remote.websocket_connection
142152

143153
Webdriver.safari
144154
----------------
@@ -148,10 +158,22 @@ Webdriver.safari
148158
:toctree: webdriver_safari
149159

150160
selenium.webdriver.safari.options
161+
selenium.webdriver.safari.permissions
151162
selenium.webdriver.safari.remote_connection
152163
selenium.webdriver.safari.service
153164
selenium.webdriver.safari.webdriver
154165

166+
Webdriver.wpewebkit
167+
-------------------
168+
169+
.. currentmodule:: selenium.webdriver.wpewebkit
170+
.. autosummary::
171+
:toctree: webdriver_wpewebkit
172+
173+
selenium.webdriver.wpewebkit.options
174+
selenium.webdriver.wpewebkit.service
175+
selenium.webdriver.wpewebkit.webdriver
176+
155177
Webdriver.webkitgtk
156178
-------------------
157179

py/docs/source/common/selenium.common.exceptions.rst

-61
This file was deleted.

py/docs/source/webdriver/selenium.webdriver.common.action_chains.rst

-29
This file was deleted.

py/docs/source/webdriver/selenium.webdriver.common.actions.action_builder.rst

-29
This file was deleted.

py/docs/source/webdriver/selenium.webdriver.common.actions.input_device.rst

-29
This file was deleted.

py/docs/source/webdriver/selenium.webdriver.common.actions.interaction.rst

-30
This file was deleted.

py/docs/source/webdriver/selenium.webdriver.common.actions.key_actions.rst

-29
This file was deleted.

py/docs/source/webdriver/selenium.webdriver.common.actions.key_input.rst

-30
This file was deleted.

0 commit comments

Comments
 (0)