Fix bug on pip integration in conda requirements

Conda only parses a single list of pip requirements. If two pip lists are given, all but the last list is skipped.
PlasmaControl · Oct 10, 2022 · 587801d · 587801d
1 parent d3f527e
commit 587801d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/devtools/dev-requirements.txt b/devtools/dev-requirements.txt
@@ -12,11 +12,11 @@ sphinx-rtd-theme
 black == 21.7b0
 click == 8.0.4
 flake8 >= 4.0.1
-pylint >= 2.12.2
-pydocstyle >= 2.0.0
 flake8-docstrings
 flake8-eradicate
 flake8-isort
+pydocstyle >= 2.0.0
+pylint >= 2.12.2
 
 # testing and benchmarking
 codecov

diff --git a/devtools/dev-requirements_conda.yml b/devtools/dev-requirements_conda.yml
@@ -17,6 +17,8 @@ dependencies:
     - jax >= 0.2.11, <= 0.2.25
     - jaxlib >= 0.1.69, <= 0.1.76
     - nvgpu
+    # testing and benchmarking
+    - qsc
 
   # building the docs
   - nbsphinx > 0.8.5
@@ -29,12 +31,11 @@ dependencies:
   - black = 21.7b0
   - click = 8.0.4
   - flake8 >= 4.0.1
+  - flake8-docstrings
+  - flake8-eradicate
+  - flake8-isort
+  - pydocstyle >= 2.0.0
   - pylint >= 2.12.2
-  - pip:
-    - pydocstyle >= 2.0.0
-    - flake8-docstrings
-    - flake8-eradicate
-    - flake8-isort
 
   # testing and benchmarking
   - codecov
@@ -47,8 +48,6 @@ dependencies:
   - pytest-mpl = 0.16.1
   - pytest-split
   - shapely >= 1.8.2
-  - pip:
-    - qsc
 
   # building
   - python-build