Merge pull request #7 from smaht-dac/kmp_auto_publish

First cut at fixing publication bugs
smaht-dac · Aug 12, 2023 · 3ffcd51 · 3ffcd51
2 parents ce8e1cc + 099fcc1
commit 3ffcd51
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 32 deletions.
diff --git a/.github/workflows/main-publish.yml b/.github/workflows/main-publish.yml
@@ -28,10 +28,14 @@ jobs:
         with:
           # For publication, we're not testing anything, so use latest allowable version of Python
           python-version: 3.9
+
+      - name: Build
+        run: |
+          make build
+
       - name: Publish
         env:
           PYPI_USER: ${{ secrets.PYPI_USER }}
           PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: | 
-          make configure
           make publish-for-ga
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,14 @@ submitr
 Change Log
 ----------
 
+0.3.2
+=====
+
+* Fix auto-publish on pushing a tag.
+* Disabled ``scripts/publish`` since we're using functionality from ``dcicutils.scripts`` now.
+* Adjusted headings to present with better indentation and better recursive header presentation.
+
+
 0.3.1
 =====
 

diff --git a/docs/source/submitr.rst b/docs/source/submitr.rst
@@ -1,18 +1,6 @@
 submitr package
 ===============
 
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   submitr.scripts
-   submitr.tests
-
-Submodules
-----------
-
 submitr.base module
 -------------------
 
@@ -44,3 +32,14 @@ submitr.utils module
    :members:
    :undoc-members:
    :show-inheritance:
+
+-------------------------
+
+submitr subpackages
+-----------
+
+.. toctree::
+   :maxdepth: 4
+
+   submitr.scripts
+   submitr.tests
diff --git a/docs/source/submitr.scripts.rst b/docs/source/submitr.scripts.rst
@@ -1,35 +1,32 @@
 submitr.scripts package
 ============================
 
-Submodules
-----------
-
 submitr.scripts.make\_sample\_fastq\_file module
------------------------------------------------------
+------------------------------------------------
 
 .. automodule:: submitr.scripts.make_sample_fastq_file
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.scripts.resume\_uploads module
--------------------------------------------
+--------------------------------------
 
 .. automodule:: submitr.scripts.resume_uploads
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.scripts.submit\_metadata\_bundle module
-----------------------------------------------------
+-----------------------------------------------
 
 .. automodule:: submitr.scripts.submit_metadata_bundle
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.scripts.upload\_item\_data module
-----------------------------------------------
+-----------------------------------------
 
 .. automodule:: submitr.scripts.upload_item_data
    :members:

diff --git a/docs/source/submitr.tests.rst b/docs/source/submitr.tests.rst
@@ -1,67 +1,64 @@
 submitr.tests package
 ==========================
 
-Submodules
-----------
-
 submitr.tests.test\_base module
-------------------------------------
+-------------------------------
 
 .. automodule:: submitr.tests.test_base
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_exceptions module
-------------------------------------------
+-------------------------------------
 
 .. automodule:: submitr.tests.test_exceptions
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_make\_sample\_fastq\_file module
----------------------------------------------------------
+----------------------------------------------------
 
 .. automodule:: submitr.tests.test_make_sample_fastq_file
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_resume\_uploads module
------------------------------------------------
+------------------------------------------
 
 .. automodule:: submitr.tests.test_resume_uploads
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_submission module
-------------------------------------------
+-------------------------------------
 
 .. automodule:: submitr.tests.test_submission
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_submit\_metadata\_bundle module
---------------------------------------------------------
+---------------------------------------------------
 
 .. automodule:: submitr.tests.test_submit_metadata_bundle
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_upload\_item\_data module
---------------------------------------------------
+---------------------------------------------
 
 .. automodule:: submitr.tests.test_upload_item_data
    :members:
    :undoc-members:
    :show-inheritance:
 
 submitr.tests.test\_utils module
--------------------------------------
+--------------------------------
 
 .. automodule:: submitr.tests.test_utils
    :members:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "submitr"
-version = "0.3.1"
+version = "0.3.2"  # "0.3.2" was tested successfully as "0.3.1.1b0"
 description = "Support for uploading file submissions to SMAHT."
 # TODO: Update this email address when a more specific one is available for SMaHT.
 authors = ["4DN-DCIC Team <[email protected]>"]

diff --git a/scripts/publish → scripts/publish.DISABLED b/scripts/publish → scripts/publish.DISABLED