Skip to content

Commit

Permalink
Merge branch 'temporary_fix_jsonschema' into pin_setuptools_scm
Browse files Browse the repository at this point in the history
  • Loading branch information
molpopgen committed Sep 27, 2023
2 parents a35c677 + ca43b10 commit f23610a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ scipy
attrs
black
demes~=0.2.2
# NOTE: this jsonschema pin is a hack until tskit issue 2840
# is resolved
jsonschema<=4.18.6

#below are for building package
#and running tests
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ install_requires =
scipy
tskit ~= 0.5.0
demes ~= 0.2.2
# NOTE: this jsonschema pin is a hack until tskit issue 2840
# is resolved
jsonschema < 4.18.7
setup_requires =
setuptools
setuptools_scm
Expand Down

0 comments on commit f23610a

Please sign in to comment.