Devops: Merge tests and pre-commit extras into dev

aiidateam · Dec 22, 2023 · 9ff55c1 · 9ff55c1
1 parent 3f86c30
commit 9ff55c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -40,7 +40,7 @@ jobs:
         cache-dependency-path: pyproject.toml
 
     - name: Install Python package and dependencies
-      run: pip install -e .[pre-commit,tests]
+      run: pip install -e .[dev]
 
     - name: Run pre-commit
       run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
@@ -73,7 +73,7 @@ jobs:
         cache-dependency-path: pyproject.toml
 
     - name: Install Python package and dependencies
-      run: pip install -e .[tests]
+      run: pip install -e .[dev]
 
     - name: Run pytest
       run: pytest -sv tests

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         cache-dependency-path: pyproject.toml
 
     - name: Install Python package and dependencies
-      run: pip install -e .[pre-commit,tests]
+      run: pip install -e .[dev]
 
     - name: Run pre-commit
       run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
@@ -52,7 +52,7 @@ jobs:
         cache-dependency-path: pyproject.toml
 
     - name: Install Python package and dependencies
-      run: pip install -e .[tests]
+      run: pip install -e .[dev]
 
     - name: Run pytest
       env:

diff --git a/pyproject.toml b/pyproject.toml
@@ -45,20 +45,18 @@ requires-python = '>=3.8'
 'pseudo.family.sssp' = 'aiida_pseudo.groups.family.sssp:SsspFamily'
 
 [project.optional-dependencies]
+dev = [
+  'pgtest~=1.3',
+  'pre-commit~=2.2',
+  'pytest>=6.0'
+]
 docs = [
   'sphinx~=6.0',
   'sphinx-copybutton~=0.5.0',
   'sphinx-book-theme~=1.0',
   'sphinx-autoapi~=3.0',
   'sphinx-click~=4.0'
 ]
-pre-commit = [
-  'pre-commit~=2.2'
-]
-tests = [
-  'pgtest~=1.3',
-  'pytest>=6.0'
-]
 
 [project.scripts]
 aiida-pseudo = 'aiida_pseudo.cli:cmd_root'