Skip to content

Commit

Permalink
Merge cf108d4 into d386671
Browse files Browse the repository at this point in the history
  • Loading branch information
naoyak committed May 26, 2020
2 parents d386671 + cf108d4 commit 2e49fac
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 18 deletions.
13 changes: 3 additions & 10 deletions .travis.yml
@@ -1,18 +1,11 @@
language: python
python:
- "2.7"
# - "3.4" # TODO: The anaconda mro_base package seems to be broken. Re-enable when fixed.
- "3.5"
- "3.6"
- "3.7"
- "3.8"

before_install:
# We do this conditionally because it saves us some downloading if the
# version is the same.
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
Expand Down
15 changes: 9 additions & 6 deletions appveyor.yml
Expand Up @@ -2,13 +2,16 @@ build: false

environment:
matrix:
- PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.8"
PYTHON_ARCH: "32"
MINICONDA: C:\Miniconda

- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6.6"
PYTHON_VERSION: "3.6.10"
PYTHON_ARCH: "64"
MINICONDA: C:\Miniconda3
- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.7"
PYTHON_ARCH: "64"
MINICONDA: C:\Miniconda3
- PYTHON: "C:\\Python38-x64"
PYTHON_VERSION: "3.8.3"
PYTHON_ARCH: "64"
MINICONDA: C:\Miniconda3

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -74,9 +74,9 @@ def run(self):
'Intended Audience :: Information Technology',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
cmdclass={'install_scripts': install_scripts_windows_wrapper},
)

0 comments on commit 2e49fac

Please sign in to comment.