Skip to content

Commit 3b7766f

Browse files
MicahGaleMicahGale
authored
Merge pull request #823 from idaholab/minor-rel-dev
Stage release 1.2.0
2 parents 4b3d803 + 5bccc08 commit 3b7766f

File tree

14 files changed

+210
-62
lines changed

14 files changed

+210
-62
lines changed

‎.github/workflows/deploy-alpha.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v5
13-
- name: set up python 3.12
13+
- name: set up python 3.14
1414
uses: actions/setup-python@v6
1515
with:
16-
python-version: 3.12
16+
python-version: 3.14
1717
- run: pip install . montepy[develop]
1818
- run: python -m pytest
1919

@@ -31,10 +31,10 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333
fetch-tags: true
34-
- name: set up python 3.12
34+
- name: set up python 3.14
3535
uses: actions/setup-python@v6
3636
with:
37-
python-version: 3.12
37+
python-version: 3.14
3838
- run: pip install . montepy[build]
3939
- name: Get Version
4040
id: get_version
@@ -102,6 +102,3 @@ jobs:
102102
- name: Publish distribution 📦 to PyPI
103103
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
104104

105-
106-
107-

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v5
13-
- name: set up python 3.12
13+
- name: set up python 3.14
1414
uses: actions/setup-python@v6
1515
with:
16-
python-version: 3.12
16+
python-version: 3.14
1717
- run: pip install . montepy[develop]
1818
- run: python -m pytest
1919

@@ -32,10 +32,10 @@ jobs:
3232
with:
3333
fetch-depth: 0
3434
fetch-tags: true
35-
- name: set up python 3.12
35+
- name: set up python 3.14
3636
uses: actions/setup-python@v6
3737
with:
38-
python-version: 3.12
38+
python-version: 3.14
3939
- run: pip install . montepy[build]
4040
- name: Get Version
4141
id: get_version

‎.github/workflows/main.yml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ name: CI testing
22

33
on:
44
pull_request:
5-
branches: [develop, alpha-test-dev, alpha-test]
5+
branches: [develop, alpha-test-dev, alpha-test, minor-rel-dev]
66
push:
7-
branches: [develop, main, alpha-test]
7+
branches: [develop, main, alpha-test, minor-rel-dev]
88

99
jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
14+
python-version: ["3.12", "3.13", "3.14"]
1515

1616
steps:
1717
- uses: actions/checkout@v5
@@ -43,7 +43,7 @@ jobs:
4343
- run: pip freeze
4444
- name: Upload build artifacts
4545
uses: actions/upload-artifact@v4
46-
if: ${{ matrix.python-version == '3.12'}}
46+
if: ${{ matrix.python-version == '3.13'}}
4747
with:
4848
name: build
4949
path: dist/*
@@ -54,12 +54,12 @@ jobs:
5454
actions: write
5555
strategy:
5656
matrix:
57-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
58-
numpy-version: ["1.0", "2.0"]
57+
python-version: ["3.12", "3.13", "3.14"]
58+
numpy-version: ["2.0", "2.3"]
5959
sly-version: ["0.5"]
6060
include:
61-
- python-version: "3.11"
62-
numpy-version: "2.0"
61+
- python-version: "3.13"
62+
numpy-version: "2.3"
6363
sly-version: "0.4"
6464

6565
steps:
@@ -83,19 +83,19 @@ jobs:
8383
- run: coverage xml
8484
if: ${{ success() || failure() }}
8585
- name: Upload test report
86-
if: ${{ matrix.python-version == '3.12' && matrix.numpy-version == '2.0' && (success() || failure() )}}
86+
if: ${{ matrix.python-version == '3.14' && matrix.numpy-version == '2.3' && (success() || failure() )}}
8787
uses: actions/upload-artifact@v4
8888
with:
8989
name: test
9090
path: test_report.xml
9191
- name: Upload coverage report
92-
if: ${{ matrix.python-version == '3.12' && matrix.numpy-version == '2.0' && (success() || failure() )}}
92+
if: ${{ matrix.python-version == '3.14' && matrix.numpy-version == '2.3' && (success() || failure() )}}
9393
uses: actions/upload-artifact@v4
9494
with:
9595
name: coverage
9696
path: coverage.xml
9797
- name: Coveralls GitHub Action
98-
if: ${{ matrix.python-version == '3.12' && matrix.numpy-version == '2.0' && (success() || failure() )}}
98+
if: ${{ matrix.python-version == '3.14' && matrix.numpy-version == '2.3' && (success() || failure() )}}
9999
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
100100
with:
101101
file: coverage.xml
@@ -116,7 +116,7 @@ jobs:
116116
- name: set up python 3.12
117117
uses: actions/setup-python@v6
118118
with:
119-
python-version: 3.12
119+
python-version: 3.14
120120
- run: pip install . montepy[doc,build]
121121
- run: sphinx-build doc/source/ doc/build/html -W --keep-going -E
122122
name: Build site strictly
@@ -141,10 +141,10 @@ jobs:
141141
with:
142142
fetch-depth: 0
143143
fetch-tags: true
144-
- name: set up python 3.12
144+
- name: set up python 3.14
145145
uses: actions/setup-python@v6
146146
with:
147-
python-version: 3.12
147+
python-version: 3.14
148148
- run: pip install . montepy[doc,build,demo-test,test]
149149
- run: python -m phmutest README.md --replmode --log
150150
name: Test readme code
@@ -161,11 +161,12 @@ jobs:
161161
runs-on: ubuntu-latest
162162

163163
steps:
164+
164165
- uses: actions/checkout@v5
165-
- name: set up python 3.12
166+
- name: set up python 3.14
166167
uses: actions/setup-python@v6
167168
with:
168-
python-version: 3.12
169+
python-version: 3.14
169170
- run: pip install . montepy[format]
170171
- run: black --check montepy/ tests/
171172

@@ -174,10 +175,10 @@ jobs:
174175

175176
steps:
176177
- uses: actions/checkout@v5
177-
- name: set up python 3.12
178+
- name: set up python 3.14
178179
uses: actions/setup-python@v6
179180
with:
180-
python-version: 3.12
181+
python-version: 3.14
181182
- run: pip install . montepy[test]
182183
- run: pytest --profile
183184
name: Profile test suite
@@ -191,10 +192,10 @@ jobs:
191192

192193
steps:
193194
- uses: actions/checkout@v5
194-
- name: set up python 3.12
195+
- name: set up python 3.14
195196
uses: actions/setup-python@v6
196197
with:
197-
python-version: 3.12
198+
python-version: 3.14
198199
- run: pip install . montepy[test]
199200
- run: python benchmark/benchmark_big_model.py
200201
name: Benchmark against big model

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
[![PyPI version](https://badge.fury.io/py/montepy.svg)](https://badge.fury.io/py/montepy)
1616
[![Conda Version](https://img.shields.io/conda/vn/conda-forge/montepy.svg)](https://anaconda.org/conda-forge/montepy)
1717
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/montepy.svg)](https://pypi.org/project/montepy/)
18+
[![SPEC 0 — Minimum Supported Dependencies](https://img.shields.io/badge/SPEC-0-green?labelColor=%23004811&color=%235CA038)](https://scientific-python.org/specs/spec-0000/)
1819

1920
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.15185506.svg)](https://doi.org/10.5281/zenodo.15185506)
2021

‎doc/source/changelog.rst‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22
MontePy Changelog
33
*****************
44

5+
1.2 releases
6+
============
7+
8+
#Next Version#
9+
--------------
10+
11+
12+
**Features Added**
13+
14+
* Make `LatticeType.RECTANGULAR` and `LatticeType.HEXAHEDRAL` synonymous (:issue:`808`).
15+
* Allow setting ``cell.fill.universes`` with a numpy array of universe IDs (:issue:`736`).
16+
17+
**Bugs Fixed**
18+
19+
* Fixed bug where lines that were the allowed length was raising a ``LineOverRunWarning`` when read by MontePy (:issue:`517`).
20+
* Added descriptive TypeError messages (:issue:`801`)
21+
22+
**Documentation**
23+
24+
* Improved documentation for NumberedObjectCollections on Slicing behavior. (:issue:`798`)
25+
26+
**Deprecations**
27+
28+
* Dropped support for python 3.9 through 3.11, and numpy 1.26 in order to comply with `SPEC 0 <https://scientific-python.org/specs/spec-0000/>`_ (:issue:`780`).
29+
530
1.1 releases
631
============
732

@@ -15,11 +40,8 @@ MontePy Changelog
1540
**Bugs Fixed**
1641

1742
* Fixed bug where lines that were the allowed length was raising a ``LineOverRunWarning`` when read by MontePy (:issue:`517`).
18-
1943
* Added descriptive TypeError messages (:issue:`801`)
2044

21-
22-
2345
1.1.2
2446
--------------
2547

‎doc/source/conf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,13 @@
9898
"manual63": (UM63 + "#subsection.%s", "MCNP 6.3.0 manual § %s"),
9999
"manual63part": (UM63 + "#part.%s", "MCNP 6.3.0 manual part %s"),
100100
"manual63chapter": (UM63 + "#chapter.%s", "MCNP 6.3.0 manual Ch. %s"),
101+
"manual63sub": (UM63 + "#subsubsection.%s", "MCNP 6.3.0 manual § %s"),
101102
# MCNP 6.3.1 User's Manual
102103
"manual631sec": (UM631 + "#section.%s", "MCNP 6.3.1 manual § %s"),
103104
"manual631": (UM631 + "#subsection.%s", "MCNP 6.3.1 manual § %s"),
104105
"manual631part": (UM631 + "#part.%s", "MCNP 6.3.1 manual part %s"),
105106
"manual631chapter": (UM631 + "#chapter.%s", "MCNP 6.3.1 manual Ch. %s"),
107+
"manual631sub": (UM631 + "#subsubsection.%s", "MCNP 6.3.1 manual § %s"),
106108
# MCNP 6.2 User's manual
107109
"manual62": (UM62 + "#page=%s", "MCNP 6.2 manual p. %s"),
108110
"issue": ("https://github.com/idaholab/MontePy/issues/%s", "#%s"),

‎doc/source/dev_standards.rst‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,21 @@ Here is a quick summary of release types used, that is not meant to be authorita
3737
Features are not locked at this point, and may change.
3838
This is signified by adding ``a\d+`` to the end of the *next* release.
3939

40+
Dependency Support
41+
------------------
42+
43+
MontePy has adopted `SPEC 0 <https://scientific-python.org/specs/spec-0000/>`_.
44+
45+
This project supports:
46+
47+
* All minor versions of Python released 36 months prior to the project, and at minimum the two latest minor versions.
48+
49+
* All minor versions of numpy released in the 24 months prior to the project, and at minimum the last three minor versions.
50+
* In ``pyproject.toml``, the ``requires-python`` variable should be set to the minimum supported version of Python. All supported minor versions of Python should be in the test matrix and have binary artifacts built for the release.
51+
52+
Minimum Python and NumPy version support should be adjusted upward on every major and minor release, but never on a patch release.
53+
54+
4055

4156
Design Philosophy
4257
-----------------

‎montepy/__main__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import glob
44
import montepy
55
from pathlib import Path
6-
import sys
76

87
"""
98
Module to make module executable from CLI.

0 commit comments

Comments
 (0)