Skip to content

Commit

Permalink
Merge pull request #402 from MetaCell/feature/392
Browse files Browse the repository at this point in the history
Python 3.9 upgrade
  • Loading branch information
filippomc authored May 4, 2022
2 parents 686b428 + 3101449 commit 2f083dd
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 29 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Python 3.7-3.9 must be installed.
It is recommended to setup a virtual environment.
With conda:
```bash
conda create --name ch python=3.7
conda create --name ch python=3.9
conda activate ch
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PARENT=python:3.7.6
ARG PARENT=python:3.9.10
FROM ${PARENT}

COPY libraries/cloudharness-common/requirements.txt /libraries/cloudharness-common/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/base-images/cloudharness-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PARENT=python:3.7.9-alpine
ARG PARENT=python:3.9.10-alpine
FROM ${PARENT}

RUN apk update
Expand Down
3 changes: 2 additions & 1 deletion libraries/client/cloudharness_cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
license="UNLICENSED",
long_description="""\
CloudHarness Python API Client # noqa: E501
"""
""",
python_requires='>=3.9'
)
3 changes: 2 additions & 1 deletion libraries/cloudharness-common/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@
package_data={'': ['*.yaml']},
long_description="""\
Cloudharness common library
"""
""",
python_requires='>=3.9'
)
14 changes: 7 additions & 7 deletions libraries/cloudharness-common/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
coverage>=4.0.3
nose>=1.3.7
pluggy>=0.3.1
py>=1.4.31
randomize>=0.13
pytest>=5.0.0
pytest-cov
coverage==6.3.2
nose==1.3.7
randomize==0.14
py==1.11.0
pyparsing==3.0.8
pytest==7.1.2
pytest-cov==3.0.0
-e .
-e ../client/cloudharness_cli
2 changes: 1 addition & 1 deletion libraries/cloudharness-common/tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py3
envlist = py3{9,}

[testenv]
deps=-r{toxinidir}/test-requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-alpine
FROM python:3.9.10-alpine
ENV DEPLOY_DIR=deployment

COPY . cloudharness_utilities
Expand Down
2 changes: 1 addition & 1 deletion tools/cloudharness_utilities/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
VALUES_MANUAL_PATH = 'values.yaml'
VALUE_TEMPLATE_PATH = f'{DEPLOYMENT_CONFIGURATION_PATH}/value-template.yaml'

CH_BASE_IMAGES = {'cloudharness-base': 'python:3.7-alpine', 'cloudharness-base-debian': 'python:3.7'}
CH_BASE_IMAGES = {'cloudharness-base': 'python:3.9.10-alpine', 'cloudharness-base-debian': 'python:3.9.10'}


CF_BUILD_STEP_BASE = 'build_base_images'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ steps:
git: github
prepare_deployment:
title: "Prepare helm chart"
image: python:3.7
image: python:3.9.10
stage: prepare
working_directory: .
commands:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ steps:
git: github
prepare_deployment:
title: "Prepare helm chart"
image: python:3.7
image: python:3.9.10
stage: prepare
working_directory: .
commands:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# CloudHarness Helm chart: deploy CloudHarness to k8s

Helm is used to define the CloudHarness deployment on Kubernetes. For further information about Helm, see https://helm.sh.

5 changes: 3 additions & 2 deletions tools/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
include_package_data=True,
scripts=['harness-deployment', 'harness-generate', 'harness-application'],
long_description="""\
CloudHarness deploy library
"""
MetaCell Neuroscience Platform - CloudHarness deploy library
""",
python_requires='>=3.9'
)
16 changes: 8 additions & 8 deletions tools/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
coverage>=4.0.3
nose>=1.3.7
pluggy>=0.3.1
py>=1.4.31
randomize>=0.13
pytest>=5.0.0
pytest-cov
-e .
coverage==6.3.2
nose==1.3.7
randomize==0.14
py==1.11.0
pyparsing==3.0.8
pytest==7.1.2
pytest-cov==3.0.0
-e .
4 changes: 2 additions & 2 deletions tools/tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[tox]
envlist = py3
envlist = py3{9,}

[testenv]
deps=-r{toxinidir}/test-requirements.txt

commands=
coverage run --source cloudharness_utilities -m pytest -v
coverage report -m
coverage report -m

0 comments on commit 2f083dd

Please sign in to comment.