Skip to content

Commit 184990e

Browse files
authored
Restore read the docs (#371)
* add readthedocs.yaml * remove button * move to python 3
1 parent b49c6a6 commit 184990e

File tree

16 files changed

+115
-100
lines changed

16 files changed

+115
-100
lines changed

.readthedocs.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
# Set the OS, Python version and other tools you might need
8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.12"
12+
13+
# Build documentation in the "doc/" directory with Sphinx
14+
sphinx:
15+
configuration: doc/conf.py
16+
17+
# Optional but recommended, declare the Python requirements required
18+
# to build your documentation
19+
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
20+
python:
21+
install:
22+
- requirements: doc/requirements.txt

doc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
.idea/
12
_build/
23
api-docs/build

doc/_exts/samples.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
from sphinx.directives import LiteralInclude
21
from docutils import nodes
32
from sphinx.addnodes import download_reference
4-
from sphinx.writers.html import HTMLTranslator
3+
from sphinx.directives.code import LiteralInclude
54
import re
65

76
class Sample(LiteralInclude):
@@ -10,7 +9,7 @@ def run(self):
109
self.arguments[0] = "/../samples/" + self.arguments[0]
1110
self.options['language'] = 'php'
1211

13-
pattern = "[\s+]?(\<\?php.*?]\);)"
12+
pattern = r"[\s+]?(\<\?php.*?]\);)"
1413

1514
code_block = super(Sample, self).run()[0]
1615
string = str(code_block[0])
@@ -29,13 +28,6 @@ def run(self):
2928
nodes.literal_block(auth_str, auth_str, language="php"),
3029
nodes.literal_block(main_str, main_str, language="php")]
3130

32-
def visit_download_reference(self, node):
33-
self.context.append('<a href="javascript:void(0);" class="toggle btn">Show auth code</a>')
34-
35-
def depart_download_reference(self, node):
36-
self.body.append(self.context.pop())
37-
3831
def setup(app):
39-
app.add_node(download_reference, html=(visit_download_reference, depart_download_reference))
4032
app.add_directive('sample', Sample)
4133
return {'version': '0.1'}

doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sphinxcontrib-phpdomain==0.1.4
1+
sphinxcontrib-phpdomain>=0.11.0

doc/services/identity/v3/credentials.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@ Add credential
77
Create a secret/access pair for use with ec2 style auth. This operation will generates a new set of credentials that
88
map the user/tenant pair.
99

10-
.. sample:: Identity/v2/credentials/add_cred.php
10+
.. sample:: Identity/v3/credentials/add_cred.php
1111
.. refdoc:: OpenStack/Identity/v3/Service.html#method_createCredential
1212

1313
List credentials
1414
----------------
1515

1616
List all credentials for a given user.
1717

18-
.. sample:: Identity/v2/credentials/list_creds.php
18+
.. sample:: Identity/v3/credentials/list_creds.php
1919
.. refdoc:: OpenStack/Identity/v3/Service.html#method_listCredentials
2020

2121
Show credential details
2222
-----------------------
2323

2424
Retrieve a user's access/secret pair by the access key.
2525

26-
.. sample:: Identity/v2/credentials/get_cred.php
26+
.. sample:: Identity/v3/credentials/get_cred.php
2727
.. refdoc:: OpenStack/Identity/v3/Service.html#method_getCredential
2828

2929
Update credential
3030
-----------------
3131

32-
.. sample:: Identity/v2/credentials/update_cred.php
32+
.. sample:: Identity/v3/credentials/update_cred.php
3333
.. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_update
3434

3535
Delete credential
3636
-----------------
3737

3838
Delete a user's access/secret pair.
3939

40-
.. sample:: Identity/v2/credentials/delete_cred.php
40+
.. sample:: Identity/v3/credentials/delete_cred.php
4141
.. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_delete

doc/services/identity/v3/domains.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,77 +4,77 @@ Domains
44
Add domain
55
----------
66

7-
.. sample:: Identity/v2/domains/add_domain.php
7+
.. sample:: Identity/v3/domains/add_domain.php
88
.. refdoc:: OpenStack/Identity/v3/Service.html#method_createDomain
99

1010
List domains
1111
------------
1212

13-
.. sample:: Identity/v2/domains/list_domains.php
13+
.. sample:: Identity/v3/domains/list_domains.php
1414
.. refdoc:: OpenStack/Identity/v3/Service.html#method_listDomains
1515

1616
Show domain details
1717
-------------------
1818

19-
.. sample:: Identity/v2/domains/show_domain.php
19+
.. sample:: Identity/v3/domains/show_domain.php
2020
.. refdoc:: OpenStack/Identity/v3/Service.html#method_getDomain
2121

2222
Update domain
2323
-------------
2424

25-
.. sample:: Identity/v2/domains/update_domain.php
25+
.. sample:: Identity/v3/domains/update_domain.php
2626
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_update
2727

2828
Delete domain
2929
-------------
3030

31-
.. sample:: Identity/v2/domains/delete_domain.php
31+
.. sample:: Identity/v3/domains/delete_domain.php
3232
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_delete
3333

3434
List roles for domain user
3535
--------------------------
3636

37-
.. sample:: Identity/v2/domains/list_user_roles.php
37+
.. sample:: Identity/v3/domains/list_user_roles.php
3838
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listUserRoles
3939

4040
Grant role to domain user
4141
-------------------------
4242

43-
.. sample:: Identity/v2/domains/grant_user_role.php
43+
.. sample:: Identity/v3/domains/grant_user_role.php
4444
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantUserRole
4545

4646
Check role for domain user
4747
--------------------------
4848

49-
.. sample:: Identity/v2/domains/check_user_role.php
49+
.. sample:: Identity/v3/domains/check_user_role.php
5050
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkUserRole
5151

5252
Revoke role for domain user
5353
---------------------------
5454

55-
.. sample:: Identity/v2/domains/revoke_user_role.php
55+
.. sample:: Identity/v3/domains/revoke_user_role.php
5656
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeUserRole
5757

5858
List roles for domain group
5959
---------------------------
6060

61-
.. sample:: Identity/v2/domains/list_group_roles.php
61+
.. sample:: Identity/v3/domains/list_group_roles.php
6262
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listGroupRoles
6363

6464
Grant role to domain group
6565
--------------------------
6666

67-
.. sample:: Identity/v2/domains/grant_group_role.php
67+
.. sample:: Identity/v3/domains/grant_group_role.php
6868
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantGroupRole
6969

7070
Check role for domain group
7171
---------------------------
7272

73-
.. sample:: Identity/v2/domains/check_group_role.php
73+
.. sample:: Identity/v3/domains/check_group_role.php
7474
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkGroupRole
7575

7676
Revoke role for domain group
7777
----------------------------
7878

79-
.. sample:: Identity/v2/domains/revoke_group_role.php
79+
.. sample:: Identity/v3/domains/revoke_group_role.php
8080
.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeGroupRole

doc/services/identity/v3/endpoints.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ Endpoints
44
Add endpoints
55
-------------
66

7-
.. sample:: Identity/v2/endpoints/add_endpoint.php
7+
.. sample:: Identity/v3/endpoints/add_endpoint.php
88
.. refdoc:: OpenStack/Identity/v3/Service.html#method_createEndpoint
99

1010
Get endpoint
1111
------------
1212

13-
.. sample:: Identity/v2/endpoints/get_endpoint.php
13+
.. sample:: Identity/v3/endpoints/get_endpoint.php
1414
.. refdoc:: OpenStack/Identity/v3/Service.html#method_getEndpoint
1515

1616
List endpoints
1717
--------------
1818

19-
.. sample:: Identity/v2/endpoints/list_endpoints.php
19+
.. sample:: Identity/v3/endpoints/list_endpoints.php
2020
.. refdoc:: OpenStack/Identity/v3/Service.html#method_listEndpoints
2121

2222
Update endpoint
2323
---------------
2424

25-
.. sample:: Identity/v2/endpoints/update_endpoint.php
25+
.. sample:: Identity/v3/endpoints/update_endpoint.php
2626
.. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_update
2727

2828
Delete endpoint
2929
---------------
3030

31-
.. sample:: Identity/v2/endpoints/delete_endpoint.php
31+
.. sample:: Identity/v3/endpoints/delete_endpoint.php
3232
.. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_delete

doc/services/identity/v3/groups.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,53 @@ Groups
44
Add group
55
---------
66

7-
.. sample:: Identity/v2/groups/add_group.php
7+
.. sample:: Identity/v3/groups/add_group.php
88
.. refdoc:: OpenStack/Identity/v3/Service.html#method_createGroup
99

1010
List groups
1111
-----------
1212

13-
.. sample:: Identity/v2/groups/list_groups.php
13+
.. sample:: Identity/v3/groups/list_groups.php
1414
.. refdoc:: OpenStack/Identity/v3/Service.html#method_listGroups
1515

1616
Show group details
1717
------------------
1818

19-
.. sample:: Identity/v2/groups/get_group.php
19+
.. sample:: Identity/v3/groups/get_group.php
2020
.. refdoc:: OpenStack/Identity/v3/Service.html#method_getGroup
2121

2222
Update group
2323
------------
2424

25-
.. sample:: Identity/v2/groups/update_group.php
25+
.. sample:: Identity/v3/groups/update_group.php
2626
.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_update
2727

2828
Delete group
2929
------------
3030

31-
.. sample:: Identity/v2/groups/delete_group.php
31+
.. sample:: Identity/v3/groups/delete_group.php
3232
.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_delete
3333

3434
List users in a group
3535
---------------------
3636

37-
.. sample:: Identity/v2/groups/list_users.php
37+
.. sample:: Identity/v3/groups/list_users.php
3838
.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_listUsers
3939

4040
Add user to group
4141
-----------------
4242

43-
.. sample:: Identity/v2/groups/add_user.php
43+
.. sample:: Identity/v3/groups/add_user.php
4444
.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_addUser
4545

4646
Remove user from group
4747
----------------------
4848

49-
.. sample:: Identity/v2/groups/remove_user.php
49+
.. sample:: Identity/v3/groups/remove_user.php
5050
.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_removeUser
5151

5252
Check user membership in a group
5353
--------------------------------
5454

55-
.. sample:: Identity/v2/groups/check_user_membership.php
55+
.. sample:: Identity/v3/groups/check_user_membership.php
5656
.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_checkMembership

doc/services/identity/v3/projects.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,77 +4,77 @@ Projects
44
Add project
55
-----------
66

7-
.. sample:: Identity/v2/projects/add_project.php
7+
.. sample:: Identity/v3/projects/add_project.php
88
.. refdoc:: OpenStack/Identity/v3/Service.html#method_createProject
99

1010
List projects
1111
-------------
1212

13-
.. sample:: Identity/v2/projects/list_projects.php
13+
.. sample:: Identity/v3/projects/list_projects.php
1414
.. refdoc:: OpenStack/Identity/v3/Service.html#method_listProjects
1515

1616
Show project details
1717
--------------------
1818

19-
.. sample:: Identity/v2/projects/get_project.php
19+
.. sample:: Identity/v3/projects/get_project.php
2020
.. refdoc:: OpenStack/Identity/v3/Service.html#method_getProject
2121

2222
Update project
2323
--------------
2424

25-
.. sample:: Identity/v2/projects/update_project.php
25+
.. sample:: Identity/v3/projects/update_project.php
2626
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_update
2727

2828
Delete project
2929
--------------
3030

31-
.. sample:: Identity/v2/projects/delete_project.php
31+
.. sample:: Identity/v3/projects/delete_project.php
3232
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_delete
3333

3434
List roles for project user
3535
---------------------------
3636

37-
.. sample:: Identity/v2/projects/list_user_roles.php
37+
.. sample:: Identity/v3/projects/list_user_roles.php
3838
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listUserRoles
3939

4040
Grant role to project user
4141
--------------------------
4242

43-
.. sample:: Identity/v2/projects/grant_user_role.php
43+
.. sample:: Identity/v3/projects/grant_user_role.php
4444
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantUserRole
4545

4646
Check role for project user
4747
---------------------------
4848

49-
.. sample:: Identity/v2/projects/check_user_role.php
49+
.. sample:: Identity/v3/projects/check_user_role.php
5050
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkUserRole
5151

5252
Revoke role for project user
5353
----------------------------
5454

55-
.. sample:: Identity/v2/projects/revoke_user_role.php
55+
.. sample:: Identity/v3/projects/revoke_user_role.php
5656
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeUserRole
5757

5858
List roles for project group
5959
----------------------------
6060

61-
.. sample:: Identity/v2/projects/list_group_roles.php
61+
.. sample:: Identity/v3/projects/list_group_roles.php
6262
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listGroupRoles
6363

6464
Grant role to project group
6565
---------------------------
6666

67-
.. sample:: Identity/v2/projects/grant_group_role.php
67+
.. sample:: Identity/v3/projects/grant_group_role.php
6868
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantGroupRole
6969

7070
Check role for project group
7171
----------------------------
7272

73-
.. sample:: Identity/v2/projects/check_group_role.php
73+
.. sample:: Identity/v3/projects/check_group_role.php
7474
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkGroupRole
7575

7676
Revoke role for project group
7777
-----------------------------
7878

79-
.. sample:: Identity/v2/projects/revoke_group_role.php
79+
.. sample:: Identity/v3/projects/revoke_group_role.php
8080
.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeGroupRole

0 commit comments

Comments
 (0)