Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ jobs:
- name: Install core libraries for build
run: python -Im pip install build
- name: Build sdists and pure-python wheel
env:
PIP_CONSTRAINT: requirements/ci.txt
Comment on lines -95 to -96
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this removal is okay or not. Since it's a pure python build (thus not installing cython), I don't think this has any effect, but I may be mistaken.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally, it should start pinning setuptools too. I just didn't get to it.

run: python -Im build --config-setting=pure-python=true
- name: Determine actual created filenames
id: dist-filenames-detection
Expand Down Expand Up @@ -240,7 +238,7 @@ jobs:
- name: Install dependencies
uses: py-actions/py-dependency-install@v4
with:
path: requirements/ci.txt
path: requirements/test.txt
- name: Determine pre-compiled compatible wheel
env:
# NOTE: When `pip` is forced to colorize output piped into `jq`,
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/reusable-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Install dependencies
uses: py-actions/py-dependency-install@v4
with:
path: requirements/ci.txt
path: requirements/lint.txt
- name: Self-install
run: |
pip install . --config-settings=pure-python=true
Expand All @@ -86,7 +86,6 @@ jobs:
make doc-spelling
- name: Prepare twine checker
run: |
pip install -U build twine
python -m build --config-setting=pure-python=true
- name: Run twine checker
run: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGES/636.contrib.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Organize dependencies into test and lint dependencies so that no
unnecessary ones are installed during CI runs -- by :user:`lysnikolaou`.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SRC = frozenlist tests setup.py
all: test

.install-cython:
pip install -r requirements/ci.txt
pip install -r requirements/cython.txt
touch .install-cython

frozenlist/%.c: frozenlist/%.pyx
Expand All @@ -15,7 +15,7 @@ frozenlist/%.c: frozenlist/%.pyx
cythonize: .install-cython $(PYXS:.pyx=.c)

.install-deps: $(shell find requirements -type f)
pip install -r requirements/ci.txt
pip install -r requirements/lint.txt -r requirements/test.txt
ifndef CI
pre-commit install
endif
Expand Down
10 changes: 0 additions & 10 deletions requirements/ci.txt

This file was deleted.

1 change: 1 addition & 0 deletions requirements/cython.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cython==3.0.6
4 changes: 3 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
-e . --config-settings=pure-python=false
-r ci.txt
-r test.txt
-r lint.txt
tox==4.11.4
4 changes: 4 additions & 0 deletions requirements/lint.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build
pre-commit==3.5.0
twine
types-setuptools==75.8.0.20250210
4 changes: 4 additions & 0 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r cython.txt
coverage==7.6.1
pytest==7.4.3
pytest-cov==4.1.0