Skip to content

Commit

Permalink
Bump: Update python version & requirements (aristanetworks#395)
Browse files Browse the repository at this point in the history
  • Loading branch information
titom73 authored Sep 20, 2021
1 parent 6ebdcb9 commit 5a3ef59
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick Python version of AVD runner: 3.6, 3.7, 3.8
"args": { "VARIANT": "3.6" },
"args": { "VARIANT": "3.8-v2.0" },
},
"remoteUser": "avd",
"updateRemoteUserUID": true,
Expand Down
30 changes: 13 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@

<!-- Enter short PR description -->

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Code style update (formatting, renaming)
- [ ] Refactoring (no functional changes)
- [ ] Documentation content changes
- [ ] Other (please describe):

## Related Issue(s)

Fixes #<ISSUE ID>

## Component(s) name

`arista.cvp.<role-name>`
`arista.cvp.<module-name>`

## Proposed changes
<!--- Describe your changes in detail -->
Expand All @@ -28,12 +18,18 @@ Fixes #<ISSUE ID>
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->

## Checklist:
## Checklist

### User Checklist

<!-- Add your own checklist using MD syntax and by replacing N/A -->
- N/A

### Repository Checklist

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code has been rebased from devel before I start
- [ ] I have read the [**CONTRIBUTING**](https://www.avd.sh/docs/contributing/) document.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have updated [molecule CI](https://github.com/aristanetworks/ansible-avd/tree/devel/ansible_collections/arista/avd/molecule) testing accordingly
- [ ] All new and existing tests passed ([`pre-commit`](https://www.avd.sh/docs/installation/development/#python-virtual-environment), `make linting` and `make sanity-lint`).
- [ ] I have read the [**CONTRIBUTING**](https://avd.sh/en/latest/docs/contribution/overview.html) document.
- [ ] My change requires a change to the documentation and documentation have been updated accordingly. (check the box if not applicable)
- [ ] I have updated [molecule CI](https://github.com/aristanetworks/ansible-avd/tree/devel/ansible_collections/arista/avd/molecule) testing accordingly. (check the box if not applicable)
24 changes: 0 additions & 24 deletions .github/lint-yaml.sh

This file was deleted.

23 changes: 0 additions & 23 deletions .github/pre-commit

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
pre_commit:
name: Run pre-commit validation hooks
runs-on: ubuntu-20.04
container: avdteam/base:3.6-v1.0
container: avdteam/base:3.8-v2.0
needs: file-changes
if: needs.file-changes.outputs.dhcp_module == 'true' || needs.file-changes.outputs.code_v3 == 'true' || needs.file-changes.outputs.code_v1 == 'true' || startsWith(github.ref, 'refs/heads/release')
steps:
Expand All @@ -73,7 +73,7 @@ jobs:
pytest:
name: Validate code V3 with Pytest
runs-on: ubuntu-20.04
container: avdteam/base:3.6-v1.0
container: avdteam/base:3.8-v2.0
needs: [file-changes, pre_commit]
if: needs.file-changes.outputs.code_v3 == 'true' || startsWith(github.ref, 'refs/heads/release')
steps:
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
strategy:
fail-fast: true
matrix:
ansible_version: ["ansible>=2.10,<2.11", "ansible>=3.3"]
ansible_version: ['ansible-core==2.11.3', 'ansible-core>=2.11.3']
avd_scenario:
- cv_configlet_loose
- cv_configlet_strict
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
strategy:
fail-fast: true
matrix:
ansible_version: ["ansible>=2.10,<2.11", "ansible>=3.3"]
ansible_version: ['ansible-core==2.11.3', 'ansible-core>=2.11.3']
avd_scenario:
- dhcp_management_mac
- dhcp_management_offline
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
# galaxy_importer:
# name: Test galaxy-importer
# runs-on: ubuntu-latest
# container: avdteam/base:3.6-v2.0
# container: avdteam/base:3.8-v2.0
# needs: [pre_commit]
# if: needs.file-changes.outputs.python == 'true' || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/release')
# env:
Expand All @@ -248,7 +248,7 @@ jobs:
build_package:
name: Build collection package
runs-on: ubuntu-latest
container: avdteam/base:3.6-v2.0
container: avdteam/base:3.8-v2.0
needs:
- ansible_test
# - galaxy_importer
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/cvp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Current active branch:

### Python

- Python >=3.6
- Python >=3.8

### Additional Python Libraries required

Expand Down
14 changes: 7 additions & 7 deletions ansible_collections/arista/cvp/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ansible>=2.9,<2.11
ansible-core>=2.11.3
ansible-lint
check-manifest
docker>=4.4.1
galaxy-importer>=0.3.1
httmock
pycodestyle
flake8
pylint>=2.4.4
twine
molecule>=3.0.8
pre-commit>=2.3.0
yamllint>=1.18.0
pre-commit>=2.9.2
pre-commit-hooks>=3.3.0
identify>=1.4.20
docker
molecule>=3.2.0
molecule-docker>=0.2.4
mitogen
pytest-cov>=2.11.1
pytest-html>=3.1.1
Expand Down
2 changes: 1 addition & 1 deletion development/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
ansible:
image: avdteam/base:3.6
image: avdteam/base:3.8-v2.0
container_name: ansible_avd
environment:
- AVD_GIT_USER=${GIT_USER}
Expand Down

0 comments on commit 5a3ef59

Please sign in to comment.