Skip to content

Commit 42355d1

Browse files
tamarl08tamarl08
authored
Merge pull request #643 from EducationalTestingService/release/11.0.0
Release/11.0.1
2 parents 420b371 + fe80852 commit 42355d1

File tree

54 files changed

+138
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+138
-93
lines changed

‎.readthedocs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ python:
1717
version: "3.8"
1818
install:
1919
- requirements: doc/requirements.txt
20-
system_packages: true

‎README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Rater Scoring Modeling Tool
1717
:target: https://anaconda.org/ets/rsmtool
1818
:alt: Conda package for SKLL
1919

20-
.. image:: https://img.shields.io/readthedocs/rsmtool/v10.0.0.svg
20+
.. image:: https://img.shields.io/readthedocs/rsmtool/v11.0.1.svg
2121
:target: https://rsmtool.readthedocs.io
2222
:alt: Docs
2323

@@ -70,7 +70,8 @@ Requirements
7070
- ``jupyter``
7171
- ``notebook``
7272
- ``seaborn``
73-
- ``shap``==0.42.0
73+
- ``shap==0.42.0``
74+
- ``wandb``
7475

7576
Contributing
7677
------------

‎conda-recipe/rsmtool/meta.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: rsmtool
3-
version: 10.0.0
3+
version: 11.0.1
44

55
source:
66
path: ../../../rsmtool
@@ -28,21 +28,21 @@ requirements:
2828
- pip
2929
- setuptools
3030
run:
31-
- python
32-
- jupyter
3331
- ipython
34-
- nose
32+
- jupyter
3533
- notebook
36-
- numpy
34+
- numpy<1.25
3735
- openpyxl
3836
- pandas
37+
- python
3938
- seaborn
39+
- shap==0.42.1
4040
- skll==4.0.0
4141
- statsmodels
4242
- tqdm
43+
- wandb
4344
- xlrd
4445
- xlwt
45-
- shap==0.42.1
4646

4747
test:
4848
# Python imports

‎doc/internal/release_process.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This process is only meant for the project administrators, not users and develop
55

66
#. Recreate the development environment so all unpinned packages are updated to their latest versions. See instructions for this `here <https://rsmtool.readthedocs.io/en/main/contributing.html#setting-up>`_.
77

8-
#. Make sure any and all tests are passing in ``main``. Make sure you have also run tests locally in strict mode (``STRICT=1 nosetests --nologcapture tests``) to catch any warnings in the HTML report that can be fixed before the release.
8+
#. Make sure any and all tests are passing in ``main``. Make sure you have also run tests locally in strict mode (``STRICT=1 nose2 -s tests``) to catch any warnings in the HTML report that can be fixed before the release.
99

1010
#. Run the ``tests/update_files.py`` script with the appropriate arguments to make sure that all test data in the new release have correct experiment ids and filenames. If any (non-model) files need to be changed this should be investigated before the branch is released. Please see more details about running this `here <https://rsmtool.readthedocs.io/en/main/contributing.html#writing-new-functional-tests>`__.
1111

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ipython
44
jupyter
55
nose2
66
notebook
7-
numpy
7+
numpy<1.25
88
openpyxl
99
pandas
1010
pre-commit

‎rsmtool/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
in one place. Based on the suggestion `here. <http://bit.ly/16LbuJF>`_
66
"""
77

8-
__version__ = "10.0.0"
8+
__version__ = "11.0.1"
99
VERSION = tuple(int(x) for x in __version__.split("."))

‎tests/data/experiments/linearsvr-self-compare/linearsvr/output/LinearSVR_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/linearsvr-self-summary/linearsvr/output/LinearSVR_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/linearsvr-self-summary/output/model_comparison_rsmsummarize.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
"custom_sections": null,
1616
"subgroups": [],
1717
"section_order": null,
18-
"experiment_names": null
18+
"experiment_names": null,
19+
"use_wandb": false,
20+
"wandb_project": null,
21+
"wandb_entity": null
1922
}

‎tests/data/experiments/lr-different-compare/lr-subset-features/output/lr_subset_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/lr-different-compare/lr/output/lr_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/lr-eval-self-compare/lr-eval-with-h2/output/lr_eval_with_h2_rsmeval.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
"min_n_per_group": null,
2828
"section_order": null,
2929
"flag_column": null,
30-
"min_items_per_candidate": null
30+
"min_items_per_candidate": null,
31+
"use_wandb": false,
32+
"wandb_project": null,
33+
"wandb_entity": null
3134
}

‎tests/data/experiments/lr-eval-tool-compare/lr-eval-with-h2/output/lr_eval_with_h2_rsmeval.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
"min_n_per_group": null,
2828
"section_order": null,
2929
"flag_column": null,
30-
"min_items_per_candidate": null
30+
"min_items_per_candidate": null,
31+
"use_wandb": false,
32+
"wandb_project": null,
33+
"wandb_entity": null
3134
}

‎tests/data/experiments/lr-eval-tool-compare/lr-with-h2/output/lr_with_h2_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/lr-self-compare-dict/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare-different-format/lr-with-tsv-output/output/lr_with_tsv_output_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/lr-self-compare-object/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare-with-chosen-sections/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare-with-custom-order/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare-with-custom-sections-and-custom-order/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare-with-h2/lr-with-h2/output/lr_with_h2_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/lr-self-compare-with-subgroups-and-edge-cases/lr-subgroups-with-edge-cases/output/lr_subgroups_with_edge_cases_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
"flag_column_test": null,
4343
"min_items_per_candidate": null,
4444
"use_wandb": false,
45-
"wandb_project": "",
46-
"wandb_entity": ""
45+
"wandb_project": null,
46+
"wandb_entity": null
4747
}

‎tests/data/experiments/lr-self-compare-with-subgroups-and-h2/lr-subgroups-with-h2/output/lr_subgroups_with_h2_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare-with-thumbnails/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-compare/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-eval-summary/lr-eval/output/lr_evaluation_rsmeval.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@
2626
"min_n_per_group": null,
2727
"section_order": null,
2828
"flag_column": null,
29-
"min_items_per_candidate": null
29+
"min_items_per_candidate": null,
30+
"use_wandb": false,
31+
"wandb_project": null,
32+
"wandb_entity": null
3033
}

‎tests/data/experiments/lr-self-eval-summary/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-eval-summary/output/model_comparison_rsmsummarize.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
"custom_sections": null,
1717
"subgroups": [],
1818
"section_order": null,
19-
"experiment_names": null
19+
"experiment_names": null,
20+
"use_wandb": false,
21+
"wandb_project": null,
22+
"wandb_entity": null
2023
}

‎tests/data/experiments/lr-self-summary-dict/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-summary-no-scaling/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-summary-no-scaling/output/model_comparison_rsmsummarize.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
"custom_sections": null,
1616
"subgroups": [],
1717
"section_order": null,
18-
"experiment_names": null
18+
"experiment_names": null,
19+
"use_wandb": false,
20+
"wandb_project": null,
21+
"wandb_entity": null
1922
}

‎tests/data/experiments/lr-self-summary-no-trim/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-summary-no-trim/lr-with-trim-tolerance/output/lr_with_trim_tolerance_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"flag_column_test": null,
4141
"min_items_per_candidate": null,
4242
"use_wandb": false,
43-
"wandb_project": "",
44-
"wandb_entity": ""
43+
"wandb_project": null,
44+
"wandb_entity": null
4545
}

‎tests/data/experiments/lr-self-summary-no-trim/output/model_comparison_rsmsummarize.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
"custom_sections": null,
1616
"subgroups": [],
1717
"section_order": null,
18-
"experiment_names": null
18+
"experiment_names": null,
19+
"use_wandb": false,
20+
"wandb_project": null,
21+
"wandb_entity": null
1922
}

‎tests/data/experiments/lr-self-summary-object/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"flag_column_test": null,
4444
"min_items_per_candidate": null,
4545
"use_wandb": false,
46-
"wandb_project": "",
47-
"wandb_entity": ""
46+
"wandb_project": null,
47+
"wandb_entity": null
4848
}

‎tests/data/experiments/lr-self-summary-object/output/model_comparison_rsmsummarize.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
"custom_sections": null,
1616
"subgroups": [],
1717
"section_order": null,
18-
"experiment_names": null
18+
"experiment_names": null,
19+
"use_wandb": false,
20+
"wandb_project": null,
21+
"wandb_entity": null
1922
}

0 commit comments

Comments
 (0)