Skip to content

Commit 79733a3

Browse files
authored
Merge branch 'main' into drop-use-of-entrypoints
2 parents 762313b + cff4f8e commit 79733a3

File tree

16 files changed

+45
-42
lines changed

16 files changed

+45
-42
lines changed

.github/codecov.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ coverage:
55
precision: 2
66
round: down
77
range: "70...100"
8-
threshold: 1%
8+
status:
9+
project:
10+
default:
11+
target: auto
12+
threshold: 1%
13+
patch:
14+
default:
15+
target: auto
16+
threshold: 1%
17+
918

1019
parsers:
1120
gcov:

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
name: "Python ${{ matrix.python-version }}"
1313
runs-on: "ubuntu-latest"
1414
env:
15-
USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12'
15+
USING_COVERAGE: '3.10,3.11,3.12,3.13'
1616

1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
20+
python-version: ["3.10", "3.11", "3.12", "3.13"]
2121

2222
steps:
2323
- uses: "actions/checkout@v4"
@@ -42,7 +42,7 @@ jobs:
4242
uses: codecov/codecov-action@v4
4343

4444
others:
45-
runs-on: ubuntu-20.04
45+
runs-on: ubuntu-24.04
4646
strategy:
4747
fail-fast: false
4848
matrix:
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v4
5454
- uses: actions/setup-python@v5
5555
with:
56-
python-version: 3.11
56+
python-version: 3.13
5757
- name: "Install dependencies"
5858
run: |
5959
set -xe

.readthedocs.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ version: 2
77

88
# Set the version of Python and other tools you might need
99
build:
10-
os: ubuntu-22.04
10+
os: ubuntu-24.04
1111
tools:
12-
python: "3.11"
12+
python: "3.13"
1313

1414
# Build documentation in the docs/ directory with Sphinx
1515
sphinx:
@@ -19,7 +19,9 @@ sphinx:
1919
formats:
2020
- pdf
2121

22-
# Optionally set the version of Python and requirements required to build your docs
2322
python:
2423
install:
25-
- requirements: requirements/docs.txt
24+
- method: pip
25+
path: .
26+
extra_requirements:
27+
- docs

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ recursive-include papermill *.txt
88

99
include setup.py
1010
include requirements.txt
11-
include tox_py_installer.sh
1211
recursive-include requirements *.txt
1312
include tox.ini
1413
include pytest.ini

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pip install papermill[all]
5555

5656
## Python Version Support
5757

58-
This library currently supports Python 3.8+ versions. As minor Python
58+
This library currently supports Python 3.10+ versions. As minor Python
5959
versions are officially sunset by the Python org papermill will similarly
6060
drop support in the future.
6161

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This opens up new opportunities for how notebooks can be used. For example:
3434
Python Version Support
3535
----------------------
3636

37-
This library currently supports python 3.8+ versions. As minor python
37+
This library currently supports python 3.10+ versions. As minor python
3838
versions are officially sunset by the python org papermill will similarly
3939
drop support in the future.
4040

papermill/engines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def __init__(self, nb, output_path=None, log_output=False, progress_bar=True, au
121121

122122
def now(self):
123123
"""Helper to return current UTC time"""
124-
return datetime.datetime.utcnow()
124+
return datetime.datetime.now(datetime.timezone.utc)
125125

126126
def set_timer(self):
127127
"""

papermill/parameterize.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from datetime import datetime
1+
from datetime import datetime, timezone
22
from uuid import uuid4
33

44
import nbformat
@@ -23,7 +23,7 @@ def add_builtin_parameters(parameters):
2323
"pm": {
2424
"run_uuid": str(uuid4()),
2525
"current_datetime_local": datetime.now(),
26-
"current_datetime_utc": datetime.utcnow(),
26+
"current_datetime_utc": datetime.now(timezone.utc),
2727
}
2828
}
2929

papermill/tests/test_execute.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ def setUp(self):
175175
def tearDown(self):
176176
shutil.rmtree(self.test_dir)
177177

178+
@unittest.skip("FIX: Test is broken")
178179
def test(self):
179180
path = get_notebook_path('broken2.ipynb')
180181
result_path = os.path.join(self.test_dir, 'broken2.ipynb')
@@ -439,6 +440,7 @@ def setUp(self):
439440
def tearDown(self):
440441
shutil.rmtree(self.test_dir)
441442

443+
@unittest.skip("FIX: Test is broken")
442444
def test_output_formatting(self):
443445
notebook_name = 'sysexit1.ipynb'
444446
result_path = os.path.join(self.test_dir, f'output_{notebook_name}')
@@ -447,7 +449,6 @@ def test_output_formatting(self):
447449
# exception should be thrown by now
448450
self.assertFalse(True)
449451
except PapermillExecutionError as ex:
450-
self.assertEqual(ex.traceback[1], "\x1b[0;31mSystemExit\x1b[0m\x1b[0;31m:\x1b[0m 1\n")
451452
self.assertEqual(strip_color(ex.traceback[1]), "SystemExit: 1\n")
452453

453454
nb = load_notebook_node(result_path)

papermill/tests/test_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ def test_chdir():
5656
old_cwd = Path.cwd()
5757
with TemporaryDirectory() as temp_dir:
5858
with chdir(temp_dir):
59-
assert Path.cwd() != old_cwd
60-
assert Path.cwd() == Path(temp_dir)
59+
assert Path.cwd().resolve() != old_cwd.resolve()
60+
assert Path.cwd().resolve() == Path(temp_dir).resolve()
6161

6262
assert Path.cwd() == old_cwd
6363

0 commit comments

Comments
 (0)