Skip to content

Commit

Permalink
update v1.0.5 with pep8, manifest, black
Browse files Browse the repository at this point in the history
  • Loading branch information
cokelaer committed Apr 4, 2022
1 parent 92cd861 commit 709935b
Show file tree
Hide file tree
Showing 8 changed files with 425 additions and 309 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,20 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}

- name: Install the package itself
run: |
pip install --upgrade pip
pip install -r requirements.txt
pip install .
pip install pytest pytest-cov coveralls pytest-xdist pytest-timeout
- name: Test with pytest
run: |
pytest --cov-report term --cov=colormap
- name: coveralls
- name: coveralls
run: |
coveralls --service=github
env:
GITHUB_TOKEN: ${{ github.token }}

3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
include LICENSE
include README.rst
recursive-exclude * __pycache__
recursive-exclude * *pyc
include requirements*txt
16 changes: 14 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Please see : http://colormap.readthedocs.io/ for an up-to-date documentation.

.. image:: https://github.com/cokelaer/colormap/actions/workflows/ci.yml/badge.svg?branch=master
:target: https://github.com/cokelaer/colormap/actions/workflows/ci.yml

.. image:: https://coveralls.io/repos/cokelaer/colormap/badge.png?branch=master
:target: https://coveralls.io/r/cokelaer/colormap?branch=master


:version: Python 3.6, 3.7, 3.8, 3.9
:version: Python 3.7, 3.8, 3.9, 3.10
:contributions: Please join https://github.com/cokelaer/colormap
:issues: Please use https://github.com/cokelaer/colormap/issues
:notebook: Please see https://github.com/cokelaer/colormap/tree/master/notebooks
Expand Down Expand Up @@ -69,3 +69,15 @@ Example
:align: center

See online documentation for details: http://colormap.readthedocs.io/

changelog
#########

========= ================================================================================
Version Description
========= ================================================================================
1.0.5 * remove Python3.6 and added Python3.10 to CI action
* Fix issue in setup reported in https://github.com/cokelaer/colormap/pull/14
* add requirements in MANIFEST
* applied black on all files
========= ================================================================================
16 changes: 6 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

_MAJOR = 1
_MINOR = 0
_MICRO = 4
_MICRO = 5
version = '%d.%d.%d' % (_MAJOR, _MINOR, _MICRO)
release = '%d.%d' % (_MAJOR, _MINOR)

Expand All @@ -27,21 +27,21 @@
'Intended Audience :: Science/Research',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Topic :: Software Development :: Libraries :: Python Modules'
]
}


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

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


setup(
Expand All @@ -65,7 +65,3 @@
packages = ['colormap'],
install_requires = install_requires,
)




7 changes: 4 additions & 3 deletions src/colormap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
from __future__ import division

import pkg_resources

try:
version = pkg_resources.require("colormap")[0].version
__version__ = version
version = pkg_resources.require("colormap")[0].version
__version__ = version
except Exception:
version = ''
version = ""


from .xfree86 import *
Expand Down
Loading

0 comments on commit 709935b

Please sign in to comment.