diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3f3c6fa..36d42e6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ jobs: # same file set which has already passed, etc. pre_job: name: Skip Duplicate Jobs Pre Job - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} steps: @@ -40,7 +40,7 @@ jobs: needs: pre_job if: "${{ needs.pre_job.outputs.should_skip != 'true' }}" name: 'Lint checks - ${{ matrix.python-version }}' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -68,7 +68,7 @@ jobs: needs: pre_job if: "${{ needs.pre_job.outputs.should_skip != 'true' }}" name: 'Unit tests - ${{ matrix.python-version }}' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -96,7 +96,7 @@ jobs: needs: pre_job if: "${{ needs.pre_job.outputs.should_skip != 'true' }}" name: 'Integration tests - ${{ matrix.python-version }}' - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: diff --git a/requirements.txt b/requirements.txt index 7511652..a76c903 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -hvac>=0.9.0 +hvac>=0.9.0,<1.0 # we are using deprecated auth methods removed in 1.0 diff --git a/setup.py b/setup.py index 0f0f995..e683263 100644 --- a/setup.py +++ b/setup.py @@ -18,12 +18,9 @@ from setuptools import setup, find_packages -from dist_utils import check_pip_version from dist_utils import fetch_requirements from dist_utils import parse_version_string -check_pip_version() - BASE_DIR = os.path.dirname(os.path.abspath(__file__)) REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt') INIT_FILE = os.path.join(BASE_DIR, 'st2auth_vault_backend', '__init__.py') @@ -44,10 +41,10 @@ 'Development Status :: 3 - Alpha', 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Intended Audience :: Developers', 'Environment :: Console', ], diff --git a/st2auth_vault_backend/__init__.py b/st2auth_vault_backend/__init__.py index c8cd9bd..cf5545d 100644 --- a/st2auth_vault_backend/__init__.py +++ b/st2auth_vault_backend/__init__.py @@ -19,4 +19,4 @@ 'VaultAuthenticationBackend' ] -__version__ = '0.1.0' +__version__ = '0.2.0' diff --git a/test-requirements.txt b/test-requirements.txt index 788ea1a..37f392f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,5 +9,6 @@ pylint-plugin-utils>=0.4 pylint==1.9.4 rednose st2flake8==0.1.0 +flake8<5 # st2flake8 does not support flake8 5 tox==3.14.1 unittest2