Skip to content

Commit

Permalink
Merge branch 'flux-framework:main' into authentication-resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
khoing0810 authored Aug 23, 2023
2 parents 1de289c + 396ffc8 commit 4949efe
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
11 changes: 11 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@
"avatar_url": [
null
]
},
{
"login": "khoing0810",
"name": "Khoi Nguyen",
"contributions": [
"code"
],
"profile": "https://github.com/khoing0810",
"avatar_url": [
"https://avatars.githubusercontent.com/u/47909147?v=4"
]
}
],
"contributorsPerLine": 7
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Flux RESTFul API

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

![img/flux-restful-eyes-small.png](img/flux-restful-eyes-small.png)
Expand Down Expand Up @@ -35,6 +35,7 @@ tool to generate a contributors graphic below.
<tr>
<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>
<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>
<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>
</tr>
</tbody>
</table>
Expand Down
10 changes: 7 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
sphinx_immaterial
numpy>=1.16
sphinx<7.2
markupsafe
sphinx-immaterial>=0.11.6
numpy
pydantic
pandas
matplotlib
nbsphinx
Expand All @@ -11,6 +14,7 @@ recommonmark
sphinx_markdown_tables
sphinx-copybutton
readthedocs-sphinx-search
sphinx-gallery
myst-parser
pymdown-extensions
sphinx-gallery
flux-restful-client
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ pyaml
sqlalchemy
# install also provides alembic binary
alembic
pydantic
pydantic==2.0.1
python-jose[cryptography]
passlib[bcrypt]

0 comments on commit 4949efe

Please sign in to comment.