Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

centralize testing depends in setup.cfg extra depends #96

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

centralize testing depends in setup.cfg extra depends #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fa61f7
Add "[test]" extra depends (and include in [devel])
yarikoptic Aug 23, 2024
1f1676a
tox.ini - remove custom list of depends for testing: just use extras …
yarikoptic Aug 23, 2024
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
6 changes: 6 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,14 @@ install_requires =
[options.extras_require]
benchmarks =
asv[virtualenv] ~= 0.6.0, < 0.6.2
test =
yarikoptic marked this conversation as resolved.
Show resolved Hide resolved
pytest
pytest-cov
pytest-mock
pytest-rerunfailures
devel =
%(benchmarks)s
%(test)s
pre-commit
all =
%(devel)s
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ minversion = 3.3.0
[testenv]
deps =
dev: joblib @ git+https://github.com/joblib/joblib.git
Copy link
Member

@jwodder jwodder Aug 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This line needs to be kept so that it can be used by the py-dev job in .github/workflows/test.yml (added in #42).

Copy link
Member Author

Choose a reason for hiding this comment

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

oh! So

  • this line means that it defines py-dev tox environment with that extra dependency
  • as long as our CI passes, we can upgrade joblib to not be ~= 1.1 but rather >= 1.1.0, <1.4 ATM or even without upper limit and just react on breakage with dev joblib and if needed preemptively having it fixed etc?

Copy link
Member Author

Choose a reason for hiding this comment

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

meanwhile -- reverted that change, force pushed cleaned up 2nd commit

Copy link
Member

Choose a reason for hiding this comment

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

we can upgrade joblib to not be ~= 1.1 but rather >= 1.1.0, <1.4

What would be the point of that? Note that ~= 1.1 means >= 1.1, <2.0, not >= 1.1, <1.2.

Copy link
Member Author

Choose a reason for hiding this comment

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

you are right, I misunderstood it as <1.2.
meanwhile -- we turned CI green ;-)

pytest
pytest-cov
pytest-mock
pytest-rerunfailures
extras =
test
commands =
pytest --pyargs {posargs} fscacher

Expand Down
Loading