From c073a2f2f1446ced80fddce82c99a3461bc6a1a3 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 19 Jun 2023 18:11:27 -0400 Subject: [PATCH] build: pin alembic to avoid a dataset bug The bug report: https://github.com/pudo/dataset/issues/419 Without the pin, this error happens when running this command: ``` $ conventional_commits collect --ignore='*-private' edx/* openedx/* Traceback (most recent call last): File "/usr/local/virtualenvs/repo-tools/bin/conventional_commits", line 33, in sys.exit(load_entry_point('edx-repo-tools', 'console_scripts', 'conventional_commits')()) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/click/core.py", line 1130, in __call__ return self.main(*args, **kwargs) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/click/core.py", line 1055, in main rv = self.invoke(ctx) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/click/core.py", line 1657, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/click/core.py", line 1404, in invoke return ctx.invoke(self.callback, **ctx.params) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/click/core.py", line 760, in invoke return __callback(*args, **kwargs) File "/System/Volumes/Data/root/src/edx/src/repo-tools/edx_repo_tools/conventional_commits/commitstats.py", line 134, in collect load_commits(db, repo_name) File "/System/Volumes/Data/root/src/edx/src/repo-tools/edx_repo_tools/conventional_commits/commitstats.py", line 71, in load_commits commit_table.insert(row) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/dataset/table.py", line 118, in insert row = self._sync_columns(row, ensure, types=types) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/dataset/table.py", line 381, in _sync_columns self._sync_table(sync_columns.values()) File "/usr/local/virtualenvs/repo-tools/lib/python3.8/site-packages/dataset/table.py", line 356, in _sync_table self.db.op.add_column(self.name, column, self.db.schema) TypeError: add_column() takes 3 positional arguments but 4 were given ``` --- edx_repo_tools/conventional_commits/extra.txt | 10 ++++++---- requirements/base.txt | 6 +++--- requirements/constraints.txt | 2 ++ requirements/development.txt | 8 ++++---- requirements/pip.txt | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/edx_repo_tools/conventional_commits/extra.txt b/edx_repo_tools/conventional_commits/extra.txt index 821406f0..1d49ab46 100644 --- a/edx_repo_tools/conventional_commits/extra.txt +++ b/edx_repo_tools/conventional_commits/extra.txt @@ -4,8 +4,10 @@ # # make upgrade # -alembic==1.11.1 - # via dataset +alembic==1.10.4 + # via + # -c edx_repo_tools/conventional_commits/../../requirements/constraints.txt + # dataset banal==1.0.6 # via dataset contourpy==1.1.0 @@ -18,7 +20,7 @@ fonttools==4.40.0 # via matplotlib greenlet==2.0.2 # via sqlalchemy -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via alembic importlib-resources==5.12.0 # via @@ -43,7 +45,7 @@ pandas==2.0.2 # via -r edx_repo_tools/conventional_commits/extra.in pillow==9.5.0 # via matplotlib -pyparsing==3.0.9 +pyparsing==3.1.0 # via matplotlib python-dateutil==2.8.2 # via diff --git a/requirements/base.txt b/requirements/base.txt index 203e92bf..67c6b73c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -121,7 +121,7 @@ path==16.6.0 # via path-py path-py==12.5.0 # via -r requirements/base.in -platformdirs==3.5.3 +platformdirs==3.6.0 # via virtualenv pluggy==1.0.0 # via @@ -180,7 +180,7 @@ requests-oauthlib==1.3.1 # via jira requests-toolbelt==1.0.0 # via jira -ruamel-yaml==0.17.31 +ruamel-yaml==0.17.32 # via -r requirements/base.in ruamel-yaml-clib==0.2.7 # via ruamel-yaml @@ -226,7 +226,7 @@ urllib3==2.0.3 # via requests urlobject==2.4.3 # via -r requirements/base.in -virtualenv==20.23.0 +virtualenv==20.23.1 # via tox volatile==2.1.0 # via bowler diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 88be8121..d0cf745b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1 +1,3 @@ -c common_constraints.txt + +alembic<1.11 diff --git a/requirements/development.txt b/requirements/development.txt index 4ad2039f..eb545879 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -204,7 +204,7 @@ pep8==1.7.1 # via -r requirements/development.in pip-tools==6.13.0 # via -r requirements/development.in -platformdirs==3.5.3 +platformdirs==3.6.0 # via # -r requirements/base.txt # pylint @@ -272,7 +272,7 @@ pytest==7.3.2 # pytest-xdist pytest-logging==2015.11.4 # via -r requirements/base.txt -pytest-mock==3.10.0 +pytest-mock==3.11.1 # via -r requirements/development.in pytest-xdist==3.3.1 # via -r requirements/base.txt @@ -318,7 +318,7 @@ requests-toolbelt==1.0.0 # jira responses==0.23.1 # via -r requirements/development.in -ruamel-yaml==0.17.31 +ruamel-yaml==0.17.32 # via -r requirements/base.txt ruamel-yaml-clib==0.2.7 # via @@ -397,7 +397,7 @@ urllib3==2.0.3 # responses urlobject==2.4.3 # via -r requirements/base.txt -virtualenv==20.23.0 +virtualenv==20.23.1 # via # -r requirements/base.txt # tox diff --git a/requirements/pip.txt b/requirements/pip.txt index 5a5ce227..fa19e6f0 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.40.0 # The following packages are considered to be unsafe in a requirements file: pip==23.1.2 # via -r requirements/pip.in -setuptools==67.8.0 +setuptools==68.0.0 # via -r requirements/pip.in