Skip to content

Commit

Permalink
Merge pull request #18 from NeuralEnsemble/development
Browse files Browse the repository at this point in the history
To v0.2.6; migrate away from deprecated setup.py
  • Loading branch information
pgleeson authored Jun 22, 2023
2 parents 8c85480 + 14ac349 commit d13e239
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 59 deletions.
22 changes: 7 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,19 @@ jobs:
echo "github.ref is: ${{ github.ref }}"
echo "github.base_ref is: ${{ github.base_ref }}"
- name: Install deps from development
if: ${{ github.ref == 'refs/heads/development' || github.base_ref == 'development' }}
run: |
echo "Using deps from development"
sed -i 's/@master/@development/' requirements-dev.txt
- name: Install deps from experimental
if: ${{ github.ref == 'refs/heads/experimental' || github.base_ref == 'experimental' }}
run: |
echo "Using deps from experimental"
sed -i 's/@master/@experimental/' requirements-dev.txt
- name: Install package
- name: Install core package
run: |
python -m pip install --upgrade pip
pip install -r requirements-dev.txt
pip install .
pip list
- name: Installing optional dependencies
run: |
echo "Installing extra deps"
pip install .[dev]
- name: Run tests
run: |
pip list
pytest --cov=pyelectro -s .
- name: Lint with flake8
run: |
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pyelectro
=========
# pyelectro

[![GH Build](https://github.com/NeuralEnsemble/pyelectro/actions/workflows/ci.yml/badge.svg)](https://github.com/NeuralEnsemble/pyelectro/actions/workflows/ci.yml)
[![Documentation Status](https://readthedocs.org/projects/pyelectro/badge/?version=latest)](https://pyelectro.readthedocs.io/en/latest/?badge=latest)
Expand Down
7 changes: 6 additions & 1 deletion pyelectro/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,9 @@
"""

__version__ = "0.2.5"
try:
import importlib.metadata
__version__ = importlib.metadata.version("pyelectro")
except ImportError:
import importlib_metadata
__version__ = importlib_metadata.version("pyelectro")
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
4 changes: 0 additions & 4 deletions requirements-dev.txt

This file was deleted.

39 changes: 39 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
[metadata]
name = pyelectro
version = 0.2.6
author = Michael Vella, Padraig Gleeson
author_email = [email protected], [email protected]
url = https://github.com/NeuralEnsemble/pyelectro
license = BSD-2-clause
description = A Python library for analysis of electrophysiological data
long_description = file: README.md, LICENSE
classifiers=
License :: OSI Approved :: BSD License
Development Status :: 3 - Alpha
Intended Audience :: Science/Research
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Scientific/Engineering

[options]
install_requires =
numpy
scipy
matplotlib

packages = find:

[options.packages.find]
where = .
include = pyelectro*

[options.extras_require]
dev =
pytest
pytest-cov

[flake8]
# ignore:
# spacing around operators, comment blocks, in argument lists
Expand Down
37 changes: 0 additions & 37 deletions setup.py

This file was deleted.

0 comments on commit d13e239

Please sign in to comment.