diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 201f0a2..64c9ad8 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -14,15 +14,35 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macOS-10.15] - python-version: [ 3.6, 3.7, 3.8, 3.9 ] + os: [ubuntu-latest, windows-latest, macOS-latest] + python-version: [ 3.11, 3.12, 3.13 ] + include: + - os: ubuntu-20.04 + python-version: '3.10' + - os: ubuntu-20.04 + python-version: '3.9' + - os: ubuntu-20.04 + python-version: '3.8' + + - os: macos-latest + python-version: '3.10' + - os: macos-latest + python-version: '3.9' + - os: macos-latest + python-version: '3.8' + + - os: windows-latest + python-version: '3.10' + - os: windows-latest + python-version: '3.9' + - os: windows-latest + python-version: '3.8' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup python version ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: x64 - name: Install pytest run: | python -m pip install --upgrade pip diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ef9ddc6..2046e3d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -5,12 +5,16 @@ # Required version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.12" + # Build documentation in the docs/ directory with Sphinx sphinx: configuration: docs/conf.py # Optionally set the version of Python and requirements required to build your docs python: - version: 3.8 install: - - requirements: docs/requirements.txt \ No newline at end of file + - requirements: docs/requirements.txt diff --git a/docs/conf.py b/docs/conf.py index 4324663..77ed362 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,8 +52,8 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -# html_theme = 'alabaster' html_theme = 'sphinx_rtd_theme' + # html_theme_options = { # 'analytics_id': 'G-CH3JS5076R', # Provided by Google in your dashboard # 'analytics_anonymize_ip': False, @@ -74,3 +74,8 @@ # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] +# python3 -m sphinx.ext.intersphinx https://docs.python-requests.org/en/master/objects.inv +intersphinx_mapping = { + 'requests': ('https://docs.python-requests.org/en/master/', None), + 'python': ('https://docs.python.org/3', None) +} diff --git a/docs/requirements.txt b/docs/requirements.txt index 4f61efd..fd49df5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,7 +1,8 @@ -sphinx==3.5.4 +sphinx==5.1.1 sphinxcontrib-bibtex sphinx-copybutton pandas pynmrstar>=3.0.4 plotly>=4.5.4 -numpy>=1.15.0 \ No newline at end of file +numpy>=1.15.0 +sphinx_rtd_theme diff --git a/setup.py b/setup.py index 78d73e0..ddb1bfc 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def get_version(): version=get_version(), packages=['pybmrb'], install_requires=['pandas', 'requests>=2.21.0,<=3', 'plotly>=4.1.0', 'pynmrstar>=3.0.4', 'numpy>1.15'], - python_requires='>=3.6', + python_requires='>=3.7', author='Kumaran Baskaran', author_email='baskaran@uchc.edu', description='PyBMRB provides tools for visualizing BMRB entries and NMR-STAR files. ' @@ -41,10 +41,12 @@ def get_version(): 'Development Status :: 5 - Production/Stable', 'Environment :: Console', 'Programming Language :: Python :: 3 :: Only', - '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', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Intended Audience :: Education', 'License :: OSI Approved :: MIT License', 'Natural Language :: English',