diff options
-rw-r--r-- | .coveragerc | 2 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
-rw-r--r-- | .github/workflows/docs.yml | 1 | ||||
-rw-r--r-- | .github/workflows/lint.yml | 2 | ||||
-rw-r--r-- | docs/_templates/sidebarintro.html | 2 | ||||
-rw-r--r-- | docs/_themes/flask/static/flasky.css_t | 50 | ||||
-rw-r--r-- | docs/_themes/flask/theme.conf | 2 | ||||
-rw-r--r-- | docs/numpy.ipynb | 2 | ||||
-rw-r--r-- | docs/performance.rst | 12 | ||||
-rw-r--r-- | pint/default_en.txt | 4 |
10 files changed, 38 insertions, 41 deletions
diff --git a/.coveragerc b/.coveragerc index fbb079e..cd4d3d2 100644 --- a/.coveragerc +++ b/.coveragerc @@ -16,4 +16,4 @@ exclude_lines = AbstractMethodError # Don't complain if non-runnable code isn't run: - if TYPE_CHECKING:
\ No newline at end of file + if TYPE_CHECKING: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e537403..35de47f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - name: Install numpy if: ${{ matrix.numpy != null }} run: pip install "${{matrix.numpy}}" - + - name: Install uncertainties if: ${{ matrix.uncertainties != null }} run: pip install "${{matrix.uncertainties}}" diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 726a7de..2340683 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -43,4 +43,3 @@ jobs: - name: Doc Tests run: sphinx-build -a -j auto -b doctest -d build/doctrees docs build/doctest - diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b10a674..e2d2638 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,4 +14,4 @@ jobs: - name: Lint uses: pre-commit/action@v2.0.0 with: - extra_args: --all-files --show-diff-on-failure
\ No newline at end of file + extra_args: --all-files --show-diff-on-failure diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html index ff0666d..8e382a8 100644 --- a/docs/_templates/sidebarintro.html +++ b/docs/_templates/sidebarintro.html @@ -16,5 +16,3 @@ You are currently looking at the documentation of version {{ version }}. <li><a href="https://github.com/hgrecco/pint">Code in GitHub</a></li> <li><a href="https://github.com/hgrecco/pint/issues">Issue Tracker</a></li> </ul> - - diff --git a/docs/_themes/flask/static/flasky.css_t b/docs/_themes/flask/static/flasky.css_t index b5ca39b..4f78308 100644 --- a/docs/_themes/flask/static/flasky.css_t +++ b/docs/_themes/flask/static/flasky.css_t @@ -8,11 +8,11 @@ {% set page_width = '940px' %} {% set sidebar_width = '220px' %} - + @import url("basic.css"); - + /* -- page layout ----------------------------------------------------------- */ - + body { font-family: 'Georgia', serif; font-size: 17px; @@ -43,7 +43,7 @@ div.sphinxsidebar { hr { border: 1px solid #B1B4B6; } - + div.body { background-color: #ffffff; color: #3E4349; @@ -54,7 +54,7 @@ img.floatingflask { padding: 0 0 10px 10px; float: right; } - + div.footer { width: {{ page_width }}; margin: 20px auto 30px auto; @@ -70,7 +70,7 @@ div.footer a { div.related { display: none; } - + div.sphinxsidebar a { color: #444; text-decoration: none; @@ -80,7 +80,7 @@ div.sphinxsidebar a { div.sphinxsidebar a:hover { border-bottom: 1px solid #999; } - + div.sphinxsidebar { font-size: 14px; line-height: 1.5; @@ -95,7 +95,7 @@ div.sphinxsidebarwrapper p.logo { margin: 0; text-align: center; } - + div.sphinxsidebar h3, div.sphinxsidebar h4 { font-family: 'Garamond', 'Georgia', serif; @@ -109,7 +109,7 @@ div.sphinxsidebar h4 { div.sphinxsidebar h4 { font-size: 20px; } - + div.sphinxsidebar h3 a { color: #444; } @@ -120,7 +120,7 @@ div.sphinxsidebar p.logo a:hover, div.sphinxsidebar h3 a:hover { border: none; } - + div.sphinxsidebar p { color: #555; margin: 10px 0; @@ -131,25 +131,25 @@ div.sphinxsidebar ul { padding: 0; color: #000; } - + div.sphinxsidebar input { border: 1px solid #ccc; font-family: 'Georgia', serif; font-size: 1em; } - + /* -- body styles ----------------------------------------------------------- */ - + a { color: #004B6B; text-decoration: underline; } - + a:hover { color: #6D4100; text-decoration: underline; } - + div.body h1, div.body h2, div.body h3, @@ -169,25 +169,25 @@ div.indexwrapper h1 { height: {{ theme_index_logo_height }}; } {% endif %} - + div.body h1 { margin-top: 0; padding-top: 0; font-size: 240%; } div.body h2 { font-size: 180%; } div.body h3 { font-size: 150%; } div.body h4 { font-size: 130%; } div.body h5 { font-size: 100%; } div.body h6 { font-size: 100%; } - + a.headerlink { color: #ddd; padding: 0 4px; text-decoration: none; } - + a.headerlink:hover { color: #444; background: #eaeaea; } - + div.body p, div.body dd, div.body li { line-height: 1.4em; } @@ -234,20 +234,20 @@ div.note { background-color: #eee; border: 1px solid #ccc; } - + div.seealso { background-color: #ffc; border: 1px solid #ff6; } - + div.topic { background-color: #eee; } - + p.admonition-title { display: inline; } - + p.admonition-title:after { content: ":"; } @@ -341,7 +341,7 @@ ul, ol { margin: 10px 0 10px 30px; padding: 0; } - + pre { background: #eee; padding: 7px 30px; @@ -358,7 +358,7 @@ dl dl pre { margin-left: -90px; padding-left: 90px; } - + tt { background-color: #ecf0f3; color: #222; diff --git a/docs/_themes/flask/theme.conf b/docs/_themes/flask/theme.conf index 420c609..0b3d313 100644 --- a/docs/_themes/flask/theme.conf +++ b/docs/_themes/flask/theme.conf @@ -6,5 +6,5 @@ pygments_style = flask_theme_support.FlaskyStyle [options] index_logo = '' index_logo_height = 120px -touch_icon = +touch_icon = github_fork = hgrecco/pint diff --git a/docs/numpy.ipynb b/docs/numpy.ipynb index c221b53..34cbef4 100644 --- a/docs/numpy.ipynb +++ b/docs/numpy.ipynb @@ -503,4 +503,4 @@ }, "nbformat": 4, "nbformat_minor": 4 -}
\ No newline at end of file +} diff --git a/docs/performance.rst b/docs/performance.rst index 74a11d8..d2d3e64 100644 --- a/docs/performance.rst +++ b/docs/performance.rst @@ -37,23 +37,23 @@ This is especially important when using pint Quantities in conjunction with an i In [2]: def foobar_with_quantity(x): # find the value of x that equals q2 - + # assign x the same units as q2 qx = ureg(str(x)+str(q2.units)) - + # compare the two quantities, then take their magnitude because # brentq requires a dimensionless return type return (qx - q2).magnitude - + In [3]: def foobar_with_magnitude(x): # find the value of x that equals q2 - + # don't bother converting x to a quantity, just compare it with q2's magnitude return x - q2.magnitude - + In [4]: %timeit brentq(foobar_with_quantity,0,q2.magnitude) 1000 loops, best of 3: 310 µs per loop - + In [5]: %timeit brentq(foobar_with_magnitude,0,q2.magnitude) 1000000 loops, best of 3: 1.63 µs per loop diff --git a/pint/default_en.txt b/pint/default_en.txt index b63d9fe..164ff2d 100644 --- a/pint/default_en.txt +++ b/pint/default_en.txt @@ -475,9 +475,9 @@ bohr_magneton = e * hbar / (2 * m_e) = µ_B = mu_B nuclear_magneton = e * hbar / (2 * m_p) = µ_N = mu_N # Logaritmic Unit Definition -# Unit = scale; logbase; logfactor +# Unit = scale; logbase; logfactor # x_dB = [logfactor] * log( x_lin / [scale] ) / log( [logbase] ) - + # Logaritmic Units of dimensionless quantity: [ https://en.wikipedia.org/wiki/Level_(logarithmic_quantity) ] decibelmilliwatt = 1e-3 watt; logbase: 10; logfactor: 10 = dBm |