Skip to content

Commit

Permalink
rename requirements files (2/2)
Browse files Browse the repository at this point in the history
requirements-dev.in => requirements-dev.txt
requirements-dev.in + requirements-extras.in => requirements-dev-full.txt
  • Loading branch information
belm0 committed Mar 13, 2023
1 parent 7e38417 commit 3f90b0e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: 'requirements-dev.txt'
- run: pip install . -r requirements-dev.txt
cache-dependency-path: 'requirements-dev-full.txt'
- run: pip install . -r requirements-dev-full.txt
- run: make test
- run: make lint

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

build_and_test_pypy:
Expand All @@ -58,8 +58,8 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: 'requirements-min.txt'
- run: pip install . -r requirements-min.txt
cache-dependency-path: 'requirements-dev.txt'
- run: pip install . -r requirements-dev.txt
- run: make test

build_and_test_latest:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ publish:
# upgrade specific deps:
# make -W requirements-dev.{in,txt} PIP_COMPILE_ARGS="-P foo"
ifneq ($(PIP_COMPILE_ARGS),)
requirements-dev.txt: setup.py requirements-dev.in requirements-extras.in
requirements-dev-full.txt: setup.py requirements-dev.in requirements-extras.in
pip-compile -q $(PIP_COMPILE_ARGS) --output-file $@ $^

requirements-min.txt: setup.py requirements-dev.in
requirements-dev.txt: setup.py requirements-dev.in
pip-compile -q $(PIP_COMPILE_ARGS) --output-file $@ $^
endif
4 changes: 2 additions & 2 deletions requirements-dev-full.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements-extras.in setup.py
# pip-compile --output-file=requirements-dev-full.txt requirements-dev.in requirements-extras.in setup.py
#
alabaster==0.7.13
# via sphinx
Expand Down Expand Up @@ -45,6 +45,7 @@ exceptiongroup==1.1.0
# via
# pytest
# trio
# trio-websocket (setup.py)
h11==0.14.0
# via wsproto
idna==3.4
Expand Down Expand Up @@ -181,7 +182,6 @@ tomlkit==0.11.6
# via pylint
trio==0.22.0
# via
# -r requirements-dev.in
# pytest-trio
# trio-websocket (setup.py)
trustme==0.9.0
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# requirements for `make test` and dependency management
attrs>=19.2.0
pip-tools>=5.5.0
pytest>=4.6
pytest-cov
pytest-trio>=0.5.0
trio>=0.14.0
trustme
4 changes: 2 additions & 2 deletions requirements-min.txt → requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --output-file=requirements-min.txt requirements-dev.in setup.py
# pip-compile --output-file=requirements-dev.txt requirements-dev.in setup.py
#
async-generator==1.10
# via trio
Expand All @@ -26,6 +26,7 @@ exceptiongroup==1.1.0
# via
# pytest
# trio
# trio-websocket (setup.py)
h11==0.14.0
# via wsproto
idna==3.4
Expand Down Expand Up @@ -77,7 +78,6 @@ tomli==2.0.1
# pytest
trio==0.22.0
# via
# -r requirements-dev.in
# pytest-trio
# trio-websocket (setup.py)
trustme==0.9.0
Expand Down
1 change: 1 addition & 0 deletions requirements-extras.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# requirements for `make lint/docs/publish`
pylint
sphinx
sphinxcontrib-trio
Expand Down

0 comments on commit 3f90b0e

Please sign in to comment.