diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4c656a7..6ab5bc0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,8 +17,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.x" - - name: Rename pyproject.d2x.toml to pyproject.toml - run: mv pyproject.d2x.toml pyproject.toml - name: Install pypa/build run: | python3 -m pip install build --user diff --git a/Dockerfile b/Dockerfile index f4e6649..ab6bcc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y python3-pip curl ENV PATH="/root/.local/bin:$PATH" # Copy d2x and CumulusCI pyproject.toml files -COPY pyproject.d2x.toml /usr/local/d2x/pyproject.toml +COPY pyproject.toml /usr/local/d2x/pyproject.toml COPY pyproject.cci.toml /usr/local/cci/pyproject.toml # Copy d2x source code diff --git a/pyproject.d2x.toml b/pyproject.d2x.toml deleted file mode 100644 index 7c854db..0000000 --- a/pyproject.d2x.toml +++ /dev/null @@ -1,20 +0,0 @@ -[tool.poetry] -name = "d2x" -version = "0.1.1" -description = "Salesforce DevOps Helper" -authors = ["Muselab LLC"] -license = "BSD3" -readme = "README.md" - -[tool.poetry.dependencies] -python = "^3.10" -rich = "^13.9.3" -pydantic = "^2.9.2" -cookiecutter = "^2.6.0" - -[tool.poetry.group.dev.dependencies] -pytest = "^8.3.3" - -[build-system] -requires = ["poetry-core"] -build-backend = "poetry.core.masonry.api" \ No newline at end of file