diff --git a/.readthedocs.yml b/.readthedocs.yml index 7416a33..851d327 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,22 +1,22 @@ version: 2 +sphinx: + configuration: doc/source/conf.py + builder: html +# Set the version of Python and other tools you might need build: - image: latest + os: ubuntu-22.04 + tools: + python: "3.10" -formats: - - htmlzip +formats: [] python: - version: 3.7 + # install doc/requirements at the end to make sure pillow 9.5.0 is used + # also needs sphinx <7 install: - - requirements: doc/requirements.txt - - method: pip - path: . - - -sphinx: - builder: html - configuration: doc/source/conf.py - fail_on_warning: false + - method: pip + path: . + - requirements: doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt index 480f23e..6afa96d 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,5 @@ sphinx<7 sphinx_rtd_theme -sequana_sphinxext -pillow<=9.5.0 +pillow<=10.3.0 +sphinx_gallery +sphinx_copybutton diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 8cc19c9..0000000 --- a/setup.cfg +++ /dev/null @@ -1,17 +0,0 @@ - -[upload_docs] -upload_dir=doc/build/html/ -[sdist] -#formats=gztar,zip - - -[build_sphinx] -source_dir = doc/source -build_dir = doc/build -all_files = 1 - - -[tool:pytest] -# do not use --cov because it interfers with travis command -addopts= --durations=10 --verbose -n 1 --cov colormap --cov-report term-missing - diff --git a/setup.py b/setup.py deleted file mode 100644 index 662891e..0000000 --- a/setup.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: utf-8 -*- -__revision__ = "$Id: setup.py 3170 2013-01-16 14:57:19Z cokelaer $" -import sys -import os -from setuptools import setup, find_packages -import glob - -_MAJOR = 1 -_MINOR = 0 -_MICRO = 6 -version = '%d.%d.%d' % (_MAJOR, _MINOR, _MICRO) -release = '%d.%d' % (_MAJOR, _MINOR) - -metainfo = { - 'authors': {'Cokelaer':('Thomas Cokelaer','cokelaer@ebi.ac.uk')}, - 'version': version, - 'license' : 'LGPL', - 'download_url' : 'http://pypi.python.org/pypi/colormap', - 'url' : "http://github.com/cokelaer/colormap", - 'description':'Utilities to ease manipulation of matplotlib colormaps and color codecs (e.g., hex2rgb)', - 'platforms' : ['Linux', 'Unix', 'MacOsX', 'Windows'], - 'keywords' : ["hex2web", "web2hex", "hex2rgb", "rgb2hex", "rgb2hsv", "hsv2rgb", - "rgb2hls", "hls2rgb", "colormap", 'colors'], - 'classifiers' : [ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', - 'Topic :: Software Development :: Libraries :: Python Modules' - ] - } - - -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' -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( - name = 'colormap', - version = version, - maintainer = metainfo['authors']['Cokelaer'][0], - maintainer_email = metainfo['authors']['Cokelaer'][1], - author = metainfo['authors']['Cokelaer'][0], - author_email = metainfo['authors']['Cokelaer'][1], - long_description = open("README.rst").read(), - keywords = metainfo['keywords'], - description = metainfo['description'], - license = metainfo['license'], - platforms = metainfo['platforms'], - url = metainfo['url'], - download_url = metainfo['download_url'], - classifiers = metainfo['classifiers'], - - # package installation - package_dir = {'':'src'}, - packages = ['colormap'], - install_requires = install_requires, -)