From 7ffd10496aaa61848962b841f3057825a8643f57 Mon Sep 17 00:00:00 2001 From: chenmoneygithub Date: Tue, 11 Mar 2025 18:06:52 -0700 Subject: [PATCH 1/2] remove prettierignore --- .github/workflows/build_and_release.yml | 64 ++++++++++++------------- .github/workflows/docs-push.yml | 14 +++--- .prettierignore | 1 - 3 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 .prettierignore diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml index e0b5c7a1ea..be2d4688ed 100644 --- a/.github/workflows/build_and_release.yml +++ b/.github/workflows/build_and_release.yml @@ -5,23 +5,23 @@ on: tags: - "*" jobs: - extract-tag: - runs-on: ubuntu-latest - outputs: - version: ${{ steps.extract_tag.outputs.tag }} - steps: + extract-tag: + runs-on: ubuntu-latest + outputs: + version: ${{ steps.extract_tag.outputs.tag }} + steps: - uses: actions/checkout@v4 - - id: extract_tag - name: Extract tag name - run: echo "::set-output name=tag::$(echo $GITHUB_REF | cut -d / -f 3)" + - id: extract_tag + name: Extract tag name + run: echo "::set-output name=tag::$(echo $GITHUB_REF | cut -d / -f 3)" build-and-publish-test-pypi: needs: extract-tag runs-on: ubuntu-latest - environment: + environment: name: pypi permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing + id-token: write # IMPORTANT: mandatory for trusted publishing contents: write steps: - uses: actions/checkout@v4 @@ -31,19 +31,19 @@ jobs: python-version: "3.9" - name: Install dependencies run: python3 -m pip install --upgrade setuptools wheel twine build semver packaging - - name: Get correct version for TestPyPI release - id: check_version - run: | + - name: Get correct version for TestPyPI release + id: check_version + run: | VERSION=${{ needs.extract-tag.outputs.version }} PACKAGE_NAME="dspy-ai-test" echo "Checking if $VERSION for $PACKAGE_NAME exists on TestPyPI" NEW_VERSION=$(python3 .github/workflows/build_utils/test_version.py $PACKAGE_NAME $VERSION) echo "Version to be used for TestPyPI release: $NEW_VERSION" - echo "::set-output name=version::$NEW_VERSION" + echo "::set-output name=version::$NEW_VERSION" - name: Update version in pyproject.toml - run: sed -i '/#replace_package_version_marker/{n;s/version="[^"]*"/version="${{ steps.check_version.outputs.version }}"/;}' pyproject.toml + run: sed -i '/#replace_package_version_marker/{n;s/version="[^"]*"/version="${{ steps.check_version.outputs.version }}"/;}' pyproject.toml - name: Update package name in pyproject.toml - run: sed -i '/#replace_package_name_marker/{n;s/name="[^"]*"/name="dspy-ai-test"/;}' pyproject.toml + run: sed -i '/#replace_package_name_marker/{n;s/name="[^"]*"/name="dspy-ai-test"/;}' pyproject.toml - name: Build a binary wheel run: python3 -m build # Test the locally built wheel @@ -59,7 +59,7 @@ jobs: # Publish to test-PyPI - name: Publish distribution 📦 to test-PyPI uses: pypa/gh-action-pypi-publish@release/v1 # This requires a trusted publisher to be setup in pypi/testpypi - with: + with: repository-url: https://test.pypi.org/legacy/ # TODO: Add tests using dspy-ai-test @@ -69,10 +69,10 @@ jobs: # Only publish to PyPI if the repository owner is stanfordnlp if: github.repository_owner == 'stanfordnlp' runs-on: ubuntu-latest - environment: + environment: name: pypi permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing + id-token: write # IMPORTANT: mandatory for trusted publishing contents: write steps: - uses: actions/checkout@v4 @@ -105,21 +105,21 @@ jobs: deactivate - name: Publish distribution 📦 to PyPI (dspy) uses: pypa/gh-action-pypi-publish@release/v1 - with: + with: attestations: false # Publish to dspy-ai - name: Update package name in pyproject.toml run: sed -i '/#replace_package_name_marker/{n;s/name *= *"[^"]*"/name="dspy-ai"/;}' ./dspy/.internal_dspyai/pyproject.toml - name: Update version for dspy-ai release run: sed -i '/#replace_package_version_marker/{n;s/version *= *"[^"]*"/version="${{ needs.extract-tag.outputs.version }}"/;}' ./dspy/.internal_dspyai/pyproject.toml - - name: Update dspy dependency for dspy-ai release + - name: Update dspy dependency for dspy-ai release run: | sed -i '/#replace_dspy_version_marker/{n;s/dspy *>= *"[^"]*/dspy>=${{ needs.extract-tag.outputs.version }}/;}' ./dspy/.internal_dspyai/pyproject.toml - name: Build a binary wheel (dspy-ai) run: python3 -m build ./dspy/.internal_dspyai/ - name: Publish distribution 📦 to PyPI (dspy-ai) uses: pypa/gh-action-pypi-publish@release/v1 - with: + with: attestations: false packages-dir: ./dspy/.internal_dspyai/dist/ - uses: stefanzweifel/git-auto-commit-action@v5 # auto commit changes to main @@ -127,17 +127,17 @@ jobs: commit_message: Update versions create_branch: true branch: release-${{ needs.extract-tag.outputs.version }} - - name: Checkout main branch - run: | - git fetch origin - git checkout main + - name: Checkout main branch + run: | + git fetch origin + git checkout main - name: Configure git user - run: | + run: | git config --global user.email "actions@github.com" git config --global user.name "Github Actions" - - name: Merge release branch into main - run: | - git merge --no-ff release-${{ needs.extract-tag.outputs.version }} + - name: Merge release branch into main + run: | + git merge --no-ff release-${{ needs.extract-tag.outputs.version }} - name: Push changes to main - run: | - git push origin main \ No newline at end of file + run: | + git push origin main diff --git a/.github/workflows/docs-push.yml b/.github/workflows/docs-push.yml index 75cee32b17..f8ae67ae62 100644 --- a/.github/workflows/docs-push.yml +++ b/.github/workflows/docs-push.yml @@ -5,10 +5,10 @@ on: branches: - main paths: - - 'docs/**' + - "docs/**" pull_request: paths: - - 'docs/**' + - "docs/**" jobs: build-test: @@ -20,7 +20,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v3 with: - node-version: '18' + node-version: "18" - name: Install dependencies and build run: | cd docs @@ -39,8 +39,8 @@ jobs: env: API_TOKEN_GITHUB: ${{ secrets.GH_PAT }} with: - source-directory: 'docs' - destination-github-username: 'krypticmouse' - destination-repository-name: 'dspy-docs' + source-directory: "docs" + destination-github-username: "krypticmouse" + destination-repository-name: "dspy-docs" user-email: github-actions@github.com - target-branch: master \ No newline at end of file + target-branch: master diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 6d2eaaa41d..0000000000 --- a/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -.github/ \ No newline at end of file From 924b63a270a91b85734f471916bd68546d70a3e6 Mon Sep 17 00:00:00 2001 From: chenmoneygithub Date: Mon, 17 Mar 2025 11:37:13 -0700 Subject: [PATCH 2/2] add back the ignore file --- .prettierignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..6d2eaaa41d --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +.github/ \ No newline at end of file