Skip to content

Clean up setup.py #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 15, 2023
Merged

Clean up setup.py #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5818605
Update setup.py metadata and drop pip check
cognifloyd Mar 14, 2023
633bceb
fix ci
cognifloyd Mar 15, 2023
7715866
fix flake8 incompat
cognifloyd Mar 15, 2023
50ba157
constrain hvac version
cognifloyd Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
hvac>=0.9.0
hvac>=0.9.0,<1.0 # we are using deprecated auth methods removed in 1.0
9 changes: 3 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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',
],
Expand Down
2 changes: 1 addition & 1 deletion st2auth_vault_backend/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
'VaultAuthenticationBackend'
]

__version__ = '0.1.0'
__version__ = '0.2.0'
1 change: 1 addition & 0 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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