Merge branch 'main' into dependabot/github_actions/actions/checkout-4

materialsproject · Sep 6, 2023 · 2c86cb8 · 2c86cb8
2 parents 2d412cf + 6e27a98
commit 2c86cb8
Show file tree

Hide file tree

Showing 28 changed files with 1,766 additions and 148 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,10 +45,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements/ubuntu-latest_py3.10.txt
-        pip install -r requirements-optional.txt
+        pip install -r requirements/ubuntu-latest_py3.10_extras.txt
         pip install -e .
-        pip install -r requirements-docs.txt
 
     - name: Generate changelog
       uses: charmixer/auto-changelog-action@v1

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -66,9 +66,7 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements/${{ matrix.os }}_py${{ matrix.python-version }}.txt
-        pip install -r requirements-testing.txt
-        pip install -r requirements-optional.txt
+        pip install -r requirements/${{ matrix.os }}_py${{ matrix.python-version }}_extras.txt
 
     - name: Test with pytest
       env:
@@ -95,9 +93,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -e .
-        pip install -r requirements-optional.txt
-        pip install -r requirements-docs.txt
+        pip install -e .[docs]
 
     - name: Build
       run: mkdocs build
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     rev: v0.0.280
     hooks:
       - id: ruff
-        args: [--fix, --ignore, D]
+        args: [--fix, --show-fixes, --ignore, D]
 
   - repo: https://github.com/psf/black
     rev: 23.7.0

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -46,4 +46,7 @@ markdown_extensions:
 plugins:
   - search
   - minify
-  - mkdocstrings
+  - mkdocstrings:
+      handlers: 
+        python: 
+          paths: [src]
diff --git a/pyproject.toml b/pyproject.toml
@@ -87,6 +87,7 @@ src = ["src"]
 "src/maggma/cli/*" = ["EXE001"] # triggered by ! at top of file
 
 [tool.pytest.ini_options]
+minversion = "6.0"
 addopts = "--color=yes -p no:warnings --import-mode=importlib --durations=30"
 testpaths = [
     "tests",

diff --git a/requirements-docs.txt b/requirements-docs.txt
diff --git a/requirements-optional.txt b/requirements-optional.txt
diff --git a/requirements-testing.txt b/requirements-testing.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/requirements/macos-latest_py3.10.txt b/requirements/macos-latest_py3.10.txt
@@ -36,6 +36,7 @@ click==8.1.7
     # via
     #   flask
     #   mongogrant
+    #   uvicorn
 cryptography==41.0.3
     # via paramiko
 dnspython==2.4.2
@@ -48,6 +49,8 @@ fastapi==0.103.1
     # via maggma (setup.py)
 flask==2.3.3
     # via mongogrant
+h11==0.14.0
+    # via uvicorn
 idna==3.4
     # via
     #   anyio
@@ -137,10 +140,13 @@ typing-extensions==4.7.1
     #   fastapi
     #   pydantic
     #   pydash
+    #   uvicorn
 urllib3==1.26.16
     # via
     #   botocore
     #   requests
+uvicorn==0.23.2
+    # via maggma (setup.py)
 werkzeug==2.3.7
     # via flask