Merge branch 'main' into kavanase_main

materialsproject · Oct 22, 2024 · 94ad5ba · 94ad5ba
2 parents 777e43e + ed8cb0b
commit 94ad5ba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -21,11 +21,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.x'
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -37,4 +37,4 @@ jobs:
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -12,19 +12,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
           cache-dependency-path: pyproject.toml
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install .[strict]
-          pip install .[tests]
-          pip install .[dev]
+          pip install .[tests,dev]
 
       - name: Lint
         run: |
@@ -34,12 +32,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.9", "3.10", "3.11" ]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v2.2.2
+    - uses: actions/setup-python@v5
       with:
         python-version:  ${{ matrix.python-version }}
 
@@ -53,15 +51,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install .[strict]
         pip install .[tests]
 
     - name: Test
       run: |
         pytest --cov=pyrho --cov-report=xml
 
     - uses: codecov/codecov-action@v1
-      if: matrix.python-version == 3.8
+      if: matrix.python-version == 3.11
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./coverage.xml
@@ -70,19 +67,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install pandoc
         run: sudo apt-get install pandoc
 
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e .[strict]
           pip install -e .[docs]
       - name: Build
         run: sphinx-build docs/source _build

diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,7 @@ keywords = ["machine-learning", "dft", "vasp", "volumetric", "pymatgen"]
 license = {text = "modified BSD"}
 name = "mp-pyrho"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [tool.setuptools_scm]
 
@@ -43,12 +43,9 @@ docs = [
   "sphinx-autoapi==3.0.0",
 ]
 tests = [
-  "pytest==7.1.2",
-  "pytest-cov==3.0.0",
-  "hypothesis==6.98.10",
-]
-strict = [
-  "pymatgen==2024.2.20",
+  "pytest>=7.1.2",
+  "pytest-cov>=3.0.0",
+  "hypothesis>=6.98.10",
 ]
 
 [project.urls]