From 4c4e2247dcc07863472873ede9fcdcdc1ef814fa Mon Sep 17 00:00:00 2001 From: Arya Massarat <23412689+aryarm@users.noreply.github.com> Date: Tue, 31 Oct 2023 18:34:53 -0700 Subject: [PATCH] simply try removing version declaration in doc/conf.py --- .github/workflows/tests.yml | 4 ++++ PUBLISHING.rst | 5 +---- doc/conf.py | 5 ----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8b85dd0c..681f0d51 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,6 +2,10 @@ name: Test with pytest on: [pull_request, workflow_call] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: tests: name: Test with py${{ matrix.python-version }} diff --git a/PUBLISHING.rst b/PUBLISHING.rst index a27ae5ed..2753e56b 100644 --- a/PUBLISHING.rst +++ b/PUBLISHING.rst @@ -22,7 +22,7 @@ New Dependencies ---------------- If you've added dependencies to trtools or its tests, those dependencies should be listed in - * setup.py + * pyproject.toml * the .readthedocs_conda_env.yml file in the root of the repository that's used for building TRTool's Read The Docs webpage. * the appropriate section of the bioconda recipe (see below) @@ -45,9 +45,6 @@ Then go through the steps of merging the changes into the master branch: #. Run :code:`pytest` and make sure all the tests pass. Then run :code:`./test/cmdline_tests.sh` and make sure those tests pass. #. Change the 'Unreleased Changes' section of :code:`RELEASE_NOTES.rst` to the new version number. #. Check if any changes have been made that have not yet been documented in the release notes. If so, document them. -#. Update the version number in setup.py -#. Run ``python setup.py sdist bdist_wheel`` (this ensures that trtools/version.py contains the updated version number) -#. Commit the changes to setup.py and trtools/version.py and push them. #. Submit a pull request from develop into master on the github webiste. #. If the code review and travis checks pass, merge the pull request. #. Tag the merge commit with the package version in vX.Y.Z format. (For more details on tagging, see `below`) diff --git a/doc/conf.py b/doc/conf.py index 6874733d..0ac50598 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -13,7 +13,6 @@ import os import sys sys.path.insert(0, os.path.abspath('..')) -import trtools.version # -- Project information ----------------------------------------------------- @@ -21,10 +20,6 @@ copyright = '2020, Gymreklab' author = 'Gymreklab' -# The full version, including alpha/beta/rc tags -version = trtools.version.version -release = trtools.version.version - master_doc = 'index' # -- General configuration ---------------------------------------------------