Skip to content

Commit

Permalink
Merge pull request #37 from IAMconsortium/pint-0.19
Browse files Browse the repository at this point in the history
Adjust to pint 0.19
  • Loading branch information
khaeru committed Apr 6, 2022
2 parents 00857b7 + 3272669 commit 5b9eebd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
twine check dist/*
- name: Publish to TestPyPI
uses: pypa/gh-action-pypi-publish@v1.4.1
uses: pypa/gh-action-pypi-publish@v1.5.0
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
with:
user: __token__
password: ${{ secrets.TESTPYPI_TOKEN }}
repository_url: https://test.pypi.org/legacy/

- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@v1.4.1
uses: pypa/gh-action-pypi-publish@v1.5.0
if: github.event_name == 'release'
with:
user: __token__
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
# Force specific version of pint
- "==0.17"
- "==0.18"
- "==0.19.1"
# No change, i.e. latest
- ""

Expand All @@ -26,7 +27,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v1
- uses: actions/setup-python@v2

- name: Upgrade pip
run: python -m pip install --upgrade pip
Expand All @@ -39,4 +40,4 @@ jobs:
pytest -rA --verbose --color=yes --cov=iam_units --cov-report=xml
- name: Upload test coverage to Codecov.io
uses: codecov/codecov-action@v1.2.1
uses: codecov/codecov-action@v2
2 changes: 1 addition & 1 deletion iam_units/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# - Preceded by a space or '-' character.
# - Followed by a space, '-', '/', end-of-string, or non-word (\w) character.
# The latter avoids matching only the 'C' within 'CH4'.
_EMI_CODE = fr"""{_EMI_HEADER}
_EMI_CODE = rf"""{_EMI_HEADER}
import re
GWP_VERSION = '{gwp.__version__}'
Expand Down
12 changes: 12 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ description = Unit definitions for integrated-assessment research
long_description = file: README.rst
long_description_content_type = text/x-rst
url = https://github.com/IAMconsortium/units
classifiers =
Intended Audience :: Developers
Intended Audience :: Science/Research
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Topic :: Scientific/Engineering
Topic :: Scientific/Engineering :: Information Analysis

[options]
packages = iam_units
Expand Down

0 comments on commit 5b9eebd

Please sign in to comment.