Skip to content

Commit

Permalink
Release v0.2.0 (#157)
Browse files Browse the repository at this point in the history
* Move and update PULL_REQUEST_TEMPLATE.md
* Set rixmp release date and version
* Set version in RELEASE_NOTES.md
* Streamline setup.py
* Remove nonexistent DB_FILES from setup.py
* Add summary/highlights to RELEASE_NOTES.md
* Add AUTHORS.md, use IIASA ENE in setup.py
  • Loading branch information
khaeru authored Jun 25, 2019
1 parent ba0bb81 commit b06b7fc
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 61 deletions.
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
**Required:** write a single sentence here describing the changes made by this PR.

(Optional: write a longer description here to help a reviewer understand the PR in 3–5 minutes.)

**PR checklist:**

- [ ] Tests added.
- [ ] Documentation added.
- [ ] Release notes updated. Add a single line at the top of `RELEASE_NOTES.md` similar to…
```
- [#999](https://github.com/iiasa/ixmp/pull/999) Description from above.
```
…then, delete this sentence to confirm you've understood the instructions.
26 changes: 26 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- Daniel Huppmann,
[@danielhuppmann](https://github.com/danielhuppmann),
[iiasa](http://www.iiasa.ac.at/staff/huppmann)
- Matthew Gidden,
[@gidden](https://github.com/gidden),
[iiasa](http://www.iiasa.ac.at/staff/staff.php?type=auto&visibility=visible&search=true&login=gidden),
[web](http://mattgidden.com)
- Volker Krey,
[@volker-krey](https://github.com/volker-krey),
[iiasa](http://www.iiasa.ac.at/staff/staff.php?type=auto&visibility=visible&search=true&login=krey)
- Oliver Fricko, [@OFR-IIASA](https://github.com/OFR-IIASA)
- Peter Kolp,
[@peterkolp](https://github.com/peterkolp/),
[iiasa](http://www.iiasa.ac.at/staff/staff.php?type=auto&visibility=visible&search=true&login=kolp)
- Paul Natsuo Kishimoto,
[@khaeru](https://github.com/khaeru)
[web](https://paul.kishimoto.name)
- Nikolay Kushin,
[@zikolach](https://github.com/zikolach)
[iiasa](http://www.iiasa.ac.at/staff/staff.php?type=auto&visibility=visible&search=true&login=kushin)
- Michael Pimmer,
[@fonfon](https://github.com/fonfon),
[iiasa](http://www.iiasa.ac.at/staff/staff.php?type=auto&visibility=visible&search=true&login=pimmer)
- Adriano Vinca,
[@adrivinca](https://github.com/adrivinca),
[iiasa](http://www.iiasa.ac.at/staff/staff.php?type=auto&visibility=visible&search=true&login=vinca)
13 changes: 0 additions & 13 deletions PULL_REQUEST_TEMPLATE.md

This file was deleted.

22 changes: 17 additions & 5 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@

# Next Release
# v0.2.0

Release 0.2.0 provides full support for Scenario.clone() across platforms (database instances), e.g. from a remote database to a local HSQL database.
IAMC-style timeseries data is better supported, and can be used to store processed results, together with model variables and equations.

Other improvements include a new, dedicated `ixmp.testing` module, user-supplied
callbacks in Scenario.solve(). The `retixmp` package using reticulate to access
the ixmp API is renamed to `rixmp` and now has its own unit tests (the former
`rixmp` package can be accessed as `rixmp.legacy`).

Release 0.2.0 coincides with MESSAGEix release 1.2.0.

## All changes

- [#135](https://github.com/iiasa/ixmp/pull/135): Test `rixmp` (former `retixmp`) using the R `testthat` package.
- [#142](https://github.com/iiasa/ixmp/pull/142): Cloning across platforms, better support of IAMC_style timeseries data, preparations for MESSSAGEix release 1.2 in Java core
- [#142](https://github.com/iiasa/ixmp/pull/142): Cloning across platforms, better support of IAMC_style timeseries data, preparations for MESSAGEix release 1.2 in Java core.
- [#115](https://github.com/iiasa/ixmp/pull/115): Support iterating with user-supplied callbacks.
- [#130](https://github.com/iiasa/ixmp/pull/130): Recognize `IXMP_DATA` environment variable for configuration and local databases.
- [#129](https://github.com/iiasa/ixmp/pull/129), [#132](https://github.com/iiasa/ixmp/pull/132): Fully implement `Scenario.clone()` across platforms (databases).
Expand All @@ -11,9 +23,9 @@
- [#125](https://github.com/iiasa/ixmp/pull/125): Add functions to view and add regions for IAMC-style timeseries data.
- [#123](https://github.com/iiasa/ixmp/pull/123): Return absolute path from `find_dbprops()`.
- [#118](https://github.com/iiasa/ixmp/pull/118): Switch to RTD Sphinx theme.
- [#116](https://github.com/iiasa/ixmp/pull/116): Bugfix and extend functionality for working with IAMC-style timeseries data
- [#111](https://github.com/iiasa/ixmp/pull/111): Add functions to check if a Scenario has an item (set, par, var, equ)
- [#110](https://github.com/iiasa/ixmp/pull/110): Generalize the internal functions to format index dimensions for mapping sets and parameters
- [#116](https://github.com/iiasa/ixmp/pull/116): Bugfix and extend functionality for working with IAMC-style timeseries data.
- [#111](https://github.com/iiasa/ixmp/pull/111): Add functions to check if a Scenario has an item (set, par, var, equ).
- [#110](https://github.com/iiasa/ixmp/pull/110): Generalize the internal functions to format index dimensions for mapping sets and parameters.
- [#108](https://github.com/iiasa/ixmp/pull/105): Improve documentation.
- [#105](https://github.com/iiasa/ixmp/pull/105): Replace [deprecated](http://pandas.pydata.org/pandas-docs/stable/indexing.html#ix-indexer-is-deprecated) pandas `.ix` indexer with `.iloc`.
- [#103](https://github.com/iiasa/ixmp/pull/103): Specify dependencies in setup.py.
Expand Down
4 changes: 2 additions & 2 deletions rixmp.legacy/source/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Authors@R: c(
person("Volker", "Krey", role = "aut")
)
Description: The ix modeling platform (ixmp) is a data warehouse for high-powered scenario analysis,
with interfaces to Python and R for efficient scientific workflows and effective data pre- and
with interfaces to Python and R for efficient scientific workflows and effective data pre- and
post-processing, and a structured database backend for version-controlled data management.
Depends:
R (>= 3.3.0),
Expand All @@ -27,7 +27,7 @@ BugReports: https://github.com/iiasa/ixmp/issues
Encoding: UTF-8
LazyData: true
RoxygenNote: 6.0.1
Collate:
Collate:
'init_rixmp.legacy.R'
'class_ixmp.Platform.R'
'class_ixmp.Scenario.R'
Expand Down
4 changes: 2 additions & 2 deletions rixmp/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: rixmp
Type: Package
Title: R package for ix modeling platform (ixmp)
Version: 0.1.3.9000
Date: 2019-06-17
Version: 0.2.0
Date: 2019-06-24
Authors@R: c(
person("Adriano", "Vinca", email = "vinca@iiasa.ac.at", role = c("aut", "cre")),
person("Matthew", "Gidden", role = "aut"),
Expand Down
59 changes: 20 additions & 39 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
with open('README.md', 'r') as f:
LONG_DESCRIPTION = f.read()


INSTALL_REQUIRES = [
'JPype1>=0.6.2',
'click',
Expand All @@ -30,46 +29,28 @@
'tutorial': ['jupyter'],
}


def main():
pack_dir = {
'ixmp': 'ixmp',
}
entry_points = {
LIB_FILES = [x.split('ixmp/')[-1] for x in glob.glob('ixmp/lib/*')]

setup(
name='ixmp',
version=versioneer.get_version(),
description='ix modeling platform',
author='IIASA Energy Program',
author_email='message_ix@iiasa.ac.at',
long_description=LONG_DESCRIPTION,
long_description_content_type='text/markdown',
url='https://github.com/iiasa/ixmp',
cmdclass=versioneer.get_cmdclass(),
install_requires=INSTALL_REQUIRES,
extras_require=EXTRAS_REQUIRE,
packages=find_packages(),
package_dir={'ixmp': 'ixmp'},
package_data={'ixmp': ['ixmp.jar'] + LIB_FILES},
entry_points={
'console_scripts': [
'import-timeseries=ixmp.cli:import_timeseries',
'ixmp-config=ixmp.cli:config',
'ixmp=ixmp.cli:main',
],
}
lib_files = [x.split('ixmp/')[-1] for x in glob.glob('ixmp/lib/*')]
db_files = [x.split('ixmp/')[-1]
for x in glob.glob('ixmp/db/migration/*/*')]
pack_data = {
'ixmp': [
'ixmp.jar',
] + lib_files + db_files,
}
setup_kwargs = {
"name": "ixmp",
"version": versioneer.get_version(),
"cmdclass": versioneer.get_cmdclass(),
"description": 'ix modeling platform',
"long_description": LONG_DESCRIPTION,
"long_description_content_type": 'text/markdown',
"author": 'Daniel Huppmann, Matthew Gidden, Volker Krey, '
'Oliver Fricko, Peter Kolp',
"author_email": 'message_ix@iiasa.ac.at',
"url": 'https://github.com/iiasa/ixmp',
"install_requires": INSTALL_REQUIRES,
"extras_require": EXTRAS_REQUIRE,
"packages": find_packages(),
"package_dir": pack_dir,
"package_data": pack_data,
"entry_points": entry_points,
}
rtn = setup(**setup_kwargs)


if __name__ == "__main__":
main()
},
)

0 comments on commit b06b7fc

Please sign in to comment.