Skip to content

Commit

Permalink
merge fix
Browse files Browse the repository at this point in the history
  • Loading branch information
byersiiasa committed Feb 24, 2024
2 parents ad52dcd + 64f1255 commit 104e9cb
Show file tree
Hide file tree
Showing 7 changed files with 2,670 additions and 3,731 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# This workflow checks that the code conforms to the Black style
# See https://black.readthedocs.io/en/stable/github_actions.html for details

name: Lint
name: Black formatting

on: [push, pull_request]
on: [pull_request]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: psf/black@stable
with:
options: "--color"
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os:
- ubuntu-latest
python-version:
- '3.8'
- '3.10'

fail-fast: false

Expand Down
2,105 changes: 2,105 additions & 0 deletions poetry.lock

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
[tool.poetry]
name = "rime"
authors = ["Edward Byers <[email protected]>",
"Mia Werning <[email protected]>"]
description = "Rapid Impact Model Emulator"
repository = "https://github.com/iiasa/rime"
homepage = "https://iiasa.ac.at/programs/ece"
documentation = "https://github.com/iiasa/rime"
version = "0.1.0"
license = "GNU CPL v3"
readme = "README.md"

[tool.poetry.dependencies]
python = ">=3.10, <3.11"
alive-progress = "^3.1.5"
dask = "^2024.2.0"
numpy = "^1.23"
pandas = "^2.2.0"
pyam-iamc = "^1.7"
xarray = "^2024.1.1"
scipy = "^1.12.0"
holoviews = "^1.18.3"
matplotlib = "^3.8.3"
seaborn = "^0.13.2"
rich = "^13.7.0"
pyyaml = "^6.0.1"
hvplot = "^0.9.2"
distributed = "^2024.2.0"

[tool.poetry.group.docs]
optional = true

[tool.poetry.group.docs.dependencies]
sphinx = "^7.2.6"
sphinx-multiversion = "^0.2.4"
sphinx-rtd-theme = "^2.0.0"
sphinxcontrib-bibtex = "^2.6.2"
sphinxcontrib-openapi = "^0.8.3"


[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
4,190 changes: 515 additions & 3,675 deletions rime/pp_combined_example.ipynb

Large diffs are not rendered by default.

48 changes: 0 additions & 48 deletions setup.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions setup.py

This file was deleted.

0 comments on commit 104e9cb

Please sign in to comment.