Skip to content

Commit

Permalink
Remove support for Python 2, Python 3.6 and upgrade deps (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
nikita-b authored Dec 6, 2022
1 parent 1463307 commit 490b148
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 24 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ jobs:
env:
NOMAD_IP: '127.0.0.1'
NOMAD_PORT: '4646'
NOMAD_LATEST: '1.1.18'

strategy:
fail-fast: false
matrix:
python-version: ['2.7', '3.7', '3.10']
nomad-version: ['1.0.18', '1.1.18', '1.2.14', '1.3.7', '1.4.2']
python-version: ['3.7', '3.11'] # the oldest and newest support versions
nomad-version: ['1.0.18', '1.1.18', '1.2.15', '1.3.8', '1.4.3']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -57,11 +56,7 @@ jobs:
run: |
python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ $PYTHON_VERSION = "2.7" ]; then
pip install -r requirements-dev-py27.txt
else
pip install -r requirements-dev.txt
fi
pip install -r requirements-dev.txt
- name: Before Tests
shell: bash
run: |
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.0.0 (unreleased)
* Up `requests` lib version to 2.28.1
* Drop Python 2 and Python 3.6 support

## 1.5.0
* Add `namespace` agrument support for `get_allocations` and `get_deployments` endpoints (#133)
* Add Python 3.10 support (#133)
Expand Down
2 changes: 2 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ pages:
- Namespace: 'api/namespace.md'
- Namespaces: 'api/namespaces.md'
- Sentinel: 'api/sentinel.md'
- Variable: 'api/variable.md'
- Variables: 'api/variables.md'
- Validate: 'api/validate.md'
- Contributing: 'CONTRIBUTING.md'
7 changes: 0 additions & 7 deletions requirements-dev-py27.txt

This file was deleted.

12 changes: 6 additions & 6 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
coverage==5.2.1
pytest==6.2.4
pytest-cov==2.12.1
mkdocs==1.2.3
mock==1.2.0
coverage==6.5.0
pytest==7.2.0
pytest-cov==4.0.0
mkdocs==1.4.2
mock==4.0.3
flaky==3.7.0
responses==0.13.4
responses==0.22.0
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
requests==2.27.1
requests==2.28.1
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down

0 comments on commit 490b148

Please sign in to comment.