Commit 2ad02000 authored by Shriwise, Patrick's avatar Shriwise, Patrick
Browse files

Merge branch 'python_vers' into 'development'

Python versioning + house keeping

See merge request nstauff/PyGriffin!16
parents 75bba0e4 2538eb8d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
**/*__pycache__
*.code-workspace
.pygriffin.rc
pygriffin.egg-info/
 No newline at end of file

.pygriffin.rc

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
[exec]
 No newline at end of file
+7 −2
Original line number Diff line number Diff line
import copy
from collections import Iterable
import sys
from pathlib import Path

import numpy as np

PYTHON_VERSION = sys.version_info
if PYTHON_VERSION.minor < 10:
    from collections import Iterable
else:
    from collections.abc import Iterable

# Provided from OpenMC (commit c8003e0)
# modified to remove f-strings for compatibility with Python 2

+9 −3
Original line number Diff line number Diff line
from collections import Iterable
from numbers import Integral, Real
import sys
import os
from pathlib import Path
import subprocess
@@ -8,6 +8,12 @@ import warnings
from . import checkvalue as cv
from .config import PyGriffinConfig

PYTHON_VERSION = sys.version_info
if PYTHON_VERSION.minor < 10:
    from collections import Iterable
else:
    from collections.abc import Iterable

class PyGriffin:
    """
    Class for connecting PyGriffin inputs and running the problems