New Upstream Release - uncertainties
Ready changes
Summary
Merged new upstream version: 3.1.7 (was: 3.1.6).
Resulting package
Built on 2022-12-14T03:23 (took 5m44s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases python-uncertainties-docapt install -t fresh-releases python3-uncertainties
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..528c423
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+uncertainties-py23/
+*.pyc
+build
+doc/_build
+dist
+MANIFEST
+# Created by setuptools:
+uncertainties.egg-info/
+# For PyCharm (contains project files):
+.idea/
+# py.test cache files (normally we are using nose though)
+.cache
+# vim temporary files
+.*.swp
diff --git a/00_prepare_for_PyPI.sh b/00_prepare_for_PyPI.sh
index 67e2527..87e32d7 100755
--- a/00_prepare_for_PyPI.sh
+++ b/00_prepare_for_PyPI.sh
@@ -5,8 +5,9 @@
# This script must be run from its directory.
-# Fail the script at the first failed command:
-set -e
+# Fail the script at the first failed command (HOWEVER, maybe when there are
+# no commits to be done during the merges, the commands fail?):
+#set -e
echo "****************************************************************"
echo "WARNING: if any commit fails, RESOLVE IT before running this"
diff --git a/README.rst b/README.rst
index d7b4e5c..bbd9b06 100644
--- a/README.rst
+++ b/README.rst
@@ -1,16 +1,17 @@
uncertainties
=============
-.. image:: https://readthedocs.org/projects/uncertainties-python-package/badge/?version=latest
- :target: http://uncertainties-python-package.readthedocs.io/en/latest/?badge=latest
+.. image:: https://readthedocs.org/projects/uncertainties/badge/?version=latest
+ :target: https://uncertainties.readthedocs.io/en/latest/?badge=latest
+ :alt: Documentation Status
.. image:: https://img.shields.io/pypi/v/uncertainties.svg
:target: https://pypi.org/project/uncertainties/
.. image:: https://pepy.tech/badge/uncertainties/week
- :target: https://pepy.tech/badge/uncertainties/week
+ :target: https://pepy.tech/project/uncertainties
.. image:: https://codecov.io/gh/lebigot/uncertainties/branch/master/graph/badge.svg
:target: https://codecov.io/gh/lebigot/uncertainties/
-.. image:: https://travis-ci.org/lebigot/uncertainties.svg?branch=master
- :target: https://travis-ci.org/lebigot/uncertainties
+.. image:: https://travis-ci.com/lebigot/uncertainties.svg?branch=master
+ :target: https://travis-ci.com/lebigot/uncertainties
.. image:: https://ci.appveyor.com/api/projects/status/j5238244myqx0a0r?svg=true
:target: https://ci.appveyor.com/project/lebigot/uncertainties
@@ -26,13 +27,13 @@ calculations with uncertainties** (aka "error propagation"):
>>> sin(2*x) # In a Python shell, "print" is optional
0.9092974268256817+/-0.08322936730942848
-This package also automatically calculates derivatives:
+This package also **automatically calculates derivatives of arbitrary functions**:
>>> (2*x+1000).derivatives[x]
2.0
The main documentation is available at
-http://uncertainties-python-package.readthedocs.io/.
+https://uncertainties.readthedocs.io/.
Git branches
------------
diff --git a/debian/changelog b/debian/changelog
index 2471500..5388780 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+uncertainties (3.1.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 14 Dec 2022 03:18:50 -0000
+
uncertainties (3.1.6-1) unstable; urgency=medium
* New upstream release
diff --git a/doc/user_guide.rst b/doc/user_guide.rst
index 318edce..44ab638 100644
--- a/doc/user_guide.rst
+++ b/doc/user_guide.rst
@@ -592,8 +592,8 @@ use the shorthand notation for numbers with uncertainties:
prints with the shorthand notation: ``Result = 0.20(1)``.
-Customization of the pretty print and LaTeX outputs
----------------------------------------------------
+Customizing the pretty-print and LaTeX outputs
+----------------------------------------------
The pretty print and LaTeX outputs themselves can be customized.
@@ -623,8 +623,11 @@ works with numbers with uncertainties:
>>> wrapped_f = uncertainties.wrap(f)
-The new function :func:`wrapped_f` *accepts numbers with uncertainties*
-as arguments *wherever a Python float is used* for :func:`f`.
+The new function :func:`wrapped_f` (optionally) *accepts a number
+with uncertainty* in place of any float *argument* of :func:`f` (note
+that floats contained instead *inside* arguments of :func:`f`, like
+in a list or a NumPy array, *cannot* be replaced by numbers with
+uncertainties).
:func:`wrapped_f` returns the same values as :func:`f`, but with
uncertainties.
diff --git a/setup.py b/setup.py
index 3547fcf..1fdce80 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ except AttributeError: # sys.version_info was introduced in Python 2.0
# Common options for distutils/setuptools's setup():
setup_options = dict(
name='uncertainties',
- version='3.1.6',
+ version='3.1.7',
author='Eric O. LEBIGOT (EOL)',
author_email='eric.lebigot@normalesup.org',
url='http://uncertainties-python-package.readthedocs.io/',
@@ -131,8 +131,8 @@ Version history
Main changes:
-- 3.1.6: the pretty-print and LaTeX format can now be customized.
-- 3.1.5: added a "p" formatting option, that makes sure that there are always
+- 3.1.6: The pretty-print and LaTeX format can now be customized.
+- 3.1.5: Added a "p" formatting option, that makes sure that there are always
parentheses around the … ± … part of printed numbers.
- 3.1.4: Python 2.7+ is now required.
- 3.1.2: Fix for NumPy 1.17 and ``unumpy.ulinalg.pinv()``.
diff --git a/uncertainties/__init__.py b/uncertainties/__init__.py
index 92a23d0..ab5ea97 100644
--- a/uncertainties/__init__.py
+++ b/uncertainties/__init__.py
@@ -226,7 +226,7 @@ from .core import *
from .core import __all__ # For a correct help(uncertainties)
# Numerical version:
-__version_info__ = (3, 1, 6)
+__version_info__ = (3, 1, 7)
__version__ = '.'.join(map(str, __version_info__))
__author__ = 'Eric O. LEBIGOT (EOL) <eric.lebigot@normalesup.org>'
diff --git a/uncertainties/core.py b/uncertainties/core.py
index 7c0940d..8c707a9 100644
--- a/uncertainties/core.py
+++ b/uncertainties/core.py
@@ -14,17 +14,19 @@ Main module for the uncertainties package, with internal functions.
from __future__ import division # Many analytical derivatives depend on this
-from builtins import str
-from builtins import next
-from builtins import map
-from builtins import zip
-from builtins import range
-from past.builtins import basestring
-from builtins import object
+from builtins import str, next, map, zip, range, object
import math
from math import sqrt, log, isnan, isinf # Optimization: no attribute look-up
import re
import sys
+if sys.version_info < (3,):
+ from past.builtins import basestring
+else:
+ # Avoid importing from past in Python 3 since it utilizes the builtin
+ # 'imp' module, which is deprecated as of Python 3.4, see
+ # https://docs.python.org/3/library/imp.html. The 2to3 tool replaces
+ # basestring with str, so that's what we effectively do here as well:
+ basestring = str
try:
from math import isinfinite # !! Python 3.2+
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.7.egg-info/PKG-INFO -rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.7.egg-info/dependency_links.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.7.egg-info/requires.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.7.egg-info/top_level.txt
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.6.egg-info/PKG-INFO -rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.6.egg-info/dependency_links.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.6.egg-info/requires.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/uncertainties-3.1.6.egg-info/top_level.txt lrwxrwxrwx root/root /usr/share/doc/python-uncertainties-doc/html/_static/sphinx_highlight.js -> ../../../../javascript/sphinxdoc/1.0/sphinx_highlight.js
Control files of package python-uncertainties-doc: lines which differ (wdiff format)
Depends: libjs-sphinxdoc (>= 5.2), 5.0), libjs-jquery, libjs-underscore
No differences were encountered between the control files of package python3-uncertainties