Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use maintained igor2 instead of unmaintained igor #128

Merged
merged 4 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.8
- name: Build a source tarball and wheel
run: |
pip install wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ This software is citable using a [DOI generated by Zenodo](https://zenodo.org/re
Requirements
============

* [Python 3.7+](https://www.python.org/downloads/release/python-360/)
* [Python 3.8+](https://www.python.org/downloads/release/python-360/)
AurelienJaquier marked this conversation as resolved.
Show resolved Hide resolved
* [eFEL eFeature Extraction Library](https://github.com/BlueBrain/eFEL) (automatically installed by pip)
* [Numpy](http://www.numpy.org) (automatically installed by pip)
* [Scipy](https://www.scipy.org/) (automatically installed by pip)
Expand Down
2 changes: 1 addition & 1 deletion bluepyefe/igorpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import re

import numpy as np
from igor import binarywave
from igor2 import binarywave

from io import StringIO

Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"format that can then be used by BluePyOpt for electrical model building "
"purposes.",
packages=setuptools.find_packages(),
python_requires=">=3.7",
python_requires=">=3.8",
include_package_data=True,
author="BlueBrain Project, EPFL",
license="LGPLv3",
Expand All @@ -53,11 +53,11 @@
'Topic :: Scientific/Engineering',
'Topic :: Utilities'],
install_requires=[
'numpy<1.24',
'numpy',
'neo',
'matplotlib',
'efel',
'scipy',
'h5py',
'igor'],
'igor2'],
)
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ minversion = 4

[gh-actions]
python =
3.7: py3
3.8: py3
3.9: py3
3.10: py3
3.11: py3

[testenv]
envdir =
py3{7,8,9,10,11,}{-functional,-notebooks,-style,-syntax,-docs,-upload_docs}: {toxworkdir}/py3
py3{8,9,10,11,}{-functional,-notebooks,-style,-syntax,-docs,-upload_docs}: {toxworkdir}/py3
usedevelop = true
deps =
coverage
Expand Down