Skip to content

Commit

Permalink
Merge pull request #29 from nlesc-nano/mapping_view
Browse files Browse the repository at this point in the history
Nano-Utils 2.0.0
  • Loading branch information
BvB93 authored Sep 14, 2021
2 parents 34b3800 + 9638bbf commit 6bf3e3f
Show file tree
Hide file tree
Showing 15 changed files with 617 additions and 81 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
- os: ubuntu-latest
special: '; pre-release'
version: 3.9
- os: ubuntu-latest
special: '; no-optional'
version: 3.9
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
Expand All @@ -37,13 +40,17 @@ jobs:
python-version: ${{ matrix.version }}

- name: Install dependencies
if: matrix.special != '; pre-release'
if: matrix.special == ''
run: pip install -e .[test]

- name: Install dependencies (pre-release)
if: matrix.special == '; pre-release'
run: pip install --pre -e .[test] --upgrade --force-reinstall

- name: Install dependencies (no-optional)
if: matrix.special == '; no-optional'
run: pip install -e .[test_no_optional]

- name: Python info
run: |
which python
Expand All @@ -53,6 +60,11 @@ jobs:
run: pip list

- name: Test with pytest
if: matrix.special != '; no-optional'
run: pytest --flake8 --mypy --doctest-modules

- name: Test with pytest (no-optional)
if: matrix.special == '; no-optional'
run: pytest --flake8 --mypy

- name: Run codecov
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
This project adheres to `Semantic Versioning <http://semver.org/>`_.


2.0.0
*****
* Added the ``fullmatch`` argument to ``VersionInfo.from_str``.
* The h5py-related ``recursive_keys``, ``recursive_values`` and ``recursive_items``
functions now return ``collections.abc.MappingView`` instances, rather than generators.
These mappingviews are available via the ``RecursiveKeysView``,
``RecursiveValuesView`` and ``RecursiveItemsView`` classes.


1.4.0
*****
* Added ``LazyImporter`` and ``MutableLazyImporter``, two classes for lazily importing objects.
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


################
Nano-Utils 1.4.0
Nano-Utils 2.0.0
################
Utility functions used throughout the various nlesc-nano repositories.

Expand Down
7 changes: 2 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@
autodoc_typehints = 'none'


# Output is processed with HTML4 writer.
# Default is False.
html4_writer = True


# Add any Sphinx extension module names here, as strings.
# They can be extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
Expand Down Expand Up @@ -263,6 +258,8 @@
# You can use this to e.g. import modules you will always need in your doctests.
doctest_global_setup = """
from nanoutils.numpy_utils import NUMPY_EX
from nanoutils.yaml_utils import YAML_EX
from nanoutils.hdf5_utils import HDF5_EX
"""

# A string of reStructuredText that will be included at the end of every source file that is read.
Expand Down
2 changes: 1 addition & 1 deletion nanoutils/__version__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""The **Nano-Utils** version."""

__version__ = '1.4.0'
__version__ = '2.0.0'
Loading

0 comments on commit 6bf3e3f

Please sign in to comment.