Skip to content

Commit

Permalink
Neo v0.10.0, remove support for python 3.6 (#460)
Browse files Browse the repository at this point in the history
* added CI.yml containing workflows

* added badge for CI tests to README.md

* restructured requirements, environment.yml refactored to environment-docs.yml and environment-tests.yml.

* adapted runners according to new new .yml files

* re-add environment.yml for Travis, to be removed together with travis.yml

* update requirements in environment-*.yml to neo>=0.10.0

* updated .yml files to python version 3.7

* removed python 3.6 from docs 'install.rst', added python version requirement to `setup.py`

* rename travis conda 3.6 extras,opencl runner

* updated build_wheels workflow to exclude python 3.6

* removed redundant line

* changed structure of installation for docs runner

* added extras to docs runner

* added trigger for github actions CI: run tests after merged PR

* added classifiers to setup.py (python >=3.7), removed classifiers for python 2

* add python 3.10

* update cibuildwheel version to 2.3.1
  • Loading branch information
Moritz-Alexander-Kern authored Mar 25, 2022
1 parent 4979f25 commit e97479b
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 22 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ on:
#- review_request_removed
#- auto_merge_enabled
#- auto_merge_disabled
push:
branches:
- master

# jobs define the steps that will be executed on the runner
jobs:
Expand All @@ -44,8 +47,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# python versions for elephant: [3.6, 3.7, 3.8, 3.9]
python-version: [3.6, 3.7, 3.8, 3.9]
# python versions for elephant: [3.7, 3.8, 3.9, "3.10"]
python-version: [3.7, 3.8, 3.9, "3.10"]

# OS [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]

Expand Down Expand Up @@ -214,7 +218,8 @@ jobs:
strategy:
matrix:
# python versions for elephant: [3.6, 3.7, 3.8, 3.9]
python-version: [3.6]
python-version: [3.9]

# OS [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]

Expand Down Expand Up @@ -282,7 +287,6 @@ jobs:
run: |
# $CONDA is an environment variable pointing to the root of the miniconda directory
echo $CONDA/bin >> $GITHUB_PATH
sudo apt install -y libopenmpi-dev openmpi-bin
- name: Cache pip
uses: actions/cache@v2
Expand All @@ -301,6 +305,7 @@ jobs:
conda env update --file requirements/environment-docs.yml --name base
conda install -c conda-forge openmpi
conda install -c conda-forge pandoc
pip install -e .[extras]
# run notebooks
sed -i -E "s/nbsphinx_execute *=.*/nbsphinx_execute = 'always'/g" doc/conf.py
Expand All @@ -313,4 +318,4 @@ jobs:
- name: make html
run: |
cd doc
make html
make html
6 changes: 3 additions & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/setup-python@v2

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==1.10.0
run: python -m pip install cibuildwheel==2.3.1

- name: Install libomp
if: runner.os == 'macOS'
Expand All @@ -34,8 +34,8 @@ jobs:
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_SKIP: "cp27-* cp33-* cp34-* cp35-* pp*"
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.6"
CIBW_SKIP: "cp27-* cp33-* cp34-* cp35-* cp36-* pp*"
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.7"
CIBW_ARCHS: "auto64"

- uses: actions/upload-artifact@v2
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ addons:

matrix:
include:
- name: "conda 3.6 extras,opencl"
python: 3.6
- name: "conda 3.7 extras,opencl"
python: 3.7
env: DISTRIB="conda"
before_install: sudo apt install -y libopenmpi-dev openmpi-bin
before_script:
Expand All @@ -32,7 +32,7 @@ matrix:
env: DISTRIB="pip"

- name: "docs"
python: 3.6
python: 3.7
env: DISTRIB="conda"
before_install: sudo apt install -y libopenmpi-dev openmpi-bin
before_script:
Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Below is the explanation of how to proceed with these two steps.
Prerequisites
*************

Elephant requires `Python <http://python.org/>`_ 3.6, 3.7, 3.8, or 3.9.
Elephant requires `Python <http://python.org/>`_ 3.7, 3.8, 3.9 or 3.10.

.. tabs::

Expand Down
3 changes: 2 additions & 1 deletion requirements/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ channels:
- conda-forge # required for MPI

dependencies:
- python>=3.6
- python>=3.7

- mpi4py
- numpy
- scipy
Expand Down
3 changes: 2 additions & 1 deletion requirements/environment-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ channels:
- conda-forge # required for MPI

dependencies:
- python>=3.6
- python>=3.7

- mpi4py
- numpy
- scipy
Expand Down
2 changes: 1 addition & 1 deletion requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge # required for MPI

dependencies:
- python>=3.6
- python>=3.7
- mpi4py
- numpy
- scipy
Expand Down
19 changes: 12 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
'-Dfim_EXPORTS', '-fopenmp', '/std:c++17'])
elif platform.system() == "Darwin":
fim_module = Extension(
name = 'elephant.spade_src.fim',
sources = ['elephant/spade_src/src/fim.cpp'],
include_dirs = ['elephant/spade_src/include'],
language = 'c++',
libraries = ['pthread', 'omp'],
extra_compile_args = [
name='elephant.spade_src.fim',
sources=['elephant/spade_src/src/fim.cpp'],
include_dirs=['elephant/spade_src/include'],
language='c++',
libraries=['pthread', 'omp'],
extra_compile_args=[
'-DMODULE_NAME=fim', '-DUSE_OPENMP', '-DWITH_SIG_TERM',
'-Dfim_EXPORTS', '-O3', '-pedantic', '-Wextra',
'-Weffc++', '-Wunused-result', '-Werror', '-Werror=return-type',
Expand Down Expand Up @@ -67,13 +67,18 @@
long_description=long_description,
license="BSD",
url='http://python-elephant.org',
python_requires=">=3.7",
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Scientific/Engineering']
)

0 comments on commit e97479b

Please sign in to comment.