Skip to content

Commit 4deccf9

Browse files
authored
Merge pull request #28 from Topp-Roots-Lab/development
Feature/quality control output directory
2 parents 916d1e5 + 3e285fb commit 4deccf9

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ dist: clean ## builds source and wheel package
8282
ls -l dist
8383

8484
install: clean ## install the package to the active Python's site-packages
85-
python setup.py install
85+
pip install .

requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
numpy
2+
tqdm
3+
Pillow
4+
ttkthemes

requirements_dev.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
pip==21.1
2-
bump2version==0.5.11
3-
wheel==0.33.6
4-
watchdog==0.9.0
5-
flake8==3.7.8
6-
tox==3.14.0
7-
coverage==4.5.4
8-
Sphinx==1.8.5
9-
twine==1.14.0
1+
pip
2+
bump2version
3+
wheel
4+
watchdog
5+
flake8
6+
tox
7+
coverage
8+
Sphinx
9+
twine
1010

11-
pytest==4.6.5
12-
pytest-runner==5.1
11+
pytest
12+
pytest-runner

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
"""The setup script."""
44

5-
import distutils
65
import platform
76

87
from setuptools import find_packages, setup
@@ -13,7 +12,8 @@
1312
with open('HISTORY.rst') as history_file:
1413
history = history_file.read()
1514

16-
requirements = ['numpy==1.19.3', 'tqdm', 'Pillow', 'ttkthemes']
15+
with open("requirements.txt") as requirements_file:
16+
requirements = requirements_file.readlines()
1717

1818
setup_requirements = ['pytest-runner', ]
1919

@@ -35,13 +35,13 @@
3535
setup(
3636
author="Tim Parker",
3737
author_email='tparker@danforthcenter.com',
38-
python_requires='>=3.8',
38+
python_requires='>=3.10',
3939
classifiers=[
4040
'Development Status :: 2 - Pre-Alpha',
4141
'Intended Audience :: Developers',
4242
'Natural Language :: English',
4343
'Programming Language :: Python :: 3',
44-
'Programming Language :: Python :: 3.8',
44+
'Programming Language :: Python :: 3.10',
4545
],
4646
description="Utility library for consuming and manipulating x-ray data in RAW format",
4747
entry_points={

0 commit comments

Comments
 (0)