Commit 3b3053d9 authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch 'bump_to_v1.3.0' into 'master'

reqs and setup update

See merge request !77
parents c6ad5a01 8ea68f03
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include:
before_script:
  - apt update
  - apt upgrade -q -y
  - pip install -r requirements.txt
  - pip install .[full]

stages:
  - build
+6 −13
Original line number Diff line number Diff line
numpy>=1.16
scipy>=1.1.0
matplotlib>=3.0.2
h5py>=2.8.0
numpy
scipy
matplotlib
h5py
sklearn
sphinx_rtd_theme
pydata-sphinx-theme
setuptools
sklearn
sphinx
flake8
pytest
pytest-cov
codespell
# importlib is pinned to keep py3.7 compatability, 3.8+ works unpinned.
importlib-metadata<5.0.0

requirements_dev.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line
# Dev-reqs
sphinx_rtd_theme
pydata-sphinx-theme
setuptools
sklearn
sphinx
flake8
pytest
pytest-cov
coverage
codespell
+12 −10
Original line number Diff line number Diff line
#!/usr/bin/python

import sys
from os import path
import pathlib
from setuptools import setup

# Scripts
@@ -12,11 +12,17 @@ if len(sys.argv) == 2 and sys.argv[1] == '--list-scripts':
    print(' '.join(scripts))
    sys.exit(0)

# read the contents of your README file
this_directory = path.abspath(path.dirname(__file__))
with open(path.join(this_directory, 'README.rst'), encoding='utf-8') as f:
# The directory containing this file
HERE = pathlib.Path(__file__).parent

# The text of the README file
with open(HERE / 'README.rst', encoding='utf-8') as f:
    long_description = f.read()

# Read requirements
reqs = (HERE / "requirements.txt").read_text()
dev_reqs = (HERE / "requirements_dev.txt").read_text()

name = 'sails'
version = '1.2'
release = '1.2.0'
@@ -66,14 +72,10 @@ setup(

    packages=['sails', 'sails.tests'],

    install_requires=['numpy',
                      'scipy',
                      'matplotlib',
                      'h5py',
                      'pydata-sphinx-theme'],
    install_requires=reqs,

    extras_require={
        'test': ['coverage'],
        'full': dev_reqs,
    },

    command_options={