Skip to content

Commit b7fae0d

Browse files
committed
feat(72): Simplify requirements management
Each env now has a dedicated requirements file.
1 parent 8fb423c commit b7fae0d

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

.circleci/config.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ commands:
4545
type: string
4646
default: "7"
4747
description: "Pytest version to use for testing"
48-
add_specific_requirements_file:
48+
use_specific_requirements_file:
4949
type: string
50-
default: ""
50+
default: "requirements.txt"
5151
description: "Add specific requirements listed in a file to the environment. "
5252
extra_deps:
5353
type: string
@@ -71,18 +71,15 @@ commands:
7171
name: "Apply dependency constraints"
7272
command: |
7373
if [ "<< parameters.pytest >>" != "" ]; then
74-
sed -i 's/pytest/pytest=<< parameters.pytest >>/g' requirements.txt
74+
sed -i 's/pytest/pytest=<< parameters.pytest >>/g' << parameters.use_specific_requirements_file >>
7575
fi
76+
echo "" >> << parameters.use_specific_requirements_file >>
7677
if [ "<< parameters.extra_deps >>" != "" ]; then
7778
for dep in << parameters.extra_deps >>
7879
do
79-
echo $dep >> requirements.txt
80+
echo $dep >> << parameters.use_specific_requirements_file >>
8081
done
8182
fi
82-
echo "" >> requirements.txt
83-
if [ "<< parameters.add_specific_requirements_file >>" != "" ]; then
84-
cat "<< parameters.add_specific_requirements_file >>" >> requirements.txt
85-
fi
8683
- run:
8784
name: "Create environment"
8885
command: |
@@ -222,7 +219,7 @@ jobs:
222219
docker: *image
223220
steps:
224221
- make-env:
225-
add_specific_requirements_file: requirements.dev.txt
222+
use_specific_requirements_file: requirements.dev.txt
226223
- lint-project
227224
build:
228225
docker: *image

docs/sources/contributing.rst

+7-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The following instructions describe how to create your development environment u
2020

2121
.. code-block:: bash
2222
23-
conda install --file requirements.txt -n pytest-monitor-dev -c https://conda.anaconda.org/conda-forge -c defaults
23+
conda install --file requirements.dev.txt -n pytest-monitor-dev -c https://conda.anaconda.org/conda-forge -c defaults
2424
2525
#. Make sure to have pip install or install it if missing:
2626

@@ -41,7 +41,12 @@ The following instructions describe how to create your development environment u
4141

4242
.. code-block:: bash
4343
44-
python -m pip install -e .
44+
python -m pip install -e ".[dev]"
45+
46+
#. Install the pre-commit hooks
47+
.. code-block:: bash
48+
49+
pre-commit install
4550
4651
#. You're done!
4752

requirements.dev.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
psutil>=5.1.0
2+
memory_profiler>=0.58
3+
pytest
4+
requests
15
black
26
isort
37
flake8=6.0.0

0 commit comments

Comments
 (0)