Skip to content

Commit 709935b

Browse files
cokelaercokelaer
committed
update v1.0.5 with pep8, manifest, black
1 parent 92cd861 commit 709935b

File tree

8 files changed

+425
-309
lines changed

8 files changed

+425
-309
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@ jobs:
2323
uses: actions/setup-python@v2
2424
with:
2525
python-version: ${{ matrix.python }}
26-
26+
2727
- name: Install the package itself
2828
run: |
2929
pip install --upgrade pip
30-
pip install -r requirements.txt
3130
pip install .
3231
pip install pytest pytest-cov coveralls pytest-xdist pytest-timeout
33-
32+
3433
- name: Test with pytest
3534
run: |
3635
pytest --cov-report term --cov=colormap
37-
38-
- name: coveralls
36+
37+
- name: coveralls
3938
run: |
4039
coveralls --service=github
4140
env:
4241
GITHUB_TOKEN: ${{ github.token }}
43-
42+

‎MANIFEST.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
include LICENSE
22
include README.rst
3+
recursive-exclude * __pycache__
4+
recursive-exclude * *pyc
5+
include requirements*txt

‎README.rst‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Please see : http://colormap.readthedocs.io/ for an up-to-date documentation.
1010

1111
.. image:: https://github.com/cokelaer/colormap/actions/workflows/ci.yml/badge.svg?branch=master
1212
:target: https://github.com/cokelaer/colormap/actions/workflows/ci.yml
13-
13+
1414
.. image:: https://coveralls.io/repos/cokelaer/colormap/badge.png?branch=master
1515
:target: https://coveralls.io/r/cokelaer/colormap?branch=master
1616

1717

18-
:version: Python 3.6, 3.7, 3.8, 3.9
18+
:version: Python 3.7, 3.8, 3.9, 3.10
1919
:contributions: Please join https://github.com/cokelaer/colormap
2020
:issues: Please use https://github.com/cokelaer/colormap/issues
2121
:notebook: Please see https://github.com/cokelaer/colormap/tree/master/notebooks
@@ -69,3 +69,15 @@ Example
6969
:align: center
7070

7171
See online documentation for details: http://colormap.readthedocs.io/
72+
73+
changelog
74+
#########
75+
76+
========= ================================================================================
77+
Version Description
78+
========= ================================================================================
79+
1.0.5 * remove Python3.6 and added Python3.10 to CI action
80+
* Fix issue in setup reported in https://github.com/cokelaer/colormap/pull/14
81+
* add requirements in MANIFEST
82+
* applied black on all files
83+
========= ================================================================================

‎setup.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
_MAJOR = 1
99
_MINOR = 0
10-
_MICRO = 4
10+
_MICRO = 5
1111
version = '%d.%d.%d' % (_MAJOR, _MINOR, _MICRO)
1212
release = '%d.%d' % (_MAJOR, _MINOR)
1313

@@ -27,21 +27,21 @@
2727
'Intended Audience :: Science/Research',
2828
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
2929
'Operating System :: OS Independent',
30-
'Programming Language :: Python :: 3.6',
3130
'Programming Language :: Python :: 3.7',
3231
'Programming Language :: Python :: 3.8',
3332
'Programming Language :: Python :: 3.9',
33+
'Programming Language :: Python :: 3.10',
3434
'Topic :: Software Development :: Libraries :: Python Modules'
3535
]
3636
}
3737

3838

3939
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
40-
if on_rtd is True: # only import and set the theme if we're building docs
41-
install_requires = ['matplotlib', 'easydev', "numpydoc"]
42-
else:
43-
install_requires = ['matplotlib', 'easydev']
40+
with open("requirements.txt", "r") as fin:
41+
install_requires = fin.read().split()
4442

43+
if on_rtd is True: # only import and set the theme if we're building docs
44+
install_requires += ["numpydoc"]
4545

4646

4747
setup(
@@ -65,7 +65,3 @@
6565
packages = ['colormap'],
6666
install_requires = install_requires,
6767
)
68-
69-
70-
71-

‎src/colormap/__init__.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
from __future__ import division
2121

2222
import pkg_resources
23+
2324
try:
24-
version = pkg_resources.require("colormap")[0].version
25-
__version__ = version
25+
version = pkg_resources.require("colormap")[0].version
26+
__version__ = version
2627
except Exception:
27-
version = ''
28+
version = ""
2829

2930

3031
from .xfree86 import *

0 commit comments

Comments
 (0)