Skip to content

Commit 312caa0

Browse files
authored
Merge pull request #25 from Anselmoo/Anselmoo-patch-1
Update setup.py
2 parents 80a2d91 + 46b69e7 commit 312caa0

File tree

6 files changed

+28
-19
lines changed

6 files changed

+28
-19
lines changed

Pipfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
bashplot = {editable = true, path = "."}
7+
numpy = "*"
8+
plotille = "*"
89

910
[dev-packages]
1011
coverage = "*"
@@ -13,7 +14,7 @@ black = "==20.8b1"
1314
flake8 = "*"
1415
pydocstyle = "*"
1516
pytest = "*"
16-
pytest-clarity = "*"
17+
pytest-clarity = "==0.3.0a0"
1718
pytest-cov = "*"
1819
pytest-sugar = "*"
1920

bashplot/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
"""bashplot."""
2-
__version__ = "0.40"
1+
"""Bashplot: Instant data plotting from the terminal into the terminal."""
2+
__version__ = "1.0"

dev-requirements.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# pipenv lock --requirements --dev-only
66
#
77

8-
-i https://pypi.org/simple
8+
# -i https://pypi.org/simple
99
appdirs==1.4.4
1010
attrs==20.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
1111
black==20.8b1
@@ -23,12 +23,14 @@ py==1.10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.
2323
pycodestyle==2.6.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
2424
pydocstyle==5.1.1
2525
pyflakes==2.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
26-
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
27-
pytest==6.2.1
26+
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
2827
pytest-clarity==0.3.0a0
28+
pytest-cov==2.10.1
2929
pytest-sugar==0.9.4
30+
pytest==6.2.1
3031
regex==2020.11.13
3132
snowballstemmer==2.0.0
32-
toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
33+
termcolor==1.1.0
34+
toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
3335
typed-ast==1.4.2
3436
typing-extensions==3.7.4.3

pyproject.toml

Lines changed: 0 additions & 3 deletions
This file was deleted.

requirements.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
numpy==1.19.5; python_version >= '3.6'
2-
plotille==3.7.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
3-
six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
1+
#
2+
# These requirements were autogenerated by pipenv
3+
# To regenerate from the project's Pipfile, run:
4+
#
5+
# pipenv lock --requirements
6+
#
7+
8+
# -i https://pypi.org/simple
9+
numpy==1.19.5
10+
plotille==3.7.2
11+
six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'

setup.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
try:
2-
from setuptools import setup
2+
from setuptools import find_packages, setup
33
except ImportError:
4-
from distutils.core import setup
4+
from distutils.core import setup, find_packages
55

66
from pathlib import Path
77

@@ -43,9 +43,7 @@ def requirments():
4343
long_description=long_description(),
4444
long_description_content_type="text/markdown",
4545
install_requires=requirments(),
46-
packages=[
47-
"bashplot",
48-
],
46+
packages=find_packages(),
4947
py_modules=[path.stem for path in Path(".").glob("bashplot/*.py")],
5048
author=__author__,
5149
author_email=__email__,
@@ -65,6 +63,7 @@ def requirments():
6563
"License :: OSI Approved :: MIT License",
6664
"Operating System :: MacOS",
6765
"Operating System :: Unix",
66+
"Operating System :: Windows",
6867
"Programming Language :: Python :: 3",
6968
"Programming Language :: Python :: 3.6",
7069
"Programming Language :: Python :: 3.7",
@@ -81,4 +80,6 @@ def requirments():
8180
"database",
8281
],
8382
extras_require={"testing": ["pipenv"]},
83+
platforms=["Windows", "Linux", "Solaris", "Mac OS-X", "Unix"],
84+
test_suite="pytest",
8485
)

0 commit comments

Comments
 (0)