Merge branch 'main' into fix-all-extras

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.2.0
     hooks:
       - id: black
         args: [--target-version=py38]
@@ -9,7 +9,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py38-plus]

CHANGELOG.md

@@ -1,3 +1,32 @@
+## v7.4.0
+
+Features:
+
+- Allow force-enabling or force-disabling colorized output
+  ([#2041](https://github.com/jazzband/pip-tools/pull/2041)). Thanks @aneeshusa
+- Add support for command-specific configuration sections
+  ([#1966](https://github.com/jazzband/pip-tools/pull/1966)). Thanks @chrysle
+- Add options for including build dependencies in compiled output
+  ([#1681](https://github.com/jazzband/pip-tools/pull/1681)). Thanks @apljungquist
+
+Bug Fixes:
+
+- Fix for `src-files` not being used when specified in a config file
+  ([#2015](https://github.com/jazzband/pip-tools/pull/2015)). Thanks @csalerno-asml
+- Fix ignorance of inverted CLI options in config for `pip-sync`
+  ([#1989](https://github.com/jazzband/pip-tools/pull/1989)). Thanks @chrysle
+- Filter out origin ireqs for extra requirements before writing output annotations
+  ([#2011](https://github.com/jazzband/pip-tools/pull/2011)). Thanks @chrysle
+- Make BacktrackingResolver ignore extras when dropping existing constraints
+  ([#1984](https://github.com/jazzband/pip-tools/pull/1984)). Thanks @chludwig-haufe
+- Display `pyproject.toml`'s metatada parsing errors in verbose mode
+  ([#1979](https://github.com/jazzband/pip-tools/pull/1979)). Thanks @szobov
+
+Other Changes:
+
+- Add mention of pip-compile-multi in Other useful tools README section
+  ([#1986](https://github.com/jazzband/pip-tools/pull/1986)). Thanks @peterdemin
+
 ## v7.3.0
 
 09 Aug 2023

README.md

@@ -447,7 +447,7 @@ Sample `.pre-commit-config.yaml`:
 ```yaml
 repos:
   - repo: https://github.com/jazzband/pip-tools
-    rev: 7.3.0
+    rev: 7.4.0
     hooks:
       - id: pip-compile
 ```
@@ -457,7 +457,7 @@ You might want to customize `pip-compile` args by configuring `args` and/or `fil
 ```yaml
 repos:
   - repo: https://github.com/jazzband/pip-tools
-    rev: 7.3.0
+    rev: 7.4.0
     hooks:
       - id: pip-compile
         files: ^requirements/production\.(in|txt)$
@@ -469,7 +469,7 @@ If you have multiple requirement files make sure you create a hook for each file
 ```yaml
 repos:
   - repo: https://github.com/jazzband/pip-tools
-    rev: 7.3.0
+    rev: 7.4.0
     hooks:
       - id: pip-compile
         name: pip-compile setup.py

docs/requirements.txt

@@ -19,12 +19,12 @@ docutils==0.20.1
     #   myst-parser
     #   sphinx
 furo==2023.8.17
-    # via -r docs/requirements.in
+    # via -r requirements.in
 idna==3.4
     # via requests
 imagesize==1.4.1
     # via sphinx
-jinja2==3.1.2
+jinja2==3.1.3
     # via
     #   myst-parser
     #   sphinx
@@ -39,7 +39,7 @@ mdit-py-plugins==0.4.0
 mdurl==0.1.2
     # via markdown-it-py
 myst-parser==2.0.0
-    # via -r docs/requirements.in
+    # via -r requirements.in
 packaging==23.1
     # via
     #   setuptools-scm
@@ -53,14 +53,14 @@ pyyaml==6.0.1
 requests==2.31.0
     # via sphinx
 setuptools-scm==7.1.0
-    # via -r docs/requirements.in
+    # via -r requirements.in
 snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.4.1
     # via beautifulsoup4
 sphinx==7.2.2
     # via
-    #   -r docs/requirements.in
+    #   -r requirements.in
     #   furo
     #   myst-parser
     #   sphinx-basic-ng
@@ -81,7 +81,7 @@ sphinxcontrib-htmlhelp==2.0.4
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-programoutput==0.17
-    # via -r docs/requirements.in
+    # via -r requirements.in
 sphinxcontrib-qthelp==1.0.6
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.8

tests/test_cli_compile.py

@@ -420,8 +420,9 @@ def test_emit_index_url_option(runner, option, expected_output):
 
 
 @pytest.mark.network
-def test_realistic_complex_sub_dependencies(runner):
-    wheels_dir = "wheels"
+def test_realistic_complex_sub_dependencies(runner, tmp_path):
+    wheels_dir = tmp_path / "wheels"
+    wheels_dir.mkdir()
 
     # make a temporary wheel of a fake package
     subprocess.run(
@@ -439,7 +440,7 @@ def test_realistic_complex_sub_dependencies(runner):
     with open("requirements.in", "w") as req_in:
         req_in.write("fake_with_deps")  # require fake package
 
-    out = runner.invoke(cli, ["-n", "--rebuild", "-f", wheels_dir])
+    out = runner.invoke(cli, ["-n", "--rebuild", "-f", wheels_dir.as_posix()])
 
     assert out.exit_code == 0