From e51767c76ab294645917536f44bce9a1b9342649 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 30 Oct 2021 12:42:28 -0500 Subject: [PATCH 1/3] Update requirement on flake8 and its dependencies --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index e3bca328..5e508c5d 100755 --- a/setup.py +++ b/setup.py @@ -47,21 +47,21 @@ def get_version(module='pylsp'): extras_require={ 'all': [ 'autopep8', - 'flake8>=3.8.0,<4.0.0', + 'flake8>=4.0.0,<4.1.0', 'mccabe>=0.6.0,<0.7.0', - 'pycodestyle>=2.7.0', + 'pycodestyle>=2.8.0,<2.9.0', 'pydocstyle>=2.0.0', - 'pyflakes>=2.3.0,<2.4.0', + 'pyflakes>=2.4.0,<2.5.0', 'pylint>=2.5.0', 'rope>=0.10.5', 'yapf', ], 'autopep8': ['autopep8'], - 'flake8': ['flake8>=3.8.0,<4.0.0'], + 'flake8': ['flake8>=4.0.0,<4.1.0'], 'mccabe': ['mccabe>=0.6.0,<0.7.0'], - 'pycodestyle': ['pycodestyle>=2.7.0'], + 'pycodestyle': ['pycodestyle>=2.8.0,<2.9.0'], 'pydocstyle': ['pydocstyle>=2.0.0'], - 'pyflakes': ['pyflakes>=2.3.0,<2.4.0'], + 'pyflakes': ['pyflakes>=2.4.0,<2.5.0'], 'pylint': ['pylint>=2.5.0'], 'rope': ['rope>0.10.5'], 'yapf': ['yapf'], From 93d89085e37503ebb161a2b7f3dc02dd5bbe0f3a Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 30 Oct 2021 12:53:25 -0500 Subject: [PATCH 2/3] Testing: Show packages intalled in test environment --- .github/workflows/test-linux.yml | 2 ++ .github/workflows/test-mac.yml | 2 ++ .github/workflows/test-win.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 012a4365..f335233b 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -40,6 +40,8 @@ jobs: /tmp/pyenv/bin/python -m pip install loghub - run: python -m pip install --upgrade pip setuptools - run: pip install -e .[all,test] + - name: Show test environment + run: pip list - run: pytest -v test/ # Enable this if SSH debugging is required # - name: Setup tmate session diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml index 513ba39e..a0795b84 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -40,6 +40,8 @@ jobs: /tmp/pyenv/bin/python -m pip install loghub - run: python -m pip install --upgrade pip setuptools - run: pip install -e .[all,test] + - name: Show test environment + run: pip list - run: pytest -v test/ # Enable this if SSH debugging is required # - name: Setup tmate session diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml index 0902f556..d051caf7 100644 --- a/.github/workflows/test-win.yml +++ b/.github/workflows/test-win.yml @@ -35,4 +35,6 @@ jobs: architecture: 'x64' - run: python -m pip install --upgrade pip setuptools - run: pip install -e .[all,test] + - name: Show test environment + run: pip list - run: pytest -v test/ From bda5eefb9b517bc5de49f63eec7e664814d41f4f Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 12 Nov 2021 20:43:48 -0500 Subject: [PATCH 3/3] Constraint autopep8 version because it depends on pycodestyle --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5e508c5d..f8deee52 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def get_version(module='pylsp'): python_requires='>=3.6', extras_require={ 'all': [ - 'autopep8', + 'autopep8>=1.6.0,<1.7.0', 'flake8>=4.0.0,<4.1.0', 'mccabe>=0.6.0,<0.7.0', 'pycodestyle>=2.8.0,<2.9.0', @@ -56,7 +56,7 @@ def get_version(module='pylsp'): 'rope>=0.10.5', 'yapf', ], - 'autopep8': ['autopep8'], + 'autopep8': ['autopep8>=1.6.0,<1.7.0'], 'flake8': ['flake8>=4.0.0,<4.1.0'], 'mccabe': ['mccabe>=0.6.0,<0.7.0'], 'pycodestyle': ['pycodestyle>=2.8.0,<2.9.0'],