Merge pull request #841 from rkingsbury/main

CI: use OS-specific requirements in testing; update badges
materialsproject · Sep 1, 2023 · faf6fc8 · faf6fc8
2 parents 7686860 + c4a329b
commit faf6fc8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
+        pip install -r requirements/ubuntu-latest_py3.10.txt
         pip install -r requirements-optional.txt
         pip install -e .
         pip install -r requirements-docs.txt

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -66,7 +66,7 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
+        pip install -r requirements/${{ matrix.os }}_py${{ matrix.python-version }}.txt
         pip install -r requirements-testing.txt
         pip install -r requirements-optional.txt
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 
 # ![Maggma](docs/logo_w_text.svg)
 
-[![testing](https://github.com/materialsproject/maggma/workflows/testing/badge.svg)](https://github.com/materialsproject/maggma/actions?query=workflow%3Atesting) [![codecov](https://codecov.io/gh/materialsproject/maggma/branch/main/graph/badge.svg)](https://codecov.io/gh/materialsproject/maggma)
+[![Static Badge](https://img.shields.io/badge/documentation-blue?logo=github)](https://materialsproject.github.io/maggma) [![testing](https://github.com/materialsproject/maggma/workflows/testing/badge.svg)](https://github.com/materialsproject/maggma/actions?query=workflow%3Atesting) [![codecov](https://codecov.io/gh/materialsproject/maggma/branch/main/graph/badge.svg)](https://codecov.io/gh/materialsproject/maggma) [![python](https://img.shields.io/badge/Python-3.8+-blue.svg?logo=python&amp;logoColor=white)]()
 
 A files-to-API data pipeline for scientific applications using Python, supporting a variety of data stores including MongoDB [and many others](https://materialsproject.github.io/maggma/getting_started/stores/#list-of-stores).
diff --git a/docs/index.md b/docs/index.md
@@ -1,6 +1,6 @@
 # Maggma
 
-[![testing](https://github.com/materialsproject/maggma/workflows/testing/badge.svg)](https://github.com/materialsproject/maggma/actions?query=workflow%3Atesting) [![codecov](https://codecov.io/gh/materialsproject/maggma/branch/main/graph/badge.svg)](https://codecov.io/gh/materialsproject/maggma)
+[![Static Badge](https://img.shields.io/badge/documentation-blue?logo=github)](https://materialsproject.github.io/maggma) [![testing](https://github.com/materialsproject/maggma/workflows/testing/badge.svg)](https://github.com/materialsproject/maggma/actions?query=workflow%3Atesting) [![codecov](https://codecov.io/gh/materialsproject/maggma/branch/main/graph/badge.svg)](https://codecov.io/gh/materialsproject/maggma) [![python](https://img.shields.io/badge/Python-3.8+-blue.svg?logo=python&amp;logoColor=white)]()
 
 ## What is Maggma
 

diff --git a/requirements-optional.txt b/requirements-optional.txt
@@ -1,7 +1,6 @@
 uvicorn==0.18.3
 hvac==1.0.2
-IPython==7.34.0;python_version<"3.8"
-IPython==8.11.0;python_version>="3.8"
+IPython==8.11.0
 nbformat==5.4.0
 regex==2022.9.13
 montydb==2.5.0

diff --git a/requirements.txt b/requirements.txt
@@ -8,10 +8,8 @@ mongogrant==0.3.3
 aioitertools==0.10.0
 pydantic==1.10.2
 fastapi==0.79.0
-numpy==1.18.0;python_version<"3.8"
-numpy==1.23.0;python_version>="3.8"
-typing_extensions;python_version<"3.8"
-typing_compat;python_version<"3.8" # required for get_args()
+numpy==1.23.0
+typing_compat
 pyzmq==24.0.1
 dnspython==2.2.1
 uvicorn==0.18.3