Code

Updating Development Branch #232

Code

Merged

trevorb1 merged 129 commits intodevelopOSeMOSYS/otoole:developfrom masterOSeMOSYS/otoole:masterCopy head branch name to clipboardSep 21, 2024

+3,645-1,002

Commits

Commits on Apr 25, 2023

• Merge pull request #170 from trevorb1/docs

  Show description for 0240350
  trevorb1

  authored
  0240350

  Copy full SHA for 0240350

Commits on May 3, 2023

• Merge pull request #176 from OSeMOSYS/develop

  Show description for 5dc646c
  trevorb1

  authored
  5dc646c

  Copy full SHA for 5dc646c

• Merge pull request #177 from OSeMOSYS/develop

  Show description for 56baf80
  trevorb1

  authored
  56baf80

  Copy full SHA for 56baf80

Commits on Jun 20, 2023

• Adds a public API to convert and convert_results methods

  Show description for 2729b45
  willu47

  committed
  2729b45

  Copy full SHA for 2729b45

• Added a test for cli call to convert_results

  willu47

  committed
  ba4ac35

  Copy full SHA for ba4ac35

• Add documentation for Python API

  willu47

  committed
  19b7839

  Copy full SHA for 19b7839

Commits on Jun 21, 2023

• Refactored WriteStrategy to remove kwargs and use class variable

  willu47

  committed
  2e99548

  Copy full SHA for 2e99548

• Added docstrings to all strategies

  willu47

  committed
  7c6750e

  Copy full SHA for 7c6750e

• Factor out obtaining strategies in preparation for read and write only API functions

  willu47

  committed
  25d6176

  Copy full SHA for 25d6176

• Update amply version qualifier

  willu47

  committed
  189545f

  Copy full SHA for 189545f

• Remove redundant arguments, move errors to get strategies

  willu47

  committed
  c1dd1a6

  Copy full SHA for c1dd1a6

• Add tests for read and write functions

  willu47

  committed
  bb7d674

  Copy full SHA for bb7d674

• Typing

  willu47

  committed
  aad666b

  Copy full SHA for aad666b

• Add read and write to docs

  willu47

  committed
  20f547f

  Copy full SHA for 20f547f

Commits on Jul 10, 2023

• Pin pydantic to less than v2

  willu47

  committed
  00a4144

  Copy full SHA for 00a4144

• Updated call to resources library

  willu47

  committed
  5e32250

  Copy full SHA for 5e32250

• Simplify dependencies for reading packaged files

  willu47

  committed
  9a7d762

  Copy full SHA for 9a7d762

• Drop support for Python 3.8

  willu47

  committed
  33f5a21

  Copy full SHA for 33f5a21

• Drop Python 3.8 from test matrix

  willu47

  committed
  3ef9bdc

  Copy full SHA for 3ef9bdc

• Merge pull request #186 from willu47/pydantic_fix

  Show description for 817d7d4
  willu47

  authored
  817d7d4

  Copy full SHA for 817d7d4

• Create python-publish.yml

  willu47

  authored
  872d2e6

  Copy full SHA for 872d2e6

• Use tox config for publishing

  willu47

  committed
  f420d3d

  Copy full SHA for f420d3d

• Define environment variables passed to tox

  willu47

  committed
  b628302

  Copy full SHA for b628302

• Use vars instead of secrets

  willu47

  committed
  973c44a

  Copy full SHA for 973c44a

• Use Python 3.11 for ReadTheDocs

  willu47

  committed
  ad8522d

  Copy full SHA for ad8522d

• Update configuration for documentation

  willu47

  committed
  721e055

  Copy full SHA for 721e055

• Update changelog

  willu47

  committed
  4ecb8da

  Copy full SHA for 4ecb8da

Commits on Aug 11, 2023

• glpk parsing logic and tests

  trevorb1

  committed
  e96cfc5

  Copy full SHA for e96cfc5

• fixed warnings

  trevorb1

  committed
  8a077c0

  Copy full SHA for 8a077c0

• glpk results cli update

  trevorb1

  committed
  588ea91

  Copy full SHA for 588ea91

• glpk reading bug

  trevorb1

  committed
  fa6d9e5

  Copy full SHA for fa6d9e5

Commits on Aug 12, 2023

• update to pydantic 2

  trevorb1

  committed
  464241b

  Copy full SHA for 464241b

Commits on Aug 14, 2023

• spelling fixes

  trevorb1

  committed
  58c3021

  Copy full SHA for 58c3021

• update install instructions

  trevorb1

  committed
  b844570

  Copy full SHA for b844570

• fixed typo in docs

  trevorb1

  committed
  a5ee3e0

  Copy full SHA for a5ee3e0

Commits on Aug 15, 2023

• validation docs update

  trevorb1

  committed
  01e9f06

  Copy full SHA for 01e9f06

• fix linting issue

  trevorb1

  committed
  1700224

  Copy full SHA for 1700224

• Merge pull request #188 from trevorb1/issue-185

  Show description for e94d44b
  willu47

  authored
  e94d44b

  Copy full SHA for e94d44b

• Refactor cli functions to use python interface

  willu47

  committed
  3758c44

  Copy full SHA for 3758c44

• update ReadGlpk logic

  trevorb1

  committed
  c1f8865

  Copy full SHA for c1f8865

• update ReadGlpk docstrings

  trevorb1

  committed
  0756c9d

  Copy full SHA for 0756c9d

• fixed typos

  trevorb1

  committed
  738d3d9

  Copy full SHA for 738d3d9

• update ReadGlpk

  trevorb1

  committed
  773c644

  Copy full SHA for 773c644

Commits on Aug 16, 2023

• Merge pull request #189 from trevorb1/joss-docs-updates

  Show description for 8a46113
  trevorb1

  authored
  8a46113

  Copy full SHA for 8a46113

Commits on Aug 17, 2023

• Add a read_results function to Python interface

  willu47

  committed
  fba3145

  Copy full SHA for fba3145

• Merge branch 'master' into python_interface

  willu47

  committed
  2f8afcc

  Copy full SHA for 2f8afcc

Commits on Aug 18, 2023

• Merge branch 'master' into issue-19

  trevorb1

  committed
  c475c46

  Copy full SHA for c475c46

• add ReadGlpk to Python API

  trevorb1

  committed
  1116d02

  Copy full SHA for 1116d02

• rename ReadResultsCbc to ReadWideResults

  trevorb1

  committed
  ea63ed1

  Copy full SHA for ea63ed1

• Resolves final issues raised in PR

  willu47

  committed
  6b058d0

  Copy full SHA for 6b058d0

• refactor ReadGlpk merge_model_sol()

  trevorb1

  committed
  e02f034

  Copy full SHA for e02f034

• Merge pull request #180 from willu47/python_interface

  Show description for b24a24b
  willu47

  authored
  b24a24b

  Copy full SHA for b24a24b

• minor doc fixes

  trevorb1

  committed
  9a42fb6

  Copy full SHA for 9a42fb6

• Merge pull request #187 from trevorb1/issue-19

  Show description for 5a194de
  trevorb1

  authored
  5a194de

  Copy full SHA for 5a194de

Commits on Aug 21, 2023

• read cplex to df logic

  trevorb1

  committed
  c3d80e2

  Copy full SHA for c3d80e2

• remove old commented code

  trevorb1

  committed
  81fbaba

  Copy full SHA for 81fbaba

Commits on Aug 22, 2023

• updated ReadCplex tests

  trevorb1

  committed
  c413ae6

  Copy full SHA for c413ae6

• added tests for longify data

  trevorb1

  committed
  28dcf28

  Copy full SHA for 28dcf28

• update cli example docs

  trevorb1

  committed
  53871a8

  Copy full SHA for 53871a8

• minor doc updates

  trevorb1

  committed
  f6d9c35

  Copy full SHA for f6d9c35

Commits on Aug 23, 2023

• Merge pull request #190 from trevorb1/cplex

  Show description for 89baeed
  trevorb1

  authored
  89baeed

  Copy full SHA for 89baeed

Commits on Aug 29, 2023

• changelog update

  trevorb1

  committed
  65f5dd8

  Copy full SHA for 65f5dd8

• update changelog

  trevorb1

  committed
  c2592bc

  Copy full SHA for c2592bc

• lock pandas <2.1

  trevorb1

  committed
  386a114

  Copy full SHA for 386a114

• update changelog

  trevorb1

  committed
  3692050

  Copy full SHA for 3692050

Commits on Aug 30, 2023

• Merge pull request #193 from OSeMOSYS/release-1.1

  Show description for 87e5613
  trevorb1

  authored
  87e5613

  Copy full SHA for 87e5613

Commits on Aug 31, 2023

• Update convert.rst

  trevorb1

  authored
  0f8108c

  Copy full SHA for 0f8108c

Commits on Sep 12, 2023

• removed cplex sorting warning

  trevorb1

  committed
  d62b8f3

  Copy full SHA for d62b8f3

• Merge pull request #196 from OSeMOSYS/issue-195

  Show description for bc6d46e
  trevorb1

  authored
  bc6d46e

  Copy full SHA for bc6d46e

Commits on Sep 22, 2023

• Added joss badge to readme

  willu47

  committed
  6338805

  Copy full SHA for 6338805

Commits on Sep 25, 2023

• Merge pull request #198 from OSeMOSYS/joss_badge

  willu47

  authored
  acbd91e

  Copy full SHA for acbd91e

Commits on Oct 21, 2023

• change int to int64

  trevorb1

  committed
  022de26

  Copy full SHA for 022de26

• update param and set int dtypes to int64

  trevorb1

  committed
  d9a78ee

  Copy full SHA for d9a78ee

• fix int64 check

  trevorb1

  committed
  019a096

  Copy full SHA for 019a096

• linting fix

  trevorb1

  committed
  2890770

  Copy full SHA for 2890770

• update int to int64

  trevorb1

  committed
  9b21c53

  Copy full SHA for 9b21c53

• fix int to int64 in results

  trevorb1

  committed
  c21fe2a

  Copy full SHA for c21fe2a

Commits on Oct 22, 2023

• specify lineterminator in writing datafiles

  trevorb1

  committed
  2f3df18

  Copy full SHA for 2f3df18

• fix linting

  trevorb1

  committed
  d06a051

  Copy full SHA for d06a051

• fix int to int64 issue in read_strategies

  trevorb1

  committed
  6066f34

  Copy full SHA for 6066f34

Commits on Oct 23, 2023

• fix NamedTemporaryFile tests for Windows

  trevorb1

  committed
  ad87fd2

  Copy full SHA for ad87fd2

• add Windows to CI

  trevorb1

  committed
  f84d1f7

  Copy full SHA for f84d1f7

• Merge pull request #203 from trevorb1/issue-202

  Show description for 7d905a9
  trevorb1

  authored
  7d905a9

  Copy full SHA for 7d905a9

Commits on Oct 24, 2023

• update graphviz install instructions

  trevorb1

  committed
  19c055a

  Copy full SHA for 19c055a

• added graphviz to requirements

  trevorb1

  committed
  6843b5e

  Copy full SHA for 6843b5e

• add contributing guidelines link

  trevorb1

  committed
  806a3f7

  Copy full SHA for 806a3f7

Commits on Nov 3, 2023

• update readme

  trevorb1

  committed
  f9eca92

  Copy full SHA for f9eca92

• badge formatting

  trevorb1

  committed
  f3eb56b

  Copy full SHA for f3eb56b

• Merge pull request #206 from trevorb1/update-readme

  Show description for f09b48b
  trevorb1

  authored
  f09b48b

  Copy full SHA for f09b48b

• Merge branch 'master' into issue-204

  trevorb1

  committed
  8cef3b8

  Copy full SHA for 8cef3b8

• fix graphviz dependency

  trevorb1

  committed
  d7f668e

  Copy full SHA for d7f668e

• Merge pull request #205 from trevorb1/issue-204

  Show description for 5331c5d
  trevorb1

  authored
  5331c5d

  Copy full SHA for 5331c5d

Commits on Nov 8, 2023

• Fix validation example typo

  trevorb1

  authored
  21afaef

  Copy full SHA for 21afaef

Commits on Dec 7, 2023

• update citations for joss

  trevorb1

  committed
  18273bf

  Copy full SHA for 18273bf

• update changelog

  trevorb1

  committed
  79fea51

  Copy full SHA for 79fea51

• add zenodo title and description

  trevorb1

  committed
  33c63e3

  Copy full SHA for 33c63e3

• linting fix

  trevorb1

  committed
  0b962f5

  Copy full SHA for 0b962f5

• CHANGELOG.rst

  trevorb1

  committed
  cd16d6d

  Copy full SHA for cd16d6d

Commits on Dec 8, 2023

• update coveralls to use github action

  trevorb1

  committed
  1752755

  Copy full SHA for 1752755

• coveralls update

  trevorb1

  committed
  fdd690f

  Copy full SHA for fdd690f

• revert coveralls action

  trevorb1

  committed
  77e269d

  Copy full SHA for 77e269d

Commits on Dec 11, 2023

• update converage upload condition

  trevorb1

  committed
  d6f40c6

  Copy full SHA for d6f40c6

• fix action

  trevorb1

  committed
  754fe81

  Copy full SHA for 754fe81

• update syntax in action

  trevorb1

  committed
  5db9938

  Copy full SHA for 5db9938

• switch to coveralls action

  trevorb1

  committed
  4ad32db

  Copy full SHA for 4ad32db

• please work

  trevorb1

  committed
  e5df455

  Copy full SHA for e5df455

• revert to not using action

  trevorb1

  committed
  724b735

  Copy full SHA for 724b735

• Merge pull request #207 from OSeMOSYS/update-metadata

  Show description for 96dab31
  trevorb1

  authored
  96dab31

  Copy full SHA for 96dab31

Commits on Dec 12, 2023

• Update .zenodo.json

  Show description for f9ffec2
  trevorb1

  authored
  f9ffec2

  Copy full SHA for f9ffec2

Commits on Dec 14, 2023

• docs req and changlog update

  trevorb1

  committed
  34166a3

  Copy full SHA for 34166a3

Commits on Dec 15, 2023

• Modified citation file with template for JOSS article

  willu47

  committed
  3a346de

  Copy full SHA for 3a346de

• Update coveralls workflow to use lcov

  willu47

  committed
  cc90480

  Copy full SHA for cc90480

• Added note about coverage in contributing docs

  willu47

  committed
  d9bccb5

  Copy full SHA for d9bccb5

• Regression in tests caused by pandas fixed by pandas 2.1.4

  willu47

  committed
  dcd5a49

  Copy full SHA for dcd5a49

Commits on Dec 18, 2023

• Merge pull request #211 from OSeMOSYS/issue_194

  willu47

  authored
  1197393

  Copy full SHA for 1197393

• Merge pull request #210 from OSeMOSYS/coveralls

  willu47

  authored
  9be8c54

  Copy full SHA for 9be8c54

Commits on Dec 22, 2023

• Use recommended citation file from JOSS

  willu47

  committed
  53fa0d4

  Copy full SHA for 53fa0d4

Commits on Jan 7, 2024

• Merge pull request #209 from OSeMOSYS/citation

  Show description for 48b05aa
  willu47

  authored
  48b05aa

  Copy full SHA for 48b05aa

Commits on Jan 19, 2024

• Allow discount rate with/out technology index

  willu47

  committed
  ccb9e35

  Copy full SHA for ccb9e35

Commits on Jan 23, 2024

• update changelog

  trevorb1

  committed
  49bfbaf

  Copy full SHA for 49bfbaf

• fix linting issue on changelog

  trevorb1

  committed
  57accd1

  Copy full SHA for 57accd1

Commits on Jan 25, 2024

• Simplify assignment

  willu47

  committed
  f877a3a

  Copy full SHA for f877a3a

• Merge branch 'issue_197' of https://github.com/OSeMOSYS/otoole into issue_197

  willu47

  committed
  3450059

  Copy full SHA for 3450059

• Merge pull request #213 from OSeMOSYS/issue_197

  Show description for 15bdc0b
  willu47

  authored
  15bdc0b

  Copy full SHA for 15bdc0b

Commits on Mar 31, 2024

• upgrade to mypy 1.9.0

  trevorb1

  committed
  cfc0ccc

  Copy full SHA for cfc0ccc

• Merge pull request #223 from OSeMOSYS/issue-222

  Show description for 8e103ed
  trevorb1

  authored
  8e103ed

  Copy full SHA for 8e103ed

Commits on May 10, 2024

• added instructions to install graphviz, if needed

  AgnesBelt

  committed
  e0a612d

  Copy full SHA for e0a612d

Commits on May 18, 2024

• update graphviz install instructions

  trevorb1

  committed
  15e5dae

  Copy full SHA for 15e5dae

• Merge pull request #225 from AgnesBelt/documentation

  Show description for efe0e17
  trevorb1

  authored
  efe0e17

  Copy full SHA for efe0e17