diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4fef77b4cd..5ed0a10f2cd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -476,6 +476,20 @@ $ python3 -m pip install -r requirements/integration.txt $ pip-compile-multi --no-upgrade ``` +When upgrading the version number of a single package, you should run `pip-compile-multi` with the `-P` flag: + +```bash +$ pip-compile-multi -P my-package +``` + +To bring all dependencies up to date as per the restrictions defined in `setup.py` and `requirements/*.in`, run pip-compile-multi` without any flags: + +```bash +$ pip-compile-multi +``` + +This should be done periodically, but it is rcommended to do thorough manual testing of the application to ensure no breaking changes have been introduced that aren't caught by the unit and integration tests. + #### Logging to the browser console This feature is only available on Python 3. When debugging your application, you can have the server logs sent directly to the browser console using the [ConsoleLog](https://github.com/betodealmeida/consolelog) package. You need to mutate the app, by adding the following to your `config.py` or `superset_config.py`: diff --git a/requirements/base.in b/requirements/base.in index f2b8a7c4403..77ada0613ae 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -19,3 +19,4 @@ pyrsistent>=0.16.1,<0.17 zipp==3.4.1 sasl==0.3.1 +wrapt==1.12.1 # required by astroid<2.9 until we bump pylint diff --git a/requirements/base.txt b/requirements/base.txt index ced4edfb2a0..ef034bb71df 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:04efc15075d69b1a2b5fa6c76b84c77a2f5c04e3 +# SHA1:8e1f4e29cff52824dc5e1c2937c4ea1b1b3187fe # # This file is autogenerated by pip-compile-multi # To update, run: @@ -164,7 +164,7 @@ numpy==1.21.1 # via # pandas # pyarrow -packaging==21.0 +packaging==21.3 # via # bleach # deprecation @@ -189,7 +189,7 @@ pyjwt==1.7.1 # flask-jwt-extended pymeeus==0.5.11 # via convertdate -pyparsing==2.4.7 +pyparsing==3.0.6 # via # apache-superset # packaging diff --git a/requirements/integration.in b/requirements/integration.in index 1bc94c7fb71..763cb936e0f 100644 --- a/requirements/integration.in +++ b/requirements/integration.in @@ -19,4 +19,3 @@ pre-commit tox py>=1.10.0 click==7.1.2 -packaging==21.0 diff --git a/requirements/integration.txt b/requirements/integration.txt index b7da99e3da3..79431b5dd57 100644 --- a/requirements/integration.txt +++ b/requirements/integration.txt @@ -1,4 +1,4 @@ -# SHA1:17ab2346746deadfc557e1df96014e77c8337f4b +# SHA1:03eb2d96afe21f1bda1ab33b4cf84e670a1efe21 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -24,10 +24,8 @@ identify==2.2.13 # via pre-commit nodeenv==1.6.0 # via pre-commit -packaging==21.0 - # via - # -r requirements/integration.in - # tox +packaging==21.3 + # via tox pep517==0.11.0 # via pip-tools pip-compile-multi==2.4.1 @@ -44,7 +42,7 @@ py==1.10.0 # via # -r requirements/integration.in # tox -pyparsing==2.4.7 +pyparsing==3.0.6 # via packaging pyyaml==5.4.1 # via pre-commit diff --git a/requirements/testing.in b/requirements/testing.in index c172de6f26a..575016ff239 100644 --- a/requirements/testing.in +++ b/requirements/testing.in @@ -36,6 +36,5 @@ pytest pytest-cov statsd pytest-mock -packaging==21.0 # DB dependencies -e file:.[bigquery] diff --git a/requirements/testing.txt b/requirements/testing.txt index ef84e6973c4..806b186ea2b 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1,4 +1,4 @@ -# SHA1:4aabffca9a6688f2911d6f8697495e7045a529d0 +# SHA1:9658361c2ab00a6b27c5875b7b3557c2999854ba # # This file is autogenerated by pip-compile-multi # To update, run: diff --git a/setup.py b/setup.py index 3217b23fa5a..3ebf16e1c7b 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ setup( "parsedatetime", "pgsanity", "polyline", - "pyparsing>=2.4.7, <3.0.0", + "pyparsing>=3.0.6, <4", "python-dateutil", "python-dotenv", "python-geohash",