fix: add missing dependency (#413)

betodealmeida · Nov 9, 2023 · 4d83917 · 4d83917
1 parent bf0fe6d
commit 4d83917
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,11 @@ Changelog
 Next
 ====
 
+Version 1.2.10 - 2023-11-08
+===========================
+
+- Add missing ``requests-cache`` dependency (#413)
+
 Version 1.2.9 - 2023-11-08
 ==========================
 

diff --git a/README.rst b/README.rst
@@ -138,17 +138,14 @@ You also need to install optional dependencies, depending on the adapter you wan
 .. code-block:: bash
 
     $ pip install 'shillelagh[console]'        # to use the CLI
-    $ pip install 'shillelagh[datasetteapi]'   # for Datasette
     $ pip install 'shillelagh[genericjsonapi]' # for Generic JSON
     $ pip install 'shillelagh[genericxmlapi]'  # for Generic XML
     $ pip install 'shillelagh[githubapi]'      # for GitHub
     $ pip install 'shillelagh[gsheetsapi]'     # for GSheets
     $ pip install 'shillelagh[htmltableapi]'   # for HTML tables
     $ pip install 'shillelagh[pandasmemory]'   # for Pandas in memory
     $ pip install 'shillelagh[s3selectapi]'    # for S3 files
-    $ pip install 'shillelagh[socrataapi]'     # for Socrata API
     $ pip install 'shillelagh[systemapi]'      # for CPU information
-    $ pip install 'shillelagh[weatherapi]'     # for WeatherAPI
 
 Alternatively, you can install everything with:
 

diff --git a/docs/install.rst b/docs/install.rst
@@ -15,15 +15,12 @@ You also need to install optional dependencies, depending on the adapter you wan
 .. code-block:: bash
 
     $ pip install 'shillelagh[console]'       # to use the CLI
-    $ pip install 'shillelagh[datasetteapi]'  # for Datasette
     $ pip install 'shillelagh[githubapi]'     # for GitHub
     $ pip install 'shillelagh[gsheetsapi]'    # for GSheets
     $ pip install 'shillelagh[htmltableapi]'  # for HTML tables
     $ pip install 'shillelagh[pandasmemory]'  # for Pandas in memory
     $ pip install 'shillelagh[s3selectapi]'   # for S3 files
-    $ pip install 'shillelagh[socrataapi]'    # for Socrata API
     $ pip install 'shillelagh[systemapi]'     # for CPU information
-    $ pip install 'shillelagh[weatherapi]'    # for WeatherAPI
 
 Alternatively, you can install everything with:
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,10 +9,18 @@
     # via -r requirements/base.in
 apsw==3.38.5.post1
     # via shillelagh
+attrs==23.1.0
+    # via
+    #   cattrs
+    #   requests-cache
+cattrs==23.1.2
+    # via requests-cache
 certifi==2022.6.15
     # via requests
 charset-normalizer==2.1.0
     # via requests
+exceptiongroup==1.1.3
+    # via cattrs
 greenlet==2.0.2
     # via
     #   shillelagh
@@ -23,17 +31,31 @@ importlib-metadata==6.7.0
     # via shillelagh
 packaging==23.0
     # via shillelagh
+platformdirs==3.11.0
+    # via requests-cache
 python-dateutil==2.8.2
     # via shillelagh
 requests==2.31.0
+    # via
+    #   requests-cache
+    #   shillelagh
+requests-cache==1.1.0
     # via shillelagh
 six==1.16.0
-    # via python-dateutil
+    # via
+    #   python-dateutil
+    #   url-normalize
 sqlalchemy==1.4.39
     # via shillelagh
 typing-extensions==4.3.0
-    # via shillelagh
+    # via
+    #   cattrs
+    #   shillelagh
+url-normalize==1.4.3
+    # via requests-cache
 urllib3==1.26.10
-    # via requests
+    # via
+    #   requests
+    #   requests-cache
 zipp==3.15.0
     # via importlib-metadata
diff --git a/setup.cfg b/setup.cfg
@@ -44,6 +44,7 @@ install_requires =
     apsw>=3.9.2
     python_dateutil>=2.8.1
     requests>=2.31.0
+    requests-cache>=0.7.1
     sqlalchemy>=1.3
     greenlet>=2.0.2  # needed for Python 3.11 w/o memory leak
     typing_extensions>=3.7.4.3
@@ -93,7 +94,6 @@ testing =
     pytest-integration==0.2.2
     pytest-mock>=3.5.1
     pytest>=7.2.0
-    requests-cache>=0.7.1
     requests-mock>=1.8.0
     tabulate==0.8.9
     yarl>=1.8.1
@@ -112,7 +112,6 @@ all =
     prompt_toolkit>=3
     psutil>=5.8.0
     pygments>=2.8
-    requests-cache>=0.7.1
     tabulate==0.8.9
     yarl>=1.8.1
 docs =
@@ -122,19 +121,14 @@ console =
     appdirs>=1.4.4
     prompt_toolkit>=3
     pygments>=2.8
-    requests-cache>=0.7.1
     tabulate==0.8.9
-datasetteapi =
-    requests-cache>=0.7.1
 genericjsonapi =
     jsonpath-python>=1.0.5
     prison>=0.2.1
-    requests-cache>=0.7.1
     yarl>=1.8.1
 genericxmlapi =
     defusedxml>=0.7.1
     prison>=0.2.1
-    requests-cache>=0.7.1
     yarl>=1.8.1
 githubapi =
     jsonpath-python>=1.0.5
@@ -150,12 +144,8 @@ pandasmemory =
     pandas>=1.2.2
 s3selectapi =
     boto3>=1.24.28
-socrataapi =
-    requests-cache>=0.7.1
 systemapi =
     psutil>=5.8.0
-weatherapi =
-    requests-cache>=0.7.1
 
 [options.entry_points]
 # Add here console scripts like: