From 6048e7620232a195490d6ca97bbf2c85744d6de2 Mon Sep 17 00:00:00 2001
From: Evan Hubinger <evanjhub@gmail.com>
Date: Fri, 30 Aug 2024 22:27:09 -0700
Subject: [PATCH] Update dependencies

---
 .pre-commit-config.yaml |  2 +-
 Makefile                | 10 +++++-----
 coconut/constants.py    | 25 ++++++++++++++++---------
 coconut/root.py         |  2 +-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e1ea9b6a..2b253a6d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -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:
diff --git a/Makefile b/Makefile
index e96ed3ee..f60e01a9 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/coconut/constants.py b/coconut/constants.py
index 14960727..a2cabc76 100644
--- a/coconut/constants.py
+++ b/coconut/constants.py
@@ -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"),
@@ -1037,6 +1040,7 @@ def get_path_env_var(env_var, default):
         ("pytest", "py>=36;py<38"),
         ("pytest", "py38"),
         "pexpect",
+        "pytest_remotedata",  # fixes a pytest error
     ),
 }
 
@@ -1044,22 +1048,24 @@ def get_path_env_var(env_var, default):
 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),
@@ -1067,11 +1073,12 @@ def get_path_env_var(env_var, default):
     ("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 = {
@@ -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,),
diff --git a/coconut/root.py b/coconut/root.py
index 8e906330..3fa2df30 100644
--- a/coconut/root.py
+++ b/coconut/root.py
@@ -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"