Skip to content

Commit 4949efe

Browse files
authored
Merge branch 'flux-framework:main' into authentication-resolve
2 parents 1de289c + 396ffc8 commit 4949efe

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

.all-contributorsrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@
3131
"avatar_url": [
3232
null
3333
]
34+
},
35+
{
36+
"login": "khoing0810",
37+
"name": "Khoi Nguyen",
38+
"contributions": [
39+
"code"
40+
],
41+
"profile": "https://github.com/khoing0810",
42+
"avatar_url": [
43+
"https://avatars.githubusercontent.com/u/47909147?v=4"
44+
]
3445
}
3546
],
3647
"contributorsPerLine": 7

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Flux RESTFul API
22

33
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
4-
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
4+
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
55
<!-- ALL-CONTRIBUTORS-BADGE:END -->
66

77
![img/flux-restful-eyes-small.png](img/flux-restful-eyes-small.png)
@@ -35,6 +35,7 @@ tool to generate a contributors graphic below.
3535
<tr>
3636
<td align="center" valign="top" width="14.28%"><a href="https://vsoch.github.io"><img src="https://avatars.githubusercontent.com/u/814322?v=4?s=100" width="100px;" alt="Vanessasaurus"/><br /><sub><b>Vanessasaurus</b></sub></a><br /><a href="https://github.com/flux-framework/flux-restful-api/commits?author=vsoch" title="Code">💻</a></td>
3737
<td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/tgamblin/"><img src="?s=100" width="100px;" alt="Todd Gamblin"/><br /><sub><b>Todd Gamblin</b></sub></a><br /><a href="https://github.com/flux-framework/flux-restful-api/commits?author=tgamblin" title="Code">💻</a></td>
38+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/khoing0810"><img src="https://avatars.githubusercontent.com/u/47909147?v=4?s=100" width="100px;" alt="Khoi Nguyen"/><br /><sub><b>Khoi Nguyen</b></sub></a><br /><a href="https://github.com/flux-framework/flux-restful-api/commits?author=khoing0810" title="Code">💻</a></td>
3839
</tr>
3940
</tbody>
4041
</table>

docs/requirements.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
sphinx_immaterial
2-
numpy>=1.16
1+
sphinx<7.2
2+
markupsafe
3+
sphinx-immaterial>=0.11.6
4+
numpy
5+
pydantic
36
pandas
47
matplotlib
58
nbsphinx
@@ -11,6 +14,7 @@ recommonmark
1114
sphinx_markdown_tables
1215
sphinx-copybutton
1316
readthedocs-sphinx-search
14-
sphinx-gallery
1517
myst-parser
18+
pymdown-extensions
19+
sphinx-gallery
1620
flux-restful-client

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ pyaml
1111
sqlalchemy
1212
# install also provides alembic binary
1313
alembic
14-
pydantic
14+
pydantic==2.0.1
1515
python-jose[cryptography]
1616
passlib[bcrypt]

0 commit comments

Comments
 (0)