Skip to content

Commit b479e25

Browse files
Merge pull request #180 from nasa/feature/issue-164-use-python312-as-default
Feature/issue 164 use python312 as default
2 parents c93e4aa + 60dbd9b commit b479e25

9 files changed

Lines changed: 264 additions & 330 deletions

File tree

.github/workflows/build-pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212
workflow_dispatch:
1313

1414
env:
15-
POETRY_VERSION: "1.3.2"
16-
PYTHON_VERSION: "3.10"
15+
POETRY_VERSION: "2.1.3"
16+
PYTHON_VERSION: "3.12"
1717
REGISTRY: ghcr.io
1818
IMAGE_NAME: ${{ github.repository }}
1919

@@ -90,7 +90,7 @@ jobs:
9090
echo "venue=ops" >> $GITHUB_ENV
9191
9292
- name: Run Snyk as a blocking step
93-
uses: snyk/actions/python-3.10@master
93+
uses: snyk/actions/python-3.11@master
9494
env:
9595
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
9696
with:
@@ -101,7 +101,7 @@ jobs:
101101
--severity-threshold=high
102102
--fail-on=all
103103
- name: Run Snyk on Python
104-
uses: snyk/actions/python-3.10@master
104+
uses: snyk/actions/python-3.11@master
105105
env:
106106
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
107107
with:

.github/workflows/release-created.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
create
66

77
env:
8-
POETRY_VERSION: "1.3.2"
9-
PYTHON_VERSION: "3.10"
8+
POETRY_VERSION: "2.1.3"
9+
PYTHON_VERSION: "3.12"
1010

1111
jobs:
1212
# First job in the workflow builds and verifies the software artifacts

.github/workflows/run_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ on:
1313
workflow_dispatch:
1414

1515
env:
16-
POETRY_VERSION: "1.3.2"
17-
PYTHON_VERSION: "3.10"
16+
POETRY_VERSION: "2.1.3"
17+
PYTHON_VERSION: "3.12"
1818

1919
jobs:
2020
build_and_test:

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ci:
55
autofix_prs: false # Comment "pre-commit.ci autofix" on a PR to trigger
66

77
default_language_version:
8-
python: python3.10
8+
python: python3.12
99

1010
repos:
1111
- repo: https://github.com/gitleaks/gitleaks
@@ -14,7 +14,7 @@ repos:
1414
- id: gitleaks
1515

1616
- repo: https://github.com/pre-commit/pre-commit-hooks
17-
rev: v5.0.0
17+
rev: v6.0.0
1818
hooks:
1919
# Validate format
2020
- id: check-yaml
@@ -38,7 +38,7 @@ repos:
3838
- id: trailing-whitespace
3939

4040
- repo: https://github.com/astral-sh/ruff-pre-commit
41-
rev: v0.12.7
41+
rev: v0.12.9
4242
hooks:
4343
- id: ruff
4444
args: ["--fix", "--exit-non-zero-on-fix"]

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Changed
1010

1111
- update grouping algorithm to use day in US Central as the first part of unique grouping identifier ([#177](https://github.com/nasa/batchee/pull/177))([**@ank1m**](https://github.com/ank1m))
12-
- update package name to match repository name (#171)([**@danielfromearth**](https://github.com/danielfromearth))
12+
- update package name to match repository name ([#171](https://github.com/nasa/batchee/pull/171))([**@danielfromearth**](https://github.com/danielfromearth))
13+
- update the default python version from 3.10 to 3.12 ([#180](https://github.com/nasa/batchee/pull/180))([**@danielfromearth**](https://github.com/danielfromearth))
1314

1415
## [1.3.0] - 2024-11-19
1516

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM python:3.10-slim
2+
FROM python:3.12-slim
33

44
RUN apt-get update \
55
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<a href="https://www.repostatus.org/#active" target="_blank">
99
<img src="https://www.repostatus.org/badges/latest/active.svg" alt="Project Status: Active – The project has reached a stable, usable state and is being actively developed">
1010
</a>
11-
<a href="http://mypy-lang.org/" target="_blank">
12-
<img src="http://www.mypy-lang.org/static/mypy_badge.svg" alt="Mypy checked">
11+
<a href="https://mypy-lang.org/" target="_blank">
12+
<img src="https://www.mypy-lang.org/static/mypy_badge.svg" alt="Mypy checked">
1313
</a>
1414
<a href="https://pypi.org/project/batchee/" target="_blank">
1515
<img src="https://img.shields.io/pypi/pyversions/batchee.svg" alt="Python Versions">

poetry.lock

Lines changed: 222 additions & 299 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,45 @@
1-
[tool.poetry]
1+
[build-system]
2+
requires = ["poetry-core"]
3+
build-backend = "poetry.core.masonry.api"
4+
5+
[project]
26
name = "batchee"
3-
version = "1.4.0rc2"
7+
dynamic = [
8+
"version",
9+
"classifiers"
10+
]
411
description = "Determine how to group together input files into batches for subsequent concatenation"
5-
authors = ["Daniel Kaufman <daniel.kaufman@nasa.gov>"]
12+
license = "Apache-2.0"
613
readme = "README.md"
7-
classifiers = [
8-
"Topic :: Software Development :: Libraries :: Python Modules"
14+
requires-python = ">=3.12,<4"
15+
authors = [
16+
{ name = "Daniel Kaufman", email = "daniel.kaufman@nasa.gov" }
917
]
10-
packages = [
11-
{ include = "batchee" },
18+
dependencies = [
19+
"harmony-service-lib (>=2.0.0)",
1220
]
1321

14-
[tool.poetry.dependencies]
15-
python = "^3.10"
16-
harmony-service-lib = ">=2.0.0"
22+
[project.urls]
23+
Repository = "https://github.com/nasa/batchee"
24+
Changelog = "https://github.com/nasa/batchee/blob/main/CHANGELOG.md"
1725

18-
[tool.poetry.scripts]
26+
[project.scripts]
1927
batchee_harmony = 'batchee.harmony.cli:main'
2028
batchee = 'batchee.tempo_filename_parser:main'
2129

30+
[tool.poetry]
31+
version = "1.8.0a0"
32+
packages = [
33+
{ include = "batchee" },
34+
]
35+
2236
[tool.poetry.group.dev.dependencies]
2337
coverage = ">=7.8.0"
2438
ruff = ">=0.11.8"
2539
pytest = ">=8.3.5"
2640
mypy = ">=1.15.0"
2741
pytest-cov = ">=6.1.1"
2842

29-
[build-system]
30-
requires = ["poetry-core"]
31-
build-backend = "poetry.core.masonry.api"
32-
3343
[[tool.mypy.overrides]]
3444
module = [
3545
"harmony.*",
@@ -46,7 +56,7 @@ exclude = [
4656
]
4757
# Allow lines to be as long as 100.
4858
line-length = 100
49-
target-version = "py310"
59+
target-version = "py312"
5060

5161
[tool.ruff.lint]
5262
# E402: module level import not at top of file

0 commit comments

Comments
 (0)