Skip to content

Commit

Permalink
Remove testing data from release automation (#3495)
Browse files Browse the repository at this point in the history
Two tweaks for the workflows in the recently merged #3476 to remove testing leftovers:

1. Use main PyPI repository in release workflow
2. Use correct version number in `__about__.py`

Includes a change to release.yml to allow merging without creating a
duplicate release. Workaround reverted in #3496. 

Other misc fixes:

* Update isort pre-commit config See PyCQA/isort#2077
* Remove Coveralls from integration tests

TODO: Remove Coveralls altogether
  • Loading branch information
jstvz committed Feb 2, 2023
1 parent 0bdc32f commit 5de2781
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
paths:
- cumulusci/__about__.py
- cumulusci/__about__.py.FIXME

concurrency: publishing

Expand All @@ -29,7 +29,6 @@ jobs:
env:
HATCH_INDEX_USER: "__token__"
HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
HATCH_INDEX_REPO: "https://test.pypi.org/legacy/"
- name: Create release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/slow_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ jobs:
if: always()
run: |
cci org scratch_delete ${{ matrix.org-shape }}
- name: Report coverage
run: coveralls
- name: Store robot results
if: failure()
uses: actions/upload-artifact@v1
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:
- id: rst-linter
exclude: "docs"
- repo: https://github.com/pycqa/isort
rev: 5.11.5
rev: 5.12.0
hooks:
- id: isort
args: ["--profile", "black", "--filter-files"]
Expand Down
2 changes: 1 addition & 1 deletion cumulusci/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.78.0"
__version__ = "3.71.0"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["hatchling", "hatch-fancy-pypi-readme"]
build-backend = "hatchling.build"

[project]
name = "cumulusci-test"
name = "cumulusci"
dynamic = ["readme", "version"]
description = "Build and release tools for Salesforce developers"
license = {text = "BSD 3-Clause License"}
Expand Down

0 comments on commit 5de2781

Please sign in to comment.