Skip to content

Commit

Permalink
Merge pull request #174 from ngoldbaum/2.8.0-fixes
Browse files Browse the repository at this point in the history
2.8.0 fixes
  • Loading branch information
ngoldbaum authored Oct 5, 2020
2 parents f70b4cf + b59b181 commit eeefa00
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
20 changes: 12 additions & 8 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@
History
=======

2.7.3 (2020-10-05)
2.8.0 (2020-10-05)
------------------

* Dropped support for Python 3.5.
* Add ``delta_degC`` and ``delta_degF`` units to support temperature difference
arithmetic. See `PR #152 <https://github.com/yt-project/unyt/pull/152>`_. Thank you
to Lee Johnston (@l-johnston on GitHub) for the contribution.
arithmetic. See `PR #152
<https://github.com/yt-project/unyt/pull/152>`_. Thank you to Lee Johnston
(@l-johnston on GitHub) for the contribution.
* Fix an issue where a subsequent load of the unit registry with units that are
equal but not identical leads to a crash. See `PR #158
<https://github.com/yt-project/unyt/pull/158>`_. Thank you to Matthew Turk
(@matthewturk on GitHub) for the initial bug report and fix.
* Add force unit ``kip`` and pressure unit ``psi``. Thank you to P. Talley
(@otaithleigh on GitHub) for the contribution.
* Fix an issue where arithmetic operations on units defined in different registries
and having the conversion defined in one direction would lead to a crash.
See `PR #164 <https://github.com/yt-project/unyt/pull/164>`_. Thank you to
Clément Robert (@neutrinoceros on GitHub) for the initial bug report and fix.
(@otaithleigh on GitHub) for the contribution. See `PR #162
<https://github.com/yt-project/unyt/pull/162>`_.
* Fix an issue where arithmetic operations on units defined in different
registries and having the conversion defined in one direction would lead to a
crash. See `PR #164 <https://github.com/yt-project/unyt/pull/164>`_. Thank
you to Clément Robert (@neutrinoceros on GitHub) for the initial bug report
and fix.


2.7.2 (2020-06-29)
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ universal = 1
test = pytest

[tool:pytest]
collect_ignore = ['setup.py']
norecursedirs = benchmarks paper .*

[versioneer]
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[tox]
envlist = py36-docs,begin,py35-dependencies,py35-versions,py{35,36,37,38},py38-unyt-module-test-function,end
envlist = py36-docs,begin,py36-dependencies,py36-versions,py{36,37,38},py38-unyt-module-test-function,end

[travis]
python =
3.8: py38, py38-unyt-module-test-function
3.7: py37
3.6: py36, py36-docs
3.5: py35, py35-dependencies, py35-versions

[testenv]
setenv =
Expand All @@ -33,8 +32,9 @@ commands =
pytest --cov=unyt --cov-append --doctest-modules --doctest-plus --doctest-rst --basetemp={envtmpdir} -W once
coverage report --omit='.tox/*'

[testenv:py35-versions]
[testenv:py36-versions]
deps =
docutils
pytest
sympy==1.2
numpy==1.13.3
Expand All @@ -50,8 +50,9 @@ commands =
pytest --cov=unyt --cov-append --basetemp={envtmpdir} -W once
coverage report --omit='.tox/*'

[testenv:py35-dependencies]
[testenv:py36-dependencies]
deps =
docutils
pytest
sympy
numpy
Expand Down
8 changes: 4 additions & 4 deletions unyt/mpl_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ def __call__(self):
@property
def label_style(self):
"""str: One of the following set, ``{'()', '[]', '/'}``.
These choices correspond to the following unit labels:
These choices correspond to the following unit labels:
* ``'()'`` -> ``'(unit)'``
* ``'[]'`` -> ``'[unit]'``
* ``'/'`` -> ``'q_x / unit'``
* ``'()'`` -> ``'(unit)'``
* ``'[]'`` -> ``'[unit]'``
* ``'/'`` -> ``'q_x / unit'``
"""
return self._labelstyle

Expand Down

0 comments on commit eeefa00

Please sign in to comment.