diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94fc3b1..5aba068 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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: @@ -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: diff --git a/Makefile b/Makefile index d3c5702..b19da42 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/requirements-dev-full.txt b/requirements-dev-full.txt index 3fec514..6dd9063 100644 --- a/requirements-dev-full.txt +++ b/requirements-dev-full.txt @@ -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 @@ -45,6 +45,7 @@ exceptiongroup==1.1.0 # via # pytest # trio + # trio-websocket (setup.py) h11==0.14.0 # via wsproto idna==3.4 @@ -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 diff --git a/requirements-dev.in b/requirements-dev.in index 007a524..922fb76 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -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 diff --git a/requirements-min.txt b/requirements-dev.txt similarity index 94% rename from requirements-min.txt rename to requirements-dev.txt index 9bc15d6..fe59300 100644 --- a/requirements-min.txt +++ b/requirements-dev.txt @@ -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 @@ -26,6 +26,7 @@ exceptiongroup==1.1.0 # via # pytest # trio + # trio-websocket (setup.py) h11==0.14.0 # via wsproto idna==3.4 @@ -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 diff --git a/requirements-extras.in b/requirements-extras.in index dec2dd2..9f4d0c5 100644 --- a/requirements-extras.in +++ b/requirements-extras.in @@ -1,3 +1,4 @@ +# requirements for `make lint/docs/publish` pylint sphinx sphinxcontrib-trio