From 8cad52e9a1b32d60cd248ae6b8d36fbcffffe8e8 Mon Sep 17 00:00:00 2001 From: Bernard Kleynhans <31479649+bkleyn@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:29:38 -0400 Subject: [PATCH] Update CI with supported Python versions and Remove Spock (#32) --- .github/workflows/ci.yml | 3 +- CHANGELOG.txt | 8 + README.md | 1 - docs/.buildinfo | 2 +- docs/_sources/index.rst.txt | 1 - docs/_static/documentation_options.js | 2 +- docs/_static/pygments.css | 34 +-- docs/api.html | 2 +- docs/contributing.html | 2 +- docs/examples.html | 2 +- docs/genindex.html | 2 +- docs/index.html | 3 +- docs/installation.html | 2 +- docs/objects.inv | Bin 1196 -> 1196 bytes docs/py-modindex.html | 2 +- docs/quick.html | 2 +- docs/search.html | 2 +- docs/searchindex.js | 2 +- docsrc/index.rst | 1 - mab2rec/_version.py | 2 +- mab2rec/config.py | 390 -------------------------- requirements.txt | 3 +- scripts/README.md | 20 -- scripts/score.py | 10 - scripts/score.yaml | 11 - scripts/train.py | 10 - scripts/train.yaml | 15 - setup.py | 4 +- tests/test_pipeline.py | 4 +- 29 files changed, 46 insertions(+), 496 deletions(-) delete mode 100644 mab2rec/config.py delete mode 100644 scripts/README.md delete mode 100644 scripts/score.py delete mode 100644 scripts/score.yaml delete mode 100644 scripts/train.py delete mode 100644 scripts/train.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b445c56..dbd9da5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10'] os: [ubuntu-latest, macos-latest, windows-latest] + fail-fast: false steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 816f372..85f825a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,14 @@ CHANGELOG ========= +------------------------------------------------------------------------------- +August, 16, 2023 1.2.0 +------------------------------------------------------------------------------- + +Major: +- Removed spock-config dependency and train/test scripts using Spock +- Updated tests and documentation to reflect Python 3.8+ support + ------------------------------------------------------------------------------- February, 23, 2023 1.1.0 ------------------------------------------------------------------------------- diff --git a/README.md b/README.md index 3c38f53..950a7d4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ Mab2Rec is built on top of several other open-source software developed at the A * [Selective](https://github.com/fidelity/selective) to create user representations via feature selection ([CPAIOR'21](https://link.springer.com/chapter/10.1007/978-3-030-78230-6_27), [DSO@IJCAI'21](https://arxiv.org/abs/2112.03105)). * [Seq2Pat](https://github.com/fidelity/seq2pat) to create users representations via sequential pattern mining ([AAAI'22](https://ojs.aaai.org/index.php/AAAI/article/view/21542), [KDF@AAAI'22](https://arxiv.org/abs/2201.09178), [Frontiers'22](https://www.frontiersin.org/articles/10.3389/frai.2022.868085/full)) * [Jurity](https://github.com/fidelity/jurity) to evaluate recommendations including fairness metrics ([ICMLA'21](https://ieeexplore.ieee.org/abstract/document/9680169)). -* [Spock](https://github.com/fidelity/spock) to define, manage, and use parameter configurations. An introduction to **content- and context-aware** recommender systems and an overview of the building blocks of the library is presented at [All Things Open 2021](https://www.youtube.com/watch?v=54d_YUalvOA). There is also a corresponding [blogpost](https://2022.allthingsopen.org/introducing-mab2rec-a-multi-armed-bandit-recommender-library/) as a starting point for practioners to build and deploy bandit-based recommenders using Mab2Rec. diff --git a/docs/.buildinfo b/docs/.buildinfo index c4ac5ac..a164187 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 423b126963c83a09a0c5706ab603116b +config: 8217e7f6830b05122d0f67cec6a6b522 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_sources/index.rst.txt b/docs/_sources/index.rst.txt index 6c7ff14..49dff23 100644 --- a/docs/_sources/index.rst.txt +++ b/docs/_sources/index.rst.txt @@ -14,7 +14,6 @@ Mab2Rec and several of the open-source software it is built on is developed by t * `Selective `_ to create user representations via feature selection. * `Seq2Pat `_ to enhance users representations via sequential pattern mining (`AAAI'22 `_). * `Jurity `_ to evaluate recommendations including fairness metrics (`ICMLA'21 `_). -* `Spock `_ to define, manage, and use parameter configurations. An introduction to **content- and context-aware** recommender systems and an overview of the building blocks of the library is `presented at All Things Open 2021 `_. diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 9fd31e4..5be98c4 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '1.0.1', + VERSION: '1.2.0', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/_static/pygments.css b/docs/_static/pygments.css index 582d5c3..08bec68 100644 --- a/docs/_static/pygments.css +++ b/docs/_static/pygments.css @@ -5,22 +5,22 @@ td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight { background: #f8f8f8; } -.highlight .c { color: #408080; font-style: italic } /* Comment */ +.highlight .c { color: #3D7B7B; font-style: italic } /* Comment */ .highlight .err { border: 1px solid #FF0000 } /* Error */ .highlight .k { color: #008000; font-weight: bold } /* Keyword */ .highlight .o { color: #666666 } /* Operator */ -.highlight .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #BC7A00 } /* Comment.Preproc */ -.highlight .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ +.highlight .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.highlight .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #9C6500 } /* Comment.Preproc */ +.highlight .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.highlight .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ .highlight .gd { color: #A00000 } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #FF0000 } /* Generic.Error */ +.highlight .gr { color: #E40000 } /* Generic.Error */ .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.highlight .gi { color: #00A000 } /* Generic.Inserted */ -.highlight .go { color: #888888 } /* Generic.Output */ +.highlight .gi { color: #008400 } /* Generic.Inserted */ +.highlight .go { color: #717171 } /* Generic.Output */ .highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ @@ -33,15 +33,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .highlight .kt { color: #B00040 } /* Keyword.Type */ .highlight .m { color: #666666 } /* Literal.Number */ .highlight .s { color: #BA2121 } /* Literal.String */ -.highlight .na { color: #7D9029 } /* Name.Attribute */ +.highlight .na { color: #687822 } /* Name.Attribute */ .highlight .nb { color: #008000 } /* Name.Builtin */ .highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */ .highlight .no { color: #880000 } /* Name.Constant */ .highlight .nd { color: #AA22FF } /* Name.Decorator */ -.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.highlight .ni { color: #717171; font-weight: bold } /* Name.Entity */ +.highlight .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0000FF } /* Name.Function */ -.highlight .nl { color: #A0A000 } /* Name.Label */ +.highlight .nl { color: #767600 } /* Name.Label */ .highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ .highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #19177C } /* Name.Variable */ @@ -58,11 +58,11 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .highlight .dl { color: #BA2121 } /* Literal.String.Delimiter */ .highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .highlight .s2 { color: #BA2121 } /* Literal.String.Double */ -.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.highlight .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ .highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.highlight .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ .highlight .sx { color: #008000 } /* Literal.String.Other */ -.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ +.highlight .sr { color: #A45A77 } /* Literal.String.Regex */ .highlight .s1 { color: #BA2121 } /* Literal.String.Single */ .highlight .ss { color: #19177C } /* Literal.String.Symbol */ .highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ diff --git a/docs/api.html b/docs/api.html index 54f7f88..67de3db 100644 --- a/docs/api.html +++ b/docs/api.html @@ -4,7 +4,7 @@ - Mab2Rec Public API — Mab2Rec 1.0.1 documentation + Mab2Rec Public API — Mab2Rec 1.2.0 documentation