Skip to content

Commit

Permalink
Merge pull request #241 from CybercentreCanada/feature/updated_python…
Browse files Browse the repository at this point in the history
…_debian

Use python 3.9
  • Loading branch information
cccs-sgaron authored Jul 29, 2021
2 parents 7fcd9e2 + 034d3bd commit db033bc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
15 changes: 4 additions & 11 deletions pipelines/azure-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ trigger:
pr: none

pool:
vmImage: "ubuntu-18.04"
vmImage: "ubuntu-20.04"

resources:
containers:
Expand Down Expand Up @@ -37,7 +37,7 @@ stages:
steps:
- task: UsePythonVersion@0
displayName: Set python version
inputs: { versionSpec: 3.8 }
inputs: { versionSpec: 3.9 }
- script: |
export VERSION=${BUILD_SOURCEBRANCH#"refs/tags/v"}
export COMMIT=`git rev-parse --verify ${BUILD_SOURCEBRANCH}`
Expand All @@ -59,12 +59,6 @@ stages:
- stage: test
jobs:
- job: run_test
strategy:
matrix:
python3_7:
python.version: "3.7"
Python3_8:
python.version: "3.8"
timeoutInMinutes: 10
services:
elasticsearch: elasticsearch
Expand All @@ -74,8 +68,7 @@ stages:
- checkout: none
- task: UsePythonVersion@0
displayName: Set python version
inputs:
versionSpec: "$(python.version)"
inputs: { versionSpec: 3.9 }
- download: current
artifact: dist
- download: current
Expand Down Expand Up @@ -120,7 +113,7 @@ stages:
steps:
- task: UsePythonVersion@0
displayName: Set python version
inputs: { versionSpec: 3.8 }
inputs: { versionSpec: 3.9 }
- download: current
artifact: dist
- script: |
Expand Down
10 changes: 5 additions & 5 deletions pipelines/azure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger: ["*"]
pr: ["*"]

pool:
vmImage: "ubuntu-18.04"
vmImage: "ubuntu-20.04"

resources:
containers:
Expand Down Expand Up @@ -41,10 +41,10 @@ jobs:
- job: run_test
strategy:
matrix:
python3_7:
python.version: "3.7"
Python3_8:
python.version: "3.8"
python3_9:
python.version: "3.9"
# Python3_10:
# python.version: "3.10"

timeoutInMinutes: 15
services:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@
author_email="[email protected]",
license="MIT",
classifiers=[
'Development Status :: 2 - Pre-Alpha',
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
],
keywords="assemblyline automated malware analysis gc canada cse-cst cse cst cyber cccs",
packages=find_packages(),
Expand Down

0 comments on commit db033bc

Please sign in to comment.