From bac71c7d06a4ccb74c6197a8ae0c008205ffefe0 Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 10:35:51 -0600 Subject: [PATCH 01/17] Deleted all gitlab CI work. --- .gitlab-ci.yml | 167 ------------------------------------------ templates/install.yml | 37 ---------- templates/test.yml | 15 ---- 3 files changed, 219 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 templates/install.yml delete mode 100644 templates/test.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index d486b16a..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,167 +0,0 @@ -image: python:latest - -include: - - templates/install.yml - - templates/test.yml - -variables: - PYTHON_VER: "3.8" - CONDA_BASE_NAME: experiment_analysis_montepy - -default: - artifacts: - expire_in: 7 day - -after_script: - - export PATH=$(echo "$PATH" | sed -e 's/:\/data\/gitlab-runner\/.conda\/envs\/experiment_analysis_mcnpy\/$//') - - echo $PATH - - conda deactivate - -.job_template: &install-boiler - stage: build - extends: .install - when: delayed - start_in: 1 minutes - variables: - PYTHON_VER: "3.8" - -install-3.8: - stage: build - extends: .install - variables: - PYTHON_VER: "3.8" - -install-3.9: - <<: *install-boiler - variables: - PYTHON_VER: "3.9" - - -install-3.10: - <<: *install-boiler - variables: - PYTHON_VER: "3.10" - -install-3.11: - <<: *install-boiler - variables: - PYTHON_VER: "3.11" - -install-3.12: - <<: *install-boiler - variables: - PYTHON_VER: "3.12" - -coverage_unit_test: - stage: test - coverage: '/TOTAL.+ ([0-9\.]{1,5}%)/' - script: - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - export PATH="~/.local/bin/:/data/gitlab-runner/.conda/envs/$CONDA_BASE_NAME-$PYTHON_VER/bin:$PATH" - - echo $PATH - - echo "Executing unit tests" - - which python - - pip freeze - - coverage run -m pytest --junitxml=test_report.xml - - coverage report - - coverage xml - artifacts: - reports: - junit: test_report.xml - coverage_report: - coverage_format: cobertura - path: coverage.xml - needs: ["install-3.8"] - -# skip 3.8 because of coverage test - -.job_template: &test_config - stage: test - extends: .test_no_cover - -unit_test-3.9: - <<: *test_config - variables: - PYTHON_VER: "3.9" - needs: ["coverage_unit_test","install-3.9"] - -unit_test-3.10: - <<: *test_config - variables: - PYTHON_VER: "3.10" - needs: ["coverage_unit_test","install-3.10"] - -unit_test-3.11: - <<: *test_config - variables: - PYTHON_VER: "3.11" - needs: ["coverage_unit_test","install-3.11"] - -unit_test-3.12: - <<: *test_config - variables: - PYTHON_VER: "3.12" - needs: ["coverage_unit_test","install-3.12"] - -doc_test: - stage: test - script: - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - export PATH="~/.local/bin/:/data/gitlab-runner/.conda/envs/$CONDA_BASE_NAME-$PYTHON_VER/bin:$PATH" - - echo "Executing Sphinx build to detect syntax errors" - - sphinx-build doc/source/ doc/build/ -W --keep-going -E - - sphinx-build -b html doc/source/ doc/build/html - - mv doc/build/html html - needs: ["install-3.8"] - artifacts: - expose_as: 'Updated Documentation' - paths: - - html - expire_in: 1 day - -format_test: - stage: test - script: - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - export PATH="~/.local/bin/:/data/gitlab-runner/.conda/envs/$CONDA_BASE_NAME-$PYTHON_VER/bin:$PATH" - - echo "Testing if anything is unformatted" - - echo "If error occurs changes were not formatted using black" - - black --check montepy/ tests/ - needs: ["install-3.8"] - - - -pages: - stage: deploy - script: - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - export PATH="~/.local/bin/:/data/gitlab-runner/.conda/envs/$CONDA_BASE_NAME-$PYTHON_VER/bin:$PATH" - - echo "Building documentation with Sphinx." - - cd doc/ - - make html - - cd .. - - mv doc/build/html public - - python -m build --sdist --wheel - - mv dist/ public/dist - artifacts: - paths: - - public - only: - - master - - main - - doc - - -packaging: - stage: deploy - script: - - rm dist/* - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - export PATH="~/.local/bin/:/data/gitlab-runner/.conda/envs/$CONDA_BASE_NAME-$PYTHON_VER/bin:$PATH" - - pip install build twine - - python -m build --sdist --wheel - - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/* - - only: - - master - - main diff --git a/templates/install.yml b/templates/install.yml deleted file mode 100644 index 8ccea7bb..00000000 --- a/templates/install.yml +++ /dev/null @@ -1,37 +0,0 @@ -variables: - PYTHON_VER: "3.8" - CONDA_BASE_NAME: experiment_analysis_montepy - -.install: - script: - - if [[ -d dist ]]; then rm -r dist ; fi; - - if [[ `conda env list` == *"$CONDA_BASE_NAME-$PYTHON_VER"* ]]; then - - else - - conda create -n $CONDA_BASE_NAME-$PYTHON_VER -y python==$PYTHON_VER - - fi - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - echo "Installing dependencies" - - which python - - which pip - - pip uninstall -y montepy - # make alternate package to confuse the builder. - - if [[ -d fake_py ]]; then mkdir fake_py; fi; - - if [[ -f fake_py/__init__.py ]]; then - - touch fake_py/__init__.py - - fi - # install base requirements first - - pip install -r requirements/common.txt - # needed to build. Users shouldn't be doing this on their own. - # Want to make sure it can be installed without dev stuff. - - pip install build - - python -m build --sdist --wheel - - pip install . - - pip uninstall -y montepy - - pip install --user dist/*.whl - # test the extras installation - - pip install --user montepy[test] - - pip install --user montepy[doc] - - pip freeze - artifacts: - paths: - - dist/ diff --git a/templates/test.yml b/templates/test.yml deleted file mode 100644 index 5284fd9b..00000000 --- a/templates/test.yml +++ /dev/null @@ -1,15 +0,0 @@ -variables: - PYTHON_VER: "3.8" - CONDA_BASE_NAME: experiment_analysis_montepy - -.test_no_cover: - script: - - conda activate $CONDA_BASE_NAME-$PYTHON_VER - - export PATH="~/.local/bin/:/data/gitlab-runner/.conda/envs/$CONDA_BASE_NAME-$PYTHON_VER/bin:$PATH" - - which python - - pip freeze - - python -m pytest --junitxml=test_report.xml - artifacts: - reports: - junit: test_report.xml - From 6a14b71ade254958d6cbb497acf7e7b9d3d07951 Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 11:08:24 -0600 Subject: [PATCH 02/17] Removed pytest.ini --- pyproject.toml | 2 ++ pytest.ini | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 pytest.ini diff --git a/pyproject.toml b/pyproject.toml index 6dd48dad..5bed2826 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,3 +69,5 @@ exclude_also = [ [tool.pytest.ini_options] minversion = "6.0" junit_logging = "all" +junit_family="xunit2" +filterwarnings="error" diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 731f942b..00000000 --- a/pytest.ini +++ /dev/null @@ -1,3 +0,0 @@ -[pytest] -junit_family=xunit2 -filterwarnings=error From 4846286f8aaeffc24c4e63b8918b2ed3553f711f Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 11:24:14 -0600 Subject: [PATCH 03/17] Moved all requirements to pypyroject.toml --- pyproject.toml | 21 ++++++++++++++++----- requirements/common.txt | 2 -- requirements/dev.txt | 8 -------- 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 requirements/common.txt delete mode 100644 requirements/dev.txt diff --git a/pyproject.toml b/pyproject.toml index 5bed2826..534453cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,7 @@ description = "A library for reading, editing, and writing MCNP input files" # gitlab limits the readme to 4,000 chars. readme = "README.md" requires-python = ">=3.8" -maintainers = [ - {name = "Micah Gale", email = "micah.gale@inl.gov"} -] +maintainers = {name="Micah Gale", email="micah.gale@inl.gov"} authors = [ {name = "Micah Gale", email = "micah.gale@inl.gov"}, {name = "Travis Labossiere-Hickman", email = "Travis.LabossiereHickman@inl.gov"}, @@ -30,13 +28,26 @@ classifiers = [ ] dependencies = [ - "numpy", + "numpy>=1.18", "sly==0.5" ] [project.optional-dependencies] -test = ["coverage", "pytest"] +test = ["coverage[toml]>=6.3.2", "pytest"] doc = ["sphinx", "sphinxcontrib-apidoc", "sphinx_rtd_theme"] +format = ["black>23.3.0"] +build = [ + "build", + "setuptool_scm", + "bump2version" +] +develop = [ + "montepy[test]", + "montepy[doc]", + "montepy[format]", + "montepy[build]", +] + [project.urls] Homepage = "https://idaholab.github.io/MontePy/index.html" diff --git a/requirements/common.txt b/requirements/common.txt deleted file mode 100644 index 97e31a82..00000000 --- a/requirements/common.txt +++ /dev/null @@ -1,2 +0,0 @@ -numpy >= 1.18 -sly >= 0.5.0 diff --git a/requirements/dev.txt b/requirements/dev.txt deleted file mode 100644 index c73727e3..00000000 --- a/requirements/dev.txt +++ /dev/null @@ -1,8 +0,0 @@ --r common.txt -build -sphinx~=4.3 -sphinxcontrib-apidoc -sphinx_rtd_theme -coverage[toml]>=6.3.2 -pytest -black==23.3.0 From 4c33d4aeead116f9f7095666ad90b435fa373d0e Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 11:28:15 -0600 Subject: [PATCH 04/17] Updated actions to not use requirements anymore. --- .github/workflows/deploy.yml | 6 +++--- .github/workflows/main.yml | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e75139c7..9de7ea0c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.8 - - run: pip install --user -r requirements/dev.txt + - run: pip install montepy[develop] - run: python -m pytest build-pages: @@ -75,7 +75,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.8 - - run: python -m pip install build + - run: python -m pip install montepy[build] - run: python -m build --sdist --wheel - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -96,7 +96,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.8 - - run: python -m pip install build + - run: python -m pip install montepy[build] - run: python -m build --sdist --wheel - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d635a22b..9216a003 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - run: pip install --upgrade pip build - - run: pip install -r requirements/common.txt + - run: pip install build - run: python -m build --sdist --wheel - run: pip install . - run: pip uninstall -y montepy @@ -25,6 +25,9 @@ jobs: - run: pip install --user dist/*.tar.gz - run: pip install --user montepy[test] - run: pip install --user montepy[doc] + - run: pip install --user montepy[format] + - run: pip install --user montepy[build] + - run: pip install --user montepy[develop] - run: pip freeze - name: Upload build artifacts uses: actions/upload-artifact@v3 @@ -44,7 +47,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - run: pip install --user -r requirements/dev.txt + - run: pip install --user montepy[test] - run: coverage run -m pytest --junitxml=test_report.xml - run: coverage report - run: coverage xml @@ -85,7 +88,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.8 - - run: pip install --user -r requirements/dev.txt + - run: pip install montepy[format] - run: black --check montepy/ tests/ From bf175fddcaa931b6de6d11693862126d852ab6d6 Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 11:35:34 -0600 Subject: [PATCH 05/17] Fixed bad maintainers. --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 534453cb..ccf38d32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,9 @@ description = "A library for reading, editing, and writing MCNP input files" # gitlab limits the readme to 4,000 chars. readme = "README.md" requires-python = ">=3.8" -maintainers = {name="Micah Gale", email="micah.gale@inl.gov"} +maintainers = [ + {name = "Micah Gale", email = "micah.gale@inl.gov"} +] authors = [ {name = "Micah Gale", email = "micah.gale@inl.gov"}, {name = "Travis Labossiere-Hickman", email = "Travis.LabossiereHickman@inl.gov"}, From 0eef2c18464cdcb6693b66d3dd2ed9df9ced7f60 Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 11:38:20 -0600 Subject: [PATCH 06/17] Relaxed black requirement. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ccf38d32..9725cc3e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dependencies = [ [project.optional-dependencies] test = ["coverage[toml]>=6.3.2", "pytest"] doc = ["sphinx", "sphinxcontrib-apidoc", "sphinx_rtd_theme"] -format = ["black>23.3.0"] +format = ["black>=23.3.0"] build = [ "build", "setuptool_scm", From d166e43a47826fad2c9aee3d5d4a21fc8f81e337 Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 11:44:38 -0600 Subject: [PATCH 07/17] Had pip defer to local for installing. --- .github/workflows/deploy.yml | 8 ++++---- .github/workflows/main.yml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9de7ea0c..b5321f62 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.8 - - run: pip install montepy[develop] + - run: pip install . montepy[develop] - run: python -m pytest build-pages: @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.8 - - run: pip install --user montepy[doc] + - run: pip install --user . montepy[doc] - run: cd doc && make html - uses: actions/configure-pages@v4 - uses: actions/upload-pages-artifact@v3 @@ -75,7 +75,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.8 - - run: python -m pip install montepy[build] + - run: python -m pip install . montepy[build] - run: python -m build --sdist --wheel - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -96,7 +96,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.8 - - run: python -m pip install montepy[build] + - run: python -m pip install . montepy[build] - run: python -m build --sdist --wheel - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9216a003..01283017 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,11 +23,11 @@ jobs: - run: pip install --user dist/*.whl - run: pip uninstall -y montepy - run: pip install --user dist/*.tar.gz - - run: pip install --user montepy[test] - - run: pip install --user montepy[doc] - - run: pip install --user montepy[format] - - run: pip install --user montepy[build] - - run: pip install --user montepy[develop] + - run: pip install --user . montepy[test] + - run: pip install --user . montepy[doc] + - run: pip install --user . montepy[format] + - run: pip install --user . montepy[build] + - run: pip install --user . montepy[develop] - run: pip freeze - name: Upload build artifacts uses: actions/upload-artifact@v3 @@ -47,7 +47,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - run: pip install --user montepy[test] + - run: pip install --user . montepy[test] - run: coverage run -m pytest --junitxml=test_report.xml - run: coverage report - run: coverage xml @@ -71,7 +71,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.8 - - run: pip install montepy[doc] + - run: pip install . montepy[doc] - run: sphinx-build doc/source/ doc/build/ -W --keep-going -E - run: sphinx-build -b html doc/source/ doc/build/html - uses: actions/upload-artifact@v3 @@ -88,7 +88,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: 3.8 - - run: pip install montepy[format] + - run: pip install . montepy[format] - run: black --check montepy/ tests/ From 373cfac26605cc2098757161e2dc9cd989bdde3e Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 12:16:05 -0600 Subject: [PATCH 08/17] Correct setuptools-scm dependency --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9725cc3e..20f93952 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ doc = ["sphinx", "sphinxcontrib-apidoc", "sphinx_rtd_theme"] format = ["black>=23.3.0"] build = [ "build", - "setuptool_scm", + "setuptools_scm>=8", "bump2version" ] develop = [ @@ -58,9 +58,12 @@ Documentation = "https://idaholab.github.io/MontePy/index.html" "Bug Tracker" = "https://github.com/idaholab/MontePy/issues" [build-system] -requires = ["setuptools >= 61.0.0"] +requires = ["setuptools >= 64.0.0", "setuptools_scm>=8"] build-backend = "setuptools.build_meta" +[tool.setuptools_scm] +version_file = "montepy/_version.py" + [tool.setuptools.packages.find] include = ["montepy*"] From 88ad4f8f4c0959baf054630e7db5366289735eca Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 12:27:54 -0600 Subject: [PATCH 09/17] Ignoring version file from setuptools_scm --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 18762426..990257f6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ doc/build/* .coverage .idea/ .ipynb_checkpoints/ +montepy/_version.py From 9fb3b123bfa53f77d1f01ab0b6bba3c26cc5523e Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 12:53:03 -0600 Subject: [PATCH 10/17] Implemented Coveralls with a lot of trial and error. --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01283017..2d7f1663 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,10 +57,14 @@ jobs: name: test path: test_report.xml - name: Upload coverage report - uses: actions/upload-artifact@v3 + if: ${{ matrix.python-version == '3.9' }} + uses: actions/upload-artifact@v4 with: name: coverage path: coverage.xml + - name: Coveralls GitHub Action + if: ${{ matrix.python-version == '3.9' }} + uses: coverallsapp/github-action@v2.2.3 doc-test: runs-on: ubuntu-latest From fbcc3a785880448653dd57a66378dba18b551e81 Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 13:56:48 -0600 Subject: [PATCH 11/17] Ignore _version from coverage. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 20f93952..fe4d871d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,6 +72,7 @@ version = {attr = "montepy.__version__"} [tool.coverage.run] source = ["montepy"] +omit = ["montepy/_version.py"] [tool.coverage.report] precision = 2 From b0cf2df53f189fdecb686295c4ea57b680d2c7ca Mon Sep 17 00:00:00 2001 From: "Micah D. Gale" Date: Sun, 21 Jan 2024 14:13:57 -0600 Subject: [PATCH 12/17] Limited coveralls to coverage.xml only.P --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d7f1663..ad0deba7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,6 +65,8 @@ jobs: - name: Coveralls GitHub Action if: ${{ matrix.python-version == '3.9' }} uses: coverallsapp/github-action@v2.2.3 + with: + file: coverage.xml doc-test: runs-on: ubuntu-latest From 196ef9b9f2a63c46942ebf2c7e2d44b9aca4f67d Mon Sep 17 00:00:00 2001 From: Micah Gale Date: Sun, 21 Jan 2024 14:28:13 -0600 Subject: [PATCH 13/17] Added basic badges --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8eee6eff..3169d0e8 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ MontePY: a cute snek on a red over white circle +[![license](https://img.shields.io/github/license/idaholab/MontePy.svg)](https://github.com/idaholab/MontePy/blob/develop/LICENSE) +[![Coverage Status](https://coveralls.io/repos/github/idaholab/MontePy/badge.svg?branch=develop)](https://coveralls.io/github/idaholab/MontePy?branch=develop) +[![PyPI version](https://badge.fury.io/py/montepy.svg)](https://badge.fury.io/py/montepy) + A python library to read, edit, and write MCNP input files. ## Installing From 53af432a0d53123077b0d9b51856f269c5775587 Mon Sep 17 00:00:00 2001 From: Micah Gale Date: Sun, 21 Jan 2024 14:34:55 -0600 Subject: [PATCH 14/17] First try with using test reporter. --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad0deba7..af8c30ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,8 @@ jobs: - run: coverage report - run: coverage xml - name: Upload test report - uses: actions/upload-artifact@v3 + if: ${{ matrix.python-version == '3.9' }} + uses: actions/upload-artifact@v4 with: name: test path: test_report.xml @@ -62,6 +63,11 @@ jobs: with: name: coverage path: coverage.xml + - name: Test Reporter + if: ${{ matrix.python-version == '3.9' }} + uses: dorny/test-reporter@v1.7.0 + with: + path: test_report.xml - name: Coveralls GitHub Action if: ${{ matrix.python-version == '3.9' }} uses: coverallsapp/github-action@v2.2.3 From 907c082728f49a0567bdf9909e5125f3632d5dca Mon Sep 17 00:00:00 2001 From: Micah Gale Date: Sun, 21 Jan 2024 14:39:27 -0600 Subject: [PATCH 15/17] Added name to test reporter. --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af8c30ec..fc433ce6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,6 +67,7 @@ jobs: if: ${{ matrix.python-version == '3.9' }} uses: dorny/test-reporter@v1.7.0 with: + name: CI path: test_report.xml - name: Coveralls GitHub Action if: ${{ matrix.python-version == '3.9' }} From e23c441c92aceaf95e8be71bc6f2216e2886abb7 Mon Sep 17 00:00:00 2001 From: Micah Gale Date: Sun, 21 Jan 2024 14:41:31 -0600 Subject: [PATCH 16/17] Added reporter to test reporter. --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc433ce6..e6740755 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,6 +69,7 @@ jobs: with: name: CI path: test_report.xml + reporter: java-junit - name: Coveralls GitHub Action if: ${{ matrix.python-version == '3.9' }} uses: coverallsapp/github-action@v2.2.3 From 2ec0bcd6aff5f7c83811d557ff3acf33cf5e54cf Mon Sep 17 00:00:00 2001 From: Micah Gale Date: Sun, 21 Jan 2024 14:45:13 -0600 Subject: [PATCH 17/17] Made test names more meaningful. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e6740755..268da249 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: Test package +name: CI testing on: [push] @@ -67,7 +67,7 @@ jobs: if: ${{ matrix.python-version == '3.9' }} uses: dorny/test-reporter@v1.7.0 with: - name: CI + name: CI-test-report path: test_report.xml reporter: java-junit - name: Coveralls GitHub Action