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.

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

MAINT: Update packages #2195

Merged
merged 3 commits into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from all 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: 2 additions & 2 deletions .github/workflows/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
python-version: ["3.10"]
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install requirements (Python 3)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/github-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run:
sudo apt-get install ghostscript
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Cache Downloaded Files
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Cache Downloaded Files
Expand Down Expand Up @@ -143,8 +143,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{env.PYTHON_LATEST}}

Expand All @@ -166,8 +166,8 @@ jobs:
needs: tests

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
# Use latest Python, so it understands all syntax.
python-version: ${{env.PYTHON_LATEST}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
# Ensure it's on PyPI
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
# hooks:
# - id: mypy
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.9.1
hooks:
- id: black
args: [--target-version, py36]
Expand All @@ -33,12 +33,12 @@ repos:
additional_dependencies: [black==22.1.0]
exclude: "docs/user/robustness.md"
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.285
rev: v0.0.290
hooks:
- id: ruff
args: ['--fix']
- repo: https://github.com/asottile/pyupgrade
rev: v3.10.1
rev: v3.11.0
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand Down
2 changes: 1 addition & 1 deletion pypdf/_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ def _merge_page(
annots = page[PG.ANNOTS]
if isinstance(annots, ArrayObject):
for ref in annots:
new_annots.append(ref) # noqa: PERF402
new_annots.append(ref)

for res in (
RES.EXT_G_STATE,
Expand Down
2 changes: 1 addition & 1 deletion pypdf/_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2955,7 +2955,7 @@ def merge(
excluded_fields = ()
# Find the range of pages to merge.
if pages is None:
pages = list(range(0, len(reader.pages)))
pages = list(range(len(reader.pages)))
elif isinstance(pages, PageRange):
pages = list(range(*pages.indices(len(reader.pages))))
elif isinstance(pages, list):
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci-3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements/ci-3.11.txt requirements/ci.in
# pip-compile --config=pyproject.toml --output-file=requirements/ci-3.11.txt requirements/ci.in
#
attrs==23.1.0
# via flake8-bugbear
Expand Down Expand Up @@ -59,7 +59,7 @@ pytest-socket==0.6.0
# via -r requirements/ci.in
pytest-timeout==2.1.0
# via -r requirements/ci.in
ruff==0.0.285
ruff==0.0.290
# via -r requirements/ci.in
typeguard==4.1.2
# via -r requirements/ci.in
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ pycodestyle==2.9.1
# via
# flake8
# flake8-print
pycryptodome==3.18.0
pycryptodome==3.19.0
# via -r requirements/ci.in
pyflakes==2.5.0
# via flake8
pyparsing==3.1.0
pyparsing==3.1.1
# via packaging
pytest==7.0.1
# via
Expand All @@ -85,7 +85,7 @@ typeguard==2.13.3
# via -r requirements/ci.in
types-dataclasses==0.6.6
# via -r requirements/ci.in
types-pillow==10.0.0.2
types-pillow==10.0.0.3
# via -r requirements/ci.in
typing-extensions==4.1.1
# via
Expand Down
35 changes: 20 additions & 15 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile requirements/dev.in
#
black==23.3.0
# via -r requirements/dev.in
build==0.10.0
build==1.0.3
# via pip-tools
certifi==2023.7.22
# via requests
cfgv==3.3.1
# via pre-commit
charset-normalizer==3.2.0
# via requests
click==8.1.6
click==8.1.7
# via
# black
# pip-tools
Expand All @@ -24,18 +24,20 @@ distlib==0.3.7
# via virtualenv
docutils==0.20.1
# via flit
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via pytest
filelock==3.12.2
# via virtualenv
flit==3.9.0
# via -r requirements/dev.in
flit-core==3.9.0
# via flit
flit==3.9.0
# via -r requirements/dev.in
identify==2.5.24
# via pre-commit
idna==3.4
# via requests
importlib-metadata==6.7.0
# via build
iniconfig==2.0.0
# via pytest
mypy-extensions==1.0.0
Expand All @@ -47,13 +49,13 @@ packaging==23.1
# black
# build
# pytest
pathspec==0.11.1
pathspec==0.11.2
# via black
pillow==9.5.0
# via -r requirements/dev.in
pip-tools==6.14.0
# via -r requirements/dev.in
platformdirs==3.9.1
platformdirs==3.10.0
# via
# black
# virtualenv
Expand All @@ -63,35 +65,38 @@ pre-commit==2.17.0
# via -r requirements/dev.in
pyproject-hooks==1.0.0
# via build
pytest==7.4.0
# via pytest-cov
pytest-cov==4.1.0
# via -r requirements/dev.in
pytest==7.4.2
# via pytest-cov
pyyaml==6.0.1
# via pre-commit
requests==2.31.0
# via flit
toml==0.10.2
# via pre-commit
tomli-w==1.0.0
# via flit
tomli==2.0.1
# via
# black
# build
# coverage
# pip-tools
# pyproject-hooks
# pytest
tomli-w==1.0.0
# via flit
typing-extensions==4.7.1
# via black
urllib3==2.0.4
# via requests
virtualenv==20.24.1
virtualenv==20.24.5
# via pre-commit
wheel==0.41.0
wheel==0.41.2
# via
# -r requirements/dev.in
# pip-tools
zipp==3.15.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
6 changes: 3 additions & 3 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ myst-parser==0.16.1
# via -r requirements/docs.in
packaging==23.1
# via sphinx
pygments==2.15.1
pygments==2.16.1
# via sphinx
pytz==2023.3
pytz==2023.3.post1
# via babel
pyyaml==6.0.1
# via myst-parser
Expand All @@ -61,7 +61,7 @@ sphinx==4.5.0
# myst-parser
# sphinx-rtd-theme
# sphinxcontrib-jquery
sphinx-rtd-theme==1.2.2
sphinx-rtd-theme==1.3.0
# via -r requirements/docs.in
sphinxcontrib-applehelp==1.0.2
# via sphinx
Expand Down
Loading