From b2452612ba491cb09dd5658ae26baa72bfe3e0bb Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 20 Feb 2020 08:43:54 -0500 Subject: [PATCH 1/3] DEV Remove all occurrences of six package --- serpentTools/__main__.py | 6 ++---- serpentTools/parsers/__init__.py | 4 +--- tests/test_meta.py | 7 ------- tests/test_parserLevelRead.py | 4 +--- tests/test_settings.py | 3 +-- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/serpentTools/__main__.py b/serpentTools/__main__.py index 3bc7b0d3..0fb77ae1 100644 --- a/serpentTools/__main__.py +++ b/serpentTools/__main__.py @@ -10,8 +10,6 @@ import argparse from os.path import splitext -import six - import serpentTools from serpentTools import settings from serpentTools.messages import info, error @@ -21,10 +19,10 @@ _VERB_MAP = {'v': {1: 'info', 2: 'debug'}, 'q': {1: 'error', 2: 'critical'}} _VERB_MSG = {} -for key, items in six.iteritems(_VERB_MAP): +for key, items in _VERB_MAP.items(): _VERB_MSG[key] = ', '.join( ['{}: {}'.format(key * num, value) - for num, value in six.iteritems(items)]) + for num, value in items.items()]) def __buildParser(): diff --git a/serpentTools/parsers/__init__.py b/serpentTools/parsers/__init__.py index d3fbed9d..63cc92ff 100644 --- a/serpentTools/parsers/__init__.py +++ b/serpentTools/parsers/__init__.py @@ -3,8 +3,6 @@ """ import re -import six - from serpentTools.messages import SerpentToolsException, debug, deprecated from serpentTools.parsers.depletion import DepletionReader from serpentTools.parsers.branching import BranchingReader @@ -75,7 +73,7 @@ def inferReader(filePath): SerpentToolsException If a reader cannot be inferred """ - for reg, reader in six.iteritems(REGEXES): + for reg, reader in REGEXES.items(): match = re.match(reg, filePath) if match and match.group() == filePath: debug('Inferred reader for {}: {}' diff --git a/tests/test_meta.py b/tests/test_meta.py index 67022d67..c33ca8c1 100644 --- a/tests/test_meta.py +++ b/tests/test_meta.py @@ -1,13 +1,6 @@ """ Test the abstract base class approach upon which our objects are built. - -Most of this is trivial for a set python build, -but since we support flavors of 2 and 3, -we take advantage of :func:`six.add_metaclass` -to properly create the abstract -base classes. - """ from unittest import TestCase diff --git a/tests/test_parserLevelRead.py b/tests/test_parserLevelRead.py index 843c61ac..907949a6 100644 --- a/tests/test_parserLevelRead.py +++ b/tests/test_parserLevelRead.py @@ -1,8 +1,6 @@ """Class to test the read commands from serpentTools.parsers""" import unittest -import six - from serpentTools.messages import SerpentToolsException from serpentTools.parsers import inferReader, read @@ -34,7 +32,7 @@ def test_inferReader(self): 'test_res.m': ResultsReader, 'test_fmtx99.m': FissionMatrixReader, 'test_res': None, 'test.coe_dep.m': DepletionReader } - for fileP, expectedReader in six.iteritems(expectedClasses): + for fileP, expectedReader in expectedClasses.items(): if expectedReader is None: with self.assertRaises(SerpentToolsException): inferReader(fileP) diff --git a/tests/test_settings.py b/tests/test_settings.py index 88658451..3c9cc92a 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -3,7 +3,6 @@ from unittest import TestCase import yaml -import six from serpentTools import settings from tests import TestCaseWithLogCapture @@ -139,7 +138,7 @@ def _writeTestRemoveConfFile(self, settings, filePath, expected, strict): yaml.dump(settings, out) with self.rc: self.rc.loadYaml(filePath, strict) - for key, value in six.iteritems(expected): + for key, value in expected.items(): if isinstance(value, list): self.assertListEqual(value, self.rc[key]) else: From 838d09612019ab5ced02a07132fc31df095f4305 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 20 Feb 2020 08:51:05 -0500 Subject: [PATCH 2/3] DEV Remove versioneer settings from setup.cfg --- setup.cfg | 7 ------- 1 file changed, 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index 48e9b9ea..06da8483 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,3 @@ -[versioneer] -VCS = git -style = pep440 -versionfile_source = serpentTools/_version.py -versionfile_build = serpentTools/_version.py -tag_prefix = - [flake8] exclude = .tox, From ee5b1c4da6f2dcda93a7ea3ab3fdcf9430ac2401 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 20 Feb 2020 08:53:33 -0500 Subject: [PATCH 3/3] REL Release 0.9.2 DEV Remove versioneer settings from setup.cfg DEV Remove all occurrences of six package DOC Collection of documentation fixes, typos, bad links DOC Remove redundant default settings file DOC Consolidate variable groups to single file DOC Remove redundant and old sampler documentation DOC Direct BranchCollector replacement through xs module DOC Document special members, not __init__ via template DOC Fix documentation for matlab hook DOC Convert some more docstrings to numpydoc format DOC Fix a collection of Sphinx/rst errors DOC Remove link to serpentTools.BranchedUniv; prefer xs submodule DOC Change linking structure for Project overview DOC Change substitution resultReader -> ResultsReader DEV Clean up some automatic docstrings DEV Cleanup normalizerFactor DEV Improve flexibility of formatPlot, placeLegend API Change automatic days label to Time [d] BUG Better handling of colorbars for mesh plots API Allow threshold values for hexagonal mesh plots DOC Improve documentation on logging DEV Remove automatic logging configuration DOC Add note on PY3.8 in changelog CI/DEV Bump scipy version for testing to 1.3.2 ENH Support for installing, testing with py 3.8 BUG Properly handle similarly named detectors --- docs/conf.py | 2 +- serpentTools/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 0f397534..a95efb22 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ # |version| and |release|, also used in various other places throughout the # built documents. -version = "0.9.1" +version = "0.9.2" # General information about the project. project = 'serpentTools' diff --git a/serpentTools/__init__.py b/serpentTools/__init__.py index d8d109e7..8a75d32d 100644 --- a/serpentTools/__init__.py +++ b/serpentTools/__init__.py @@ -7,4 +7,4 @@ from serpentTools.seed import * from serpentTools.xs import * -__version__ = "0.9.1" +__version__ = "0.9.2" diff --git a/setup.py b/setup.py index b91a410d..9e870b39 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def getDataFiles(): pythonRequires = ">=3.5,<3.9" -version = "0.9.1" +version = "0.9.2" setupArgs = { 'name': 'serpentTools',