Skip to content

Commit

Permalink
Merge pull request #447 from iiasa/release/3.5.0
Browse files Browse the repository at this point in the history
Release v3.5.0
  • Loading branch information
LauWien committed May 6, 2022
2 parents 9abe651 + d4f30ba commit 02dc1dc
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 59 deletions.
12 changes: 10 additions & 2 deletions RELEASE_NOTES.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
Next release
============
.. Next release
.. ============
.. All changes
.. -----------
.. _v3.5.0:

v3.5.0 (2022-05-06)
===================

All changes
-----------
Expand Down
114 changes: 114 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
[build-system]
requires = ["setuptools", "setuptools-scm"]

# Replacement for setup.cfg
#
# Support for this section is experimental in setuptools 61–62.1.0. This should
# not be enabled until that support is stable.
#
# [project]
# name = "ixmp"
# description = "ix modeling platform"
# authors = [
# { email = "message_ix@iiasa.ac.at"},
# { name = "IIASA Energy, Climate, and Environment (ECE) program"},
# ]
# license = { text = "Apache" }
# readme = { file = "README.md", content-type = "text/markdown" }
# classifiers = [
# "Development Status :: 5 - Production/Stable",
# "Intended Audience :: Developers",
# "Intended Audience :: Science/Research",
# "License :: OSI Approved :: Apache Software License",
# "Natural Language :: English",
# "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",
# "Programming Language :: R",
# "Topic :: Scientific/Engineering",
# "Topic :: Scientific/Engineering :: Information Analysis",
# ]
# dependencies = [
# "click",
# "genno >= 1.11.0",
# "JPype1 >= 1.2.1",
# "openpyxl",
# "pandas >= 1.2",
# "pint",
# "PyYAML",
# "xarray",
# ]
# dynamic = ["version"]
#
# [project.urls]
# documentation = "http://docs.messageix.org/ixmp"
# repository = "http://github.com/iiasa/ixmp"
#
# [tool.setuptools]
# zip-safe = true
#
# [project.optional-dependencies]
# docs = [
# "numpydoc",
# "sphinx >= 3.0",
# "sphinx_rtd_theme",
# "sphinxcontrib-bibtex",
# ]
# report = ["genno[compat,graphviz]"]
# tutorial = ["jupyter"]
# tests = [
# # Duplicated from above; see pypa/setuptools#3221
# "numpydoc",
# "sphinx >= 3.0",
# "sphinx_rtd_theme",
# "sphinxcontrib-bibtex",
# "genno[compat,graphviz]",
# "jupyter",
# # Other test requirements
# "codecov",
# "memory_profiler",
# "nbclient >= 0.5",
# "pretenders >= 1.4.4",
# "pytest >= 5",
# "pytest-benchmark",
# "pytest-cov",
# ]
#
# [project.scripts]
# ixmp = "ixmp.cli:main"

[tool.isort]
profile = "black"

[[tool.mypy.overrides]]
# Packages/modules for which no type hints are available.
module = [
"dask.*",
"jpype",
"nbclient",
"nbformat",
"memory_profiler",
"pandas.*",
"pyam",
"pretenders.*",
]
ignore_missing_imports = true

[tool.pytest.ini_options]
# Disable faulthandler plugin on Windows to prevent spurious console noise; see
# - https://github.com/jpype-project/jpype/issues/561
# - https://github.com/iiasa/ixmp/issues/229
# - https://github.com/iiasa/ixmp/issues/247
addopts = """
-m "not rixmp and not performance"
-p no:faulthandler
--benchmark-skip
--cov=ixmp --cov-report="""
markers = [
"rixmp: test of the ixmp R interface.",
"performance: ixmp performance test.",
]
58 changes: 1 addition & 57 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ixmp
author = IIASA IIASA Energy, Climate, and Environment (ECE) program
author = IIASA Energy, Climate, and Environment (ECE) program
author_email = message_ix@iiasa.ac.at
license = Apache
description = ix modeling platform
Expand Down Expand Up @@ -67,61 +67,5 @@ tests =
console_scripts =
ixmp = ixmp.cli:main

[tool:pytest]
# Disable faulthandler plugin on Windows to prevent spurious console noise; see
# - https://github.com/jpype-project/jpype/issues/561
# - https://github.com/iiasa/ixmp/issues/229
# - https://github.com/iiasa/ixmp/issues/247
addopts = -m "not rixmp and not performance"
-p no:faulthandler
--benchmark-skip
--cov=ixmp --cov-report=
markers =
rixmp: test of the ixmp R interface.
performance: ixmp performance test.

[aliases]
test = pytest

[isort]
force_grid_wrap = 0
include_trailing_comma = True
line_length = 88
multi_line_output = 3
use_parentheses = True

[flake8]
max-line-length = 88

[mypy]
# Empty section required as of mypy 0.800;
# see https://github.com/python/mypy/issues/9940

[mypy-dask.*]
ignore_missing_imports = True
[mypy-jpype.*]
ignore_missing_imports = True
[mypy-nbclient.*]
ignore_missing_imports = True
[mypy-nbformat.*]
ignore_missing_imports = True
[mypy-numpy.*]
ignore_missing_imports = True
[mypy-memory_profiler.*]
ignore_missing_imports = True
[mypy-pandas.*]
ignore_missing_imports = True
[mypy-pint.*]
ignore_missing_imports = True
[mypy-pyam.*]
ignore_missing_imports = True
[mypy-pretenders.*]
ignore_missing_imports = True
[mypy-requests_cache.*]
ignore_missing_imports = True
[mypy-requests_mock.*]
ignore_missing_imports = True
[mypy-setuptools.*]
ignore_missing_imports = True
[mypy-sparse.*]
ignore_missing_imports = True

0 comments on commit 02dc1dc

Please sign in to comment.