Skip to content

Commit

Permalink
Transition to Python 3.6-3.8.
Browse files Browse the repository at this point in the history
Removed support for Python 2.7 and 3.0-3.5.
  • Loading branch information
dvolgyes committed Jan 31, 2020
1 parent 73c123d commit 8d6230d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 27 deletions.
3 changes: 1 addition & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
image: python:3.5
image: python:3.7

variables:
PYVERSION: 3

test:
script:
Expand Down
21 changes: 9 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,25 @@ matrix:
fast_finish: true
include:
- os: linux
dist: trusty
dist: bionic
sudo: required
python: 3.6
env: PYVERSION="3"

- os: linux
dist: trusty
dist: bionic
sudo: required
python: 3.5
env: PYVERSION="3"
python: 3.7

- os: linux
dist: trusty
dist: bionic
sudo: required
python: 2.7
env: PYVERSION="2"
python: 3.8

install:
- pip${PYVERSION} install --upgrade pip setuptools wheel
- pip${PYVERSION} install coveralls codecov pyflakes
- pip${PYVERSION} install -r requirements.txt
- pip${PYVERSION} install git+https://github.com/dvolgyes/zenodo_get
- pip install --upgrade pip setuptools wheel
- pip install coveralls codecov pyflakes
- pip install -r requirements.txt
- pip install git+https://github.com/dvolgyes/zenodo_get

script:
- make test
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ environment:
# of 32 bit and 64 bit builds are needed, move this
# to the matrix section.
matrix:
- PYTHON_VERSION: "3.6"
- PYTHON_VERSION: "3.7"
NUMPY_VERSION: "stable"

matrix:
Expand Down
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

import setuptools
from src import zenodo_get as zget
Expand All @@ -17,19 +16,18 @@
license=zget.__license__,
packages=setuptools.find_packages(),
scripts=['src/zenodo_get.py'],
python_requires='>=2.7',
python_requires='>=3.6',
setup_requires=['future-fstrings'],
install_requires=['requests', 'wget', 'future-fstrings'],
keywords='zenodo download',
classifiers=(
'Development Status :: 4 - Beta',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: GNU Affero General Public License v3',
),
Expand Down
4 changes: 1 addition & 3 deletions src/zenodo_get.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env python
# -*- coding: future_fstrings -*-

from __future__ import print_function

import requests
import json
Expand All @@ -13,7 +11,7 @@
import time
import signal

__version__ = '1.1.1'
__version__ = '1.2.0'
__title__ = 'zenodo_get'
__summary__ = 'Zenodo_get - a downloader for Zenodo records'
__uri__ = 'https://gitlab.com/dvolgyes/zenodo_get'
Expand Down
5 changes: 1 addition & 4 deletions tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
set -e
DIR=$(dirname "$0")

if [ -z "${PYVERSION+xxx}" ]; then
PYVERSION=3
fi

PYTHON="python$PYVERSION -m coverage run -a --source $DIR/../src/"
PYTHON="python3 -m coverage run -a --source $DIR/../src/"
$PYTHON $DIR/../src/zenodo_get.py
$PYTHON $DIR/../src/zenodo_get.py -h

Expand Down

0 comments on commit 8d6230d

Please sign in to comment.