Skip to content

Commit

Permalink
Modernize the build system and the dependencies.
Browse files Browse the repository at this point in the history
- Use pyproject.toml/flit instead of setup.py
- Use inform instead of nonstdlib.
  • Loading branch information
kalekundert committed May 29, 2020
1 parent 8dbe86d commit 0a8a284
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 68 deletions.
8 changes: 0 additions & 8 deletions MANIFEST.in

This file was deleted.

42 changes: 42 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[build-system]
requires = ["flit"]
build-backend = "flit.buildapi"

[tool.flit.metadata]
module = "wellmap"
author = "Kale Kundert"
author-email = "kale@thekunderts.net"
home-page = 'https://github.com/kalekundert/wellmap'
description-file = 'README.rst'
requires-python = "~=3.6"
requires = [
'pandas',
'toml>=0.10',
'inform>=1.15',
'docopt', # gui
'matplotlib', # gui
'colorcet', # gui
]
classifiers = [
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3.6',
'Topic :: Scientific/Engineering :: Bio-Informatics',
]
[tool.flit.metadata.requires-extra]
docs = [
'sphinxcontrib-programoutput',
'sphinx_rtd_theme',
]

[tool.flit.scripts]
wellmap = "wellmap.verify:main"

[tool.flit.metadata.urls]
'Documentation' = 'https://wellmap.readthedocs.io/en/latest/'
'Version Control' = 'https://github.com/kalekundert/wellmap'
'Bug Tracker' = 'https://github.com/kalekundert/wellmap/issues'
'Continuous Integration' = 'https://travis-ci.org/kalekundert/wellmap'
'Test Coverage' = 'https://coveralls.io/github/kalekundert/wellmap'
57 changes: 0 additions & 57 deletions setup.py

This file was deleted.

4 changes: 4 additions & 0 deletions wellmap/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env python3

"""\
File format for 96-well plate layouts.
"""

__version__ = '0.5.1'

from .util import *
Expand Down
4 changes: 2 additions & 2 deletions wellmap/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import re, itertools
import pandas as pd
from pathlib import Path
from nonstdlib import plural
from inform import plural
from copy import deepcopy
from .util import *

Expand Down Expand Up @@ -454,7 +454,7 @@ def sanity_check(dim1, *dim2s):
and not wells \
and not blocks \
and not any(config.get(x) for x in dim2s):
raise ConfigError(f"Found {plural(config[dim1]):? [{dim1}] spec/s}, but no [{'/'.join(dim2s)}] specs. No wells defined.")
raise ConfigError(f"Found {plural(config[dim1]):# [{dim1}] spec/s}, but no [{'/'.join(dim2s)}] specs. No wells defined.")

rows = simplify_keys('row')
cols = simplify_keys('col')
Expand Down
2 changes: 1 addition & 1 deletion wellmap/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import sys, os

from wellmap import ConfigError
from nonstdlib import plural
from inform import plural
from matplotlib.colors import BoundaryNorm, Normalize
from pathlib import Path
from .util import *
Expand Down

0 comments on commit 0a8a284

Please sign in to comment.