Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
evhub committed Aug 31, 2024
1 parent 373e38b commit 6048e76
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repos:
args:
- --autofix
- repo: https://github.com/pycqa/flake8
rev: 7.0.0
rev: 7.1.1
hooks:
- id: flake8
args:
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ dev-py3: clean setup-py3
.PHONY: setup
setup:
-python -m ensurepip
python -m pip install --upgrade setuptools wheel pip pytest_remotedata cython
python -m pip install --upgrade setuptools wheel pip cython

.PHONY: setup-py2
setup-py2:
-python2 -m ensurepip
python2 -m pip install --upgrade "setuptools<58" wheel pip pytest_remotedata cython
python2 -m pip install --upgrade "setuptools<58" wheel pip cython

.PHONY: setup-py3
setup-py3:
-python3 -m ensurepip
python3 -m pip install --upgrade setuptools wheel pip pytest_remotedata cython
python3 -m pip install --upgrade setuptools wheel pip cython

.PHONY: setup-pypy
setup-pypy:
-pypy -m ensurepip
pypy -m pip install --upgrade "setuptools<58" wheel pip pytest_remotedata
pypy -m pip install --upgrade "setuptools<58" wheel pip

.PHONY: setup-pypy3
setup-pypy3:
-pypy3 -m ensurepip
pypy3 -m pip install --upgrade setuptools wheel pip pytest_remotedata
pypy3 -m pip install --upgrade setuptools wheel pip

.PHONY: install
install: setup
Expand Down
25 changes: 16 additions & 9 deletions coconut/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,9 @@ def get_path_env_var(env_var, default):
("pygments", "py>=39"),
"myst-parser",
"pydata-sphinx-theme",
# these are necessary to fix a sphinx error
"sphinxcontrib_applehelp",
"sphinxcontrib_htmlhelp",
),
"numpy": (
("numpy", "py<3;cpy"),
Expand All @@ -1037,41 +1040,45 @@ def get_path_env_var(env_var, default):
("pytest", "py>=36;py<38"),
("pytest", "py38"),
"pexpect",
"pytest_remotedata", # fixes a pytest error
),
}

# min versions are inclusive
unpinned_min_versions = {
"cPyparsing": (2, 4, 7, 2, 4, 0),
("pre-commit", "py3"): (3,),
("psutil", "py>=27"): (5,),
"jupyter": (1, 0),
("psutil", "py>=27"): (6,),
"jupyter": (1, 1),
"types-backports": (0, 1),
("futures", "py<3"): (3, 4),
("argparse", "py<27"): (1, 4),
"pexpect": (4,),
("trollius", "py<3;cpy"): (2, 2),
"requests": (2, 32),
("numpy", "py39"): (1, 26),
("numpy", "py39"): (2,),
("xarray", "py39"): (2024,),
("dataclasses", "py==36"): (0, 8),
("aenum", "py<34"): (3, 1, 15),
"pydata-sphinx-theme": (0, 15),
"myst-parser": (3,),
"sphinx": (7,),
"mypy[python2]": (1, 10),
"myst-parser": (4,),
"sphinx": (8,),
"sphinxcontrib_applehelp": (2,),
"sphinxcontrib_htmlhelp": (2,),
"mypy[python2]": (1, 11),
"pyright": (1, 1),
("jupyter-console", "py37"): (6, 6),
("typing", "py<35"): (3, 10),
("typing_extensions", "py>=38"): (4, 12),
("ipykernel", "py38"): (6,),
("jedi", "py39"): (0, 19),
("pygments", "py>=39"): (2, 18),
("xonsh", "py39"): (0, 16),
("xonsh", "py39"): (0, 18),
("async_generator", "py35"): (1, 10),
("exceptiongroup", "py37;py<311"): (1,),
("ipython", "py>=310"): (8, 25),
("ipython", "py>=310"): (8, 27),
"py-spy": (0, 3),
"pytest_remotedata": (0, 4),
}

pinned_min_versions = {
Expand All @@ -1088,7 +1095,7 @@ def get_path_env_var(env_var, default):
# don't upgrade these; they break on Python 3.6
("anyio", "py36"): (3,),
("xonsh", "py>=36;py<39"): (0, 11),
("pandas", "py36"): (1,),
("pandas", "py36"): (1, 16),
("jupyter-client", "py36"): (7, 1, 2),
("typing_extensions", "py==36"): (4, 1),
("pytest", "py>=36;py<38"): (7,),
Expand Down
2 changes: 1 addition & 1 deletion coconut/root.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
VERSION = "3.1.1"
VERSION_NAME = None
# False for release, int >= 1 for develop
DEVELOP = 6
DEVELOP = 7
ALPHA = False # for pre releases rather than post releases

assert DEVELOP is False or DEVELOP >= 1, "DEVELOP must be False or an int >= 1"
Expand Down

0 comments on commit 6048e76

Please sign in to comment.