| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -103,10 +103,10 @@ commands: | |||
| 103 | 103 | - run: | |
| 104 | 104 | name: Install Python dependencies | |
| 105 | 105 | command: | | |
| 106 | - python -m pip install --user -r requirements/dev/build-requirements.txt | ||
| 106 | + python -m pip install --user --group build | ||
| 107 | 107 | python -m pip install --user \ | |
| 108 | 108 | numpy<< parameters.numpy_version >> \ | |
| 109 | - -r requirements/doc/doc-requirements.txt | ||
| 109 | + --group doc | ||
| 110 | 110 | python -m pip install --no-deps --user \ | |
| 111 | 111 | git+https://github.com/matplotlib/mpl-sphinx-theme.git | |
| 112 | 112 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -143,7 +143,7 @@ jobs: | |||
| 143 | 143 | uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 | |
| 144 | 144 | with: | |
| 145 | 145 | path: C:\cygwin\home\runneradmin\.cache\pip | |
| 146 | - key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('requirements/*/*.txt') }} | ||
| 146 | + key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('pyproject.toml') }} | ||
| 147 | 147 | restore-keys: ${{ matrix.os }}-py3.${{ matrix.python-minor-version }}-pip- | |
| 148 | 148 | ||
| 149 | 149 | - name: Cache ccache | |
@@ -174,15 +174,9 @@ jobs: | |||
| 174 | 174 | - name: Install Python dependencies | |
| 175 | 175 | shell: bash.exe -eo pipefail -o igncr "{0}" | |
| 176 | 176 | run: | | |
| 177 | - python -m pip install --upgrade pip setuptools wheel | ||
| 178 | - python -m pip install kiwisolver 'numpy>=1.22,<1.26' pillow importlib_resources | ||
| 179 | - grep -v -F -e psutil requirements/testing/all.txt >requirements_test.txt | ||
| 180 | - python -m pip install meson-python pybind11 | ||
| 177 | + python -m pip install --group build 'numpy>=1.25,<1.26' | ||
| 181 | 178 | export PATH="/usr/local/bin:$PATH" | |
| 182 | - python -m pip install --no-build-isolation 'contourpy>=1.0.1' | ||
| 183 | - python -m pip install --upgrade cycler fonttools \ | ||
| 184 | - packaging pyparsing python-dateutil setuptools-scm \ | ||
| 185 | - -r requirements_test.txt sphinx ipython | ||
| 179 | + python -m pip install --upgrade --group test sphinx ipython | ||
| 186 | 180 | python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject && | |
| 187 | 181 | python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' && | |
| 188 | 182 | echo 'PyGObject is available' || | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -66,7 +66,7 @@ jobs: | |||
| 66 | 66 | python-version: '3.11' | |
| 67 | 67 | ||
| 68 | 68 | - name: Install mypy | |
| 69 | - run: pip3 install -r requirements/testing/mypy.txt -r requirements/testing/all.txt | ||
| 69 | + run: pip3 install --group build --group typing | ||
| 70 | 70 | ||
| 71 | 71 | - name: Set up reviewdog | |
| 72 | 72 | uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -50,14 +50,14 @@ jobs: | |||
| 50 | 50 | - name-suffix: "(Minimum Versions)" | |
| 51 | 51 | os: ubuntu-22.04 | |
| 52 | 52 | python-version: '3.11' | |
| 53 | - extra-requirements: '-c requirements/testing/minver.txt' | ||
| 53 | + extra-requirements: '--group test-minver' | ||
| 54 | 54 | delete-font-cache: true | |
| 55 | 55 | # https://github.com/matplotlib/matplotlib/issues/29844 | |
| 56 | 56 | pygobject-ver: '<3.52.0' | |
| 57 | 57 | - os: ubuntu-22.04 | |
| 58 | 58 | python-version: '3.11' | |
| 59 | 59 | CFLAGS: "-fno-lto" # Ensure that disabling LTO works. | |
| 60 | - extra-requirements: '-r requirements/testing/extra.txt' | ||
| 60 | + extra-requirements: '--group test-extra' | ||
| 61 | 61 | # https://github.com/matplotlib/matplotlib/issues/29844 | |
| 62 | 62 | pygobject-ver: '<3.52.0' | |
| 63 | 63 | - name-suffix: "(Extra TeX packages)" | |
@@ -182,15 +182,15 @@ jobs: | |||
| 182 | 182 | if: startsWith(runner.os, 'Linux') | |
| 183 | 183 | with: | |
| 184 | 184 | path: ~/.cache/pip | |
| 185 | - key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }} | ||
| 185 | + key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }} | ||
| 186 | 186 | restore-keys: | | |
| 187 | 187 | ${{ matrix.os }}-py${{ matrix.python-version }}-pip- | |
| 188 | 188 | - name: Cache pip | |
| 189 | 189 | uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 | |
| 190 | 190 | if: startsWith(runner.os, 'macOS') | |
| 191 | 191 | with: | |
| 192 | 192 | path: ~/Library/Caches/pip | |
| 193 | - key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }} | ||
| 193 | + key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }} | ||
| 194 | 194 | restore-keys: | | |
| 195 | 195 | ${{ matrix.os }}-py${{ matrix.python-version }}-pip- | |
| 196 | 196 | - name: Cache ccache | |
@@ -227,12 +227,8 @@ jobs: | |||
| 227 | 227 | ||
| 228 | 228 | # Install dependencies from PyPI. | |
| 229 | 229 | # Preinstall build requirements to enable no-build-isolation builds. | |
| 230 | - python -m pip install --upgrade $PRE \ | ||
| 231 | - 'contourpy>=1.0.1' cycler fonttools kiwisolver importlib_resources \ | ||
| 232 | - packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \ | ||
| 233 | - 'meson-python>=0.13.1' 'pybind11>=2.13.2' \ | ||
| 234 | - -r requirements/testing/all.txt \ | ||
| 235 | - ${{ matrix.extra-requirements }} | ||
| 230 | + python -m pip install --upgrade $PRE --prefer-binary \ | ||
| 231 | + --group build --group test ${{ matrix.extra-requirements }} | ||
| 236 | 232 | ||
| 237 | 233 | # Install optional dependencies from PyPI. | |
| 238 | 234 | # Sphinx is needed to run sphinxext tests | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -74,8 +74,8 @@ stages: | |||
| 74 | 74 | ||
| 75 | 75 | - bash: | | |
| 76 | 76 | python -m pip install --upgrade pip | |
| 77 | - python -m pip install --upgrade -r requirements/dev/build-requirements.txt | ||
| 78 | - python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt | ||
| 77 | + python -m pip install --upgrade --group build | ||
| 78 | + python -m pip install --prefer-binary --group test --group test-extra | ||
| 79 | 79 | displayName: 'Install dependencies with pip' | |
| 80 | 80 | ||
| 81 | 81 | - bash: | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,11 @@ | |||
| 1 | + pip 25.1 suggested for development | ||
| 2 | + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 3 | + | ||
| 4 | + Dependencies for development (build and testing) are now specified as `Dependency Groups | ||
| 5 | + <https://packaging.python.org/en/latest/specifications/dependency-groups/#dependency-groups>`_ | ||
| 6 | + instead of `individual requirements files | ||
| 7 | + <https://pip.pypa.io/en/stable/reference/requirements-file-format/>`_. | ||
| 8 | + | ||
| 9 | + Consequently, a version of pip that supports Dependency Groups is suggested, namely | ||
| 10 | + version 25.1 or higher. Note that if you install build/testing dependencies manually (by | ||
| 11 | + copying the list from ``pyproject.toml``), then an older version of pip is sufficient. | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -177,7 +177,8 @@ setup. | |||
| 177 | 177 | ||
| 178 | 178 | Install the Python dependencies with :: | |
| 179 | 179 | ||
| 180 | - pip install -r requirements/dev/dev-requirements.txt | ||
| 180 | + pip install -U pip # You may skip this step if pip 25.1 is already available. | ||
| 181 | + pip install --group dev | ||
| 181 | 182 | ||
| 182 | 183 | Remember to activate the environment whenever you start working on Matplotlib! | |
| 183 | 184 | ||
@@ -270,7 +271,7 @@ Install Matplotlib in editable mode | |||
| 270 | 271 | Install Matplotlib in editable mode from the :file:`matplotlib` directory using the | |
| 271 | 272 | command :: | |
| 272 | 273 | ||
| 273 | - python -m pip install --verbose --no-build-isolation --editable ".[dev]" | ||
| 274 | + python -m pip install --verbose --no-build-isolation --group dev --editable . | ||
| 274 | 275 | ||
| 275 | 276 | The 'editable/develop mode' builds everything and places links in your Python environment | |
| 276 | 277 | so that Python will be able to import Matplotlib from your development source directory. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -439,7 +439,7 @@ To build the documentation you must have the tagged version installed, but | |||
| 439 | 439 | build the docs from the ``ver-doc`` branch. An easy way to arrange this is:: | |
| 440 | 440 | ||
| 441 | 441 | pip install matplotlib | |
| 442 | - pip install -r requirements/doc/doc-requirements.txt | ||
| 442 | + pip install --group doc | ||
| 443 | 443 | git checkout v3.7.0-doc | |
| 444 | 444 | git clean -xfd | |
| 445 | 445 | make -Cdoc O="-t release -j$(nproc)" html latexpdf LATEXMKOPTS="-silent -f" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -396,17 +396,11 @@ Documentation dependencies | |||
| 396 | 396 | Python | |
| 397 | 397 | ------ | |
| 398 | 398 | ||
| 399 | - The additional Python packages required to build the | ||
| 400 | - :ref:`documentation <documenting-matplotlib>` are listed in | ||
| 401 | - :file:`doc-requirements.txt` and can be installed using :: | ||
| 402 | - | ||
| 403 | - pip install -r requirements/doc/doc-requirements.txt | ||
| 404 | - | ||
| 405 | - The content of :file:`doc-requirements.txt` is also shown below: | ||
| 406 | - | ||
| 407 | - .. include:: ../../requirements/doc/doc-requirements.txt | ||
| 408 | - :literal: | ||
| 399 | + The additional Python packages required to build the :ref:`documentation | ||
| 400 | + <documenting-matplotlib>` are listed in :file:`pyproject.toml` and can be | ||
| 401 | + installed using :: | ||
| 409 | 402 | ||
| 403 | + pip install --group doc | ||
| 410 | 404 | ||
| 411 | 405 | .. _doc-dependencies-external: | |
| 412 | 406 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,7 +2,7 @@ | |||
| 2 | 2 | # | |
| 3 | 3 | # conda env create -f environment.yml | |
| 4 | 4 | # conda activate mpl-dev | |
| 5 | - # pip install --verbose --no-build-isolation --editable ".[dev]" | ||
| 5 | + # pip install --verbose --no-build-isolation --group dev --editable . | ||
| 6 | 6 | # | |
| 7 | 7 | --- | |
| 8 | 8 | name: mpl-dev | |
| Back | FazBrowse Home | New Git URL |
0 commit comments