Skip to content

Commit 3f90b0e

Browse files
committed
rename requirements files (2/2)
requirements-dev.in => requirements-dev.txt requirements-dev.in + requirements-extras.in => requirements-dev-full.txt
1 parent 7e38417 commit 3f90b0e

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323
cache: 'pip'
24-
cache-dependency-path: 'requirements-dev.txt'
25-
- run: pip install . -r requirements-dev.txt
24+
cache-dependency-path: 'requirements-dev-full.txt'
25+
- run: pip install . -r requirements-dev-full.txt
2626
- run: make test
2727
- run: make lint
2828

@@ -40,8 +40,8 @@ jobs:
4040
with:
4141
python-version: ${{ matrix.python-version }}
4242
cache: 'pip'
43-
cache-dependency-path: 'requirements-min.txt'
44-
- run: pip install . -r requirements-min.txt && pip install trio==0.15.0 pytest-trio==0.7.0
43+
cache-dependency-path: 'requirements-dev.txt'
44+
- run: pip install . -r requirements-dev.txt && pip install trio==0.15.0 pytest-trio==0.7.0
4545
- run: make test
4646

4747
build_and_test_pypy:
@@ -58,8 +58,8 @@ jobs:
5858
with:
5959
python-version: ${{ matrix.python-version }}
6060
cache: 'pip'
61-
cache-dependency-path: 'requirements-min.txt'
62-
- run: pip install . -r requirements-min.txt
61+
cache-dependency-path: 'requirements-dev.txt'
62+
- run: pip install . -r requirements-dev.txt
6363
- run: make test
6464

6565
build_and_test_latest:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ publish:
2828
# upgrade specific deps:
2929
# make -W requirements-dev.{in,txt} PIP_COMPILE_ARGS="-P foo"
3030
ifneq ($(PIP_COMPILE_ARGS),)
31-
requirements-dev.txt: setup.py requirements-dev.in requirements-extras.in
31+
requirements-dev-full.txt: setup.py requirements-dev.in requirements-extras.in
3232
pip-compile -q $(PIP_COMPILE_ARGS) --output-file $@ $^
3333

34-
requirements-min.txt: setup.py requirements-dev.in
34+
requirements-dev.txt: setup.py requirements-dev.in
3535
pip-compile -q $(PIP_COMPILE_ARGS) --output-file $@ $^
3636
endif

requirements-dev-full.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements-extras.in setup.py
5+
# pip-compile --output-file=requirements-dev-full.txt requirements-dev.in requirements-extras.in setup.py
66
#
77
alabaster==0.7.13
88
# via sphinx
@@ -45,6 +45,7 @@ exceptiongroup==1.1.0
4545
# via
4646
# pytest
4747
# trio
48+
# trio-websocket (setup.py)
4849
h11==0.14.0
4950
# via wsproto
5051
idna==3.4
@@ -181,7 +182,6 @@ tomlkit==0.11.6
181182
# via pylint
182183
trio==0.22.0
183184
# via
184-
# -r requirements-dev.in
185185
# pytest-trio
186186
# trio-websocket (setup.py)
187187
trustme==0.9.0

requirements-dev.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
# requirements for `make test` and dependency management
12
attrs>=19.2.0
23
pip-tools>=5.5.0
34
pytest>=4.6
45
pytest-cov
56
pytest-trio>=0.5.0
6-
trio>=0.14.0
77
trustme

requirements-min.txt renamed to requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --output-file=requirements-min.txt requirements-dev.in setup.py
5+
# pip-compile --output-file=requirements-dev.txt requirements-dev.in setup.py
66
#
77
async-generator==1.10
88
# via trio
@@ -26,6 +26,7 @@ exceptiongroup==1.1.0
2626
# via
2727
# pytest
2828
# trio
29+
# trio-websocket (setup.py)
2930
h11==0.14.0
3031
# via wsproto
3132
idna==3.4
@@ -77,7 +78,6 @@ tomli==2.0.1
7778
# pytest
7879
trio==0.22.0
7980
# via
80-
# -r requirements-dev.in
8181
# pytest-trio
8282
# trio-websocket (setup.py)
8383
trustme==0.9.0

requirements-extras.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# requirements for `make lint/docs/publish`
12
pylint
23
sphinx
34
sphinxcontrib-trio

0 commit comments

Comments
 (0)