Skip to content

Commit

Permalink
[Compatibility] Add python 3.8 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Herklos committed Oct 23, 2020
1 parent 5a04408 commit 6e28bf6
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 28 deletions.
8 changes: 4 additions & 4 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
kind: pipeline
name: tests-python3.7-arm64
name: tests-python3.8-arm64

platform:
os: linux
arch: arm64

steps:
- name: tests
image: python:3.7
image: python:3.8
environment:
OCTOBOT_PYPI_URL:
from_secret: OCTOBOT_PYPI_URL
Expand All @@ -19,7 +19,7 @@ steps:

---
kind: pipeline
name: deploy-python3.7-arm64
name: deploy-python3.8-arm64

workspace:
base: /project
Expand All @@ -31,7 +31,7 @@ platform:
steps:
- name: pypi_publish
pull: always
image: drakkarsoftware/pypi-builder:manylinux-aarch64
image: drakkarsoftware/pypi-builder:python-3.8-manylinux-aarch64
environment:
PYPI_USERNAME:
from_secret: pypi_username
Expand Down
19 changes: 7 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
notifications:
email: false
dist: xenial
os: linux
dist: xenial
language: python
python: 3.8-dev
python: 3.8
cache: pip
env:
global:
- PYTHON_VERSION=3.8
- GH_REPO=Drakkar-Software/OctoBot-Evaluators
- DEPLOY_BRANCH=master
- PACKAGE_FOLDER=octobot_evaluators
Expand All @@ -16,21 +17,15 @@ install:

jobs:
include:
- name: "Linux - Python 3.8-dev - Python sources"
- name: "Linux - Python 3.8 - Python sources"
stage: test
os: linux
python: 3.8-dev
language: python
script:
- pytest --cov=. --cov-config=.coveragerc --durations=0 -rw tests
after_success:
- if [ $TRAVIS_PULL_REQUEST == "false" ]; then coveralls; fi

- name: "Linux amd64 - Python 3.8-dev - Installed"
- name: "Linux amd64 - Python 3.8 - Installed"
stage: test
os: linux
python: 3.8-dev
language: python
script:
- python3 setup.py install
- rm -rf $PACKAGE_FOLDER
Expand All @@ -53,15 +48,15 @@ jobs:
branch: $DEPLOY_BRANCH
tags: true
- provider: script
script: docker run -it -e PYPI_USERNAME=$PYPI_USERNAME -e PYPI_PASSWORD=$PYPI_PASSWORD -v $(pwd):/project drakkarsoftware/pypi-builder:manylinux-i686
script: docker run -it -e PYPI_USERNAME=$PYPI_USERNAME -e PYPI_PASSWORD=$PYPI_PASSWORD -v $(pwd):/project drakkarsoftware/pypi-builder:python-$PYTHON_VERSION-manylinux-i686
cleanup: true
skip_existing: true
on:
repo: "$GH_REPO"
branch: "$DEPLOY_BRANCH"
tags: true
- provider: script
script: docker run -it -e PYPI_USERNAME=$PYPI_USERNAME -e PYPI_PASSWORD=$PYPI_PASSWORD -v $(pwd):/project drakkarsoftware/pypi-builder:manylinux-x86_64
script: docker run -it -e PYPI_USERNAME=$PYPI_USERNAME -e PYPI_PASSWORD=$PYPI_PASSWORD -v $(pwd):/project drakkarsoftware/pypi-builder:python-$PYTHON_VERSION-manylinux-x86_64
cleanup: true
on:
repo: "$GH_REPO"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.6.1] - 2020-10-23
### Updated
- Python 3.8 support

## [1.6.0] - 2020-10-04
### Updated
- Requirements
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OctoBot-Evaluators [1.6.0](https://github.com/Drakkar-Software/OctoBot-Evaluators/blob/master/CHANGELOG.md)
# OctoBot-Evaluators [1.6.1](https://github.com/Drakkar-Software/OctoBot-Evaluators/blob/master/CHANGELOG.md)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a0c08eab5d4c440aa6e3fc3061ad0520)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Evaluators?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Evaluators&utm_campaign=Badge_Grade_Dashboard)
[![PyPI](https://img.shields.io/pypi/v/OctoBot-Evaluators.svg)](https://pypi.python.org/pypi/OctoBot-Evaluators/)
[![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Evaluators/badge.svg)](https://coveralls.io/github/Drakkar-Software/OctoBot-Evaluators)
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
maxParallel: 2
matrix:
Python36-32bit-full:
PYTHON_VERSION: '3.7'
PYTHON_VERSION: '3.8'
PYTHON_ARCH: 'x86'
Python36-64bit-full:
PYTHON_VERSION: '3.7'
PYTHON_VERSION: '3.8'
PYTHON_ARCH: 'x64'
steps:
- task: UsePythonVersion@0
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
maxParallel: 2
matrix:
Python36-64bit-full:
PYTHON_VERSION: '3.7'
PYTHON_VERSION: '3.8'
PYTHON_ARCH: 'x64'
steps:
- task: UsePythonVersion@0
Expand Down
2 changes: 1 addition & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest
pytest>=5.4.0
pytest-pep8
pytest-cov
pytest-asyncio
Expand Down
2 changes: 1 addition & 1 deletion octobot_evaluators/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# License along with this library.

PROJECT_NAME = "OctoBot-Evaluators"
VERSION = "1.6.0" # major.minor.revision
VERSION = "1.6.1" # major.minor.revision
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ cython==0.29.21
numpy==1.19.2

# Drakkar-Software requirements
async-channel>=2.0.2, <2.1
OctoBot-Commons>=1.4.1, <1.5
OctoBot-Tentacles-Manager>=2.3.1, <2.4
async-channel>=2.0.3, <2.1
OctoBot-Commons>=1.4.4, <1.5
OctoBot-Tentacles-Manager>=2.3.2, <2.4

# Cryptocurrency trading
tulipy==0.4.0
10 changes: 7 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def build_ext(*args, **kwargs):
DESCRIPTION = f.read()

REQUIRED = open('requirements.txt').readlines()
REQUIRES_PYTHON = '>=3.7'
REQUIRES_PYTHON = '>=3.8'
CYTHON_DEBUG = False if not os.getenv('CYTHON_DEBUG') else os.getenv('CYTHON_DEBUG')

setup(
Expand All @@ -88,8 +88,12 @@ def build_ext(*args, **kwargs):
ext_modules=cythonize(ext_modules, gdb_debug=CYTHON_DEBUG),
python_requires=REQUIRES_PYTHON,
classifiers=[
'Development Status :: 4 - Beta',
'Programming Language :: Python :: 3.7',
'Development Status :: 5 - Production/Stable',
'Operating System :: OS Independent',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX',
'Programming Language :: Python :: 3.8',
'Programming Language :: Cython',
],
)

0 comments on commit 6e28bf6

Please sign in to comment.