mirror of
https://github.com/openmc-dev/openmc.git
synced 2026-07-28 22:26:08 -04:00
Merge pull request #1860 from paulromano/python-3.6
Update minimum Python version to 3.6
This commit is contained in:
commit
5c06e33b6b
6 changed files with 7 additions and 17 deletions
|
|
@ -484,7 +484,7 @@ to install the Python package in :ref:`"editable" mode <devguide_editable>`.
|
|||
Prerequisites
|
||||
-------------
|
||||
|
||||
The Python API works with Python 3.5+. In addition to Python itself, the API
|
||||
The Python API works with Python 3.6+. In addition to Python itself, the API
|
||||
relies on a number of third-party packages. All prerequisites can be installed
|
||||
using Conda_ (recommended), pip_, or through the package manager in most Linux
|
||||
distributions.
|
||||
|
|
|
|||
|
|
@ -146,10 +146,6 @@ class DataLibrary(EqualityMixin):
|
|||
raise ValueError("Either path or OPENMC_CROSS_SECTIONS "
|
||||
"environmental variable must be set")
|
||||
|
||||
# Convert to string to support pathlib
|
||||
# TODO: Remove when support is Python 3.6+ only
|
||||
path = str(path)
|
||||
|
||||
tree = ET.parse(path)
|
||||
root = tree.getroot()
|
||||
if root.find('directory') is not None:
|
||||
|
|
|
|||
|
|
@ -158,11 +158,8 @@ class TransportOperator(ABC):
|
|||
def __enter__(self):
|
||||
# Save current directory and move to specific output directory
|
||||
self._orig_dir = os.getcwd()
|
||||
if not self.output_dir.exists():
|
||||
self.output_dir.mkdir() # exist_ok parameter is 3.5+
|
||||
|
||||
# In Python 3.6+, chdir accepts a Path directly
|
||||
os.chdir(str(self.output_dir))
|
||||
self.output_dir.mkdir(exist_ok=True)
|
||||
os.chdir(self.output_dir)
|
||||
|
||||
return self.initial_condition()
|
||||
|
||||
|
|
|
|||
4
setup.py
4
setup.py
|
|
@ -57,14 +57,14 @@ kwargs = {
|
|||
'Topic :: Scientific/Engineering'
|
||||
'Programming Language :: C++',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: Python :: 3.8',
|
||||
'Programming Language :: Python :: 3.9',
|
||||
],
|
||||
|
||||
# Dependencies
|
||||
'python_requires': '>=3.5',
|
||||
'python_requires': '>=3.6',
|
||||
'install_requires': [
|
||||
'numpy>=1.9', 'h5py', 'scipy', 'ipython', 'matplotlib',
|
||||
'pandas', 'lxml', 'uncertainties'
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ class MGXSTestHarness(PyAPITestHarness):
|
|||
return outstr
|
||||
|
||||
|
||||
@pytest.mark.xfail(sys.version_info < (3, 6),
|
||||
reason="Pandas 1.0 API changed and requires Python 3.6+")
|
||||
def test_mgxs_library_distribcell():
|
||||
model = pwr_assembly()
|
||||
harness = MGXSTestHarness('statepoint.10.h5', model)
|
||||
|
|
|
|||
|
|
@ -43,12 +43,11 @@ def materials(tmpdir_factory):
|
|||
with lib.run_in_memory():
|
||||
yield [lib.Material(), lib.Material()]
|
||||
finally:
|
||||
# Convert to strings as os.remove in py 3.5 doesn't support Paths
|
||||
for file_path in ("settings.xml", "geometry.xml", "materials.xml",
|
||||
"summary.h5"):
|
||||
os.remove(str(tmpdir / file_path))
|
||||
os.remove(tmpdir / file_path)
|
||||
orig.chdir()
|
||||
os.rmdir(str(tmpdir))
|
||||
os.rmdir(tmpdir)
|
||||
|
||||
|
||||
def proxy_tally_data(tally, fill=None):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue