Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Low-level: Parameter handling #40

Merged
merged 27 commits into from
Dec 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
159f732
Improve documentation and use properties in core
swillner Nov 2, 2018
5639d37
Add _Parameter and _Region
swillner Nov 3, 2018
742d431
Fix comment wrapping
swillner Nov 3, 2018
658fc27
Adjust gitignore
swillner Nov 3, 2018
5e0fdf9
Ignore coverage.py html output
swillner Nov 3, 2018
194d283
Add further _Parameter and _Region tests
swillner Nov 3, 2018
24da54d
Update openscm/core.py
znicholls Nov 5, 2018
c937a5e
Update openscm/core.py
znicholls Nov 5, 2018
27d8d86
Update openscm/core.py
znicholls Nov 5, 2018
a4caa7c
Add doc references
swillner Nov 6, 2018
f1b6e52
Fix documentation
swillner Nov 6, 2018
29b19b3
Add ValueError message
swillner Nov 6, 2018
32f0e1d
Fix tests: Use fixture
swillner Nov 6, 2018
8dbffaa
Add changelog entry
swillner Nov 8, 2018
2d1c75d
Fix documentation
swillner Nov 8, 2018
f30c930
Move .cov2emacs to global gitignore
swillner Nov 8, 2018
dd212a8
Merge branch 'master' into parameters
swillner Dec 8, 2018
4419b69
Separate into submodules
swillner Dec 16, 2018
8c4045e
Add coverage makefile target
swillner Dec 19, 2018
f3946ed
Fix timeframes length estimation
swillner Dec 19, 2018
63af23c
Finish basic functionality
swillner Dec 19, 2018
11bedf0
Fix unused imports
swillner Dec 21, 2018
9f1275a
Merge branch 'master' into parameters
swillner Dec 21, 2018
f213653
Clarify skip in docs configuration
swillner Dec 22, 2018
49c95aa
Update openscm/errors.py
znicholls Dec 22, 2018
5f76ab7
Adjust notebook to added unit d
swillner Dec 22, 2018
48730dc
Merge branch 'master' into parameters
swillner Dec 23, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ Changelog
---------

master
======
------

- (`#35 <https://github.com/openclimatedata/openscm/pull/35>`_) Add units module
- (`#44 <https://github.com/openclimatedata/openscm/pull/44>`_) Add timeframes module
- (`#40 <https://github.com/openclimatedata/openscm/pull/40>`_) Add parameter handling in core module
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ venv: dev-requirements.txt setup.py
test: venv
./venv/bin/pytest -rfsxEX --cov=openscm tests

coverage: test
coverage html

test_all: test venv
./venv/bin/pytest -rfsxEX --nbval ./notebooks --sanitize ./notebooks/tests_sanitize.cfg

Expand Down Expand Up @@ -45,4 +48,4 @@ test-pypi-install: venv
clean:
rm -rf venv

.PHONY: clean test test-all black flake8 docs publish-on-pypi test-pypi-install
.PHONY: clean coverage test test-all black flake8 docs publish-on-pypi test-pypi-install
18 changes: 17 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, "OpenSCM.tex", "OpenSCM Documentation", "Robert Gieseke, Zebedee Nicholls, Sven Willner", "manual")
(
master_doc,
"OpenSCM.tex",
"OpenSCM Documentation",
"Robert Gieseke, Zebedee Nicholls, Sven Willner",
"manual",
)
]


Expand Down Expand Up @@ -176,4 +182,14 @@
]


def skip_init(app, what, name, obj, skip, options):
if name == "__init__":
return False
return skip
swillner marked this conversation as resolved.
Show resolved Hide resolved


def setup(app):
app.connect("autodoc-skip-member", skip_init)


# -- Extension configuration -------------------------------------------------
2 changes: 2 additions & 0 deletions docs/units.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. _units:

Units
-----

Expand Down
1 change: 1 addition & 0 deletions notebooks/emissions-units-with-pint.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@
" 'cup',\n",
" 'curie',\n",
" 'cycle',\n",
" 'd',\n",
" 'dalton',\n",
" 'darcy',\n",
" 'day',\n",
Expand Down