Skip to content

Commit 6ee45ca

Browse files
authored
Merge pull request #941 from iiasa/ixmp4-0.10
Use released ixmp4 v0.10 in CI
2 parents fc8f9e0 + 7e0a756 commit 6ee45ca

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.github/workflows/pytest.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ env:
3131
#
3232
# To test against other code, such as other branches for open PRs, temporarily
3333
# add lines as appropriate. These lines SHOULD NOT be merged to `main`.
34-
#
35-
# - ixmp4: pending https://github.com/iiasa/ixmp4/pull/171.
36-
# TODO Remove once the PR is merged and a new version is released.
3734
upstream-versions: |
38-
"ixmp4 @ git+https://github.com/iiasa/ixmp4@enh/remove-linked-items-when-removing-indexset-items; python_version > '3.9'" \
3935
"ixmp @ git+https://github.com/iiasa/ixmp.git@main" \
4036
4137
jobs:

RELEASE_NOTES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Users **should**:
2828
All changes
2929
-----------
3030

31-
- Some MESSAGEix :doc:`tutorials <tutorials>` are runnable with the :class:`.IXMP4Backend` introduced in :mod:`ixmp` version 3.11 (:pull:`894`).
31+
- Some MESSAGEix :doc:`tutorials <tutorials>` are runnable with the :class:`.IXMP4Backend` introduced in :mod:`ixmp` version 3.11 (:pull:`894`, :pull:`941`).
3232
See `Support roadmap for ixmp4 <https://github.com/iiasa/message_ix/discussions/939>`__ for details.
3333
- Adjust use of :ref:`type_tec <mapping-sets>` in :ref:`equation_emission_equivalence` (:pull:`930`, :issue:`929`, :pull:`935`).
3434

ci/rtd-requirements.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,5 @@
33
# These *should* generally align with env.upstream-versions
44
# in .github/workflows/pytest.yaml
55

6-
# Temporary, pending https://github.com/iiasa/ixmp4/pull/171.
7-
# TODO Remove once the PR is merged and a new version is released.
8-
git+https://github.com/iiasa/ixmp4@enh/remove-linked-items-when-removing-indexset-items
9-
106
gamsapi [core,transfer] >= 45.7.0
117
git+https://github.com/iiasa/ixmp.git@main#egg=ixmp

pyproject.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ maintainers = [
1010
{ name = "Paul Natsuo Kishimoto", email = "[email protected]" },
1111
{ name = "Fridolin Glatter", email = "[email protected]" },
1212
]
13+
license = "Apache-2.0"
1314
readme = "README.md"
1415
classifiers = [
1516
"Development Status :: 5 - Production/Stable",
1617
"Intended Audience :: Developers",
1718
"Intended Audience :: Science/Research",
18-
"License :: OSI Approved :: Apache Software License",
1919
"Natural Language :: English",
2020
"Operating System :: OS Independent",
2121
"Programming Language :: Python",
@@ -41,9 +41,10 @@ dependencies = [
4141
]
4242

4343
[project.urls]
44-
homepage = "https://github.com/iiasa/message_ix"
45-
repository = "https://github.com/iiasa/message_ix"
46-
documentation = "https://docs.messageix.org"
44+
Documentation = "https://docs.messageix.org"
45+
"Release notes" = "https://docs.messageix.org/en/stable/whatsnew.html"
46+
Repository = "https://github.com/iiasa/message_ix"
47+
"Issue tracker" = "https://github.com/iiasa/message_ix/issues"
4748

4849
[project.optional-dependencies]
4950
docs = [

0 commit comments

Comments
 (0)