diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84f15b6..08812d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Set up python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.12' - name: Install dependencies run: | python -m pip install --upgrade pip @@ -24,10 +24,10 @@ jobs: strategy: matrix: python-version: - - '3.7' - - '3.8' - '3.9' - '3.10' + - '3.11' + - '3.12' steps: - uses: actions/checkout@v1 - name: Set up python ${{ matrix.python-version }} diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..6777def --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,35 @@ +# Read the Docs configuration file for Sphinx projects +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the OS, Python version and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.12" + # You can also specify other tool versions: + # nodejs: "20" + # rust: "1.70" + # golang: "1.20" + +# Build documentation in the "docs/" directory with Sphinx +sphinx: + configuration: docs/conf.py + # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs + # builder: "dirhtml" + # Fail on all warnings to avoid broken references + # fail_on_warning: true + +# Optionally build your docs in additional formats such as PDF and ePub +# formats: +# - pdf +# - epub + +# Optional but recommended, declare the Python requirements required +# to build your documentation +# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: requirements-docs.txt \ No newline at end of file diff --git a/HISTORY.rst b/HISTORY.rst index a735fb1..3dca7f9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,13 @@ Changelog ========= +v1.0.1 +------ + +- Added setuptools as a dependency. In some environments setuptools may + not be installed by default. This package uses it for its core + functionality, so it was added as an explicit requirment. + v1.0.0 ------ diff --git a/requirements.txt b/requirements.txt index a734284..41a5ce4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ miniwdl>=1.0 -jinja2 \ No newline at end of file +jinja2 +setuptools \ No newline at end of file diff --git a/setup.py b/setup.py index 577e399..bf5c96f 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ LONG_DESCRIPTION = readme_file.read() setup(name="WDL-AID", - version="1.0.0", + version="1.0.1", description="Automatic Input Documentation for WDL workflows", long_description=LONG_DESCRIPTION, long_description_content_type='text/markdown', @@ -36,7 +36,9 @@ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - "Development Status :: 3 - Alpha", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: MIT License", ], keywords=["bioinformatics", "WDL", "documentation"], @@ -49,7 +51,8 @@ package_data={'': ["*.j2"]}, install_requires=[ "miniwdl>=1.0", - "jinja2" + "jinja2", + "setuptools" ], entry_points={ "console_scripts": diff --git a/tox.ini b/tox.ini index 24dd11e..76c3db9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,12 @@ [tox] -envlist = py37,py38,py39,py310 +envlist = py39,py310,py311,py312 [gh-actions] python = - 3.7: py37 - 3.8: py38 3.9: py39 3.10: py310 + 3.11: py311 + 3.12: py312 [testenv] deps = @@ -19,4 +19,4 @@ commands = [testenv:py3-lint] deps = flake8 -commands = flake8 src/ \ No newline at end of file +commands = flake8 src/