From 5356ed7fe7c1ad048b07fdd2c18a06d458f1294c Mon Sep 17 00:00:00 2001 From: Swetna Date: Thu, 22 May 2025 13:49:16 -0400 Subject: [PATCH 1/4] updated push file --- .github/workflows/push.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4b89edcd0..888639e61 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -96,3 +96,29 @@ jobs: run: docker build -t ghcr.io/policyengine/policyengine docker - name: Push container run: docker push ghcr.io/policyengine/policyengine + publish-to-pypi: + name: Publish to PyPI + if: github.event_name == 'release' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: Install build tools + run: | + python -m pip install --upgrade pip + pip install build + + - name: Build package + run: python -m build + + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + user: __token__ + password: ${{ secrets.PYPI }} \ No newline at end of file From aefa15ac8c84ddbd6a674dc7a7def5c569e11081 Mon Sep 17 00:00:00 2001 From: Swetna Date: Mon, 2 Jun 2025 12:20:41 -0400 Subject: [PATCH 2/4] Updated make file for delete script --- Makefile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b5ad62025..c16074b55 100644 --- a/Makefile +++ b/Makefile @@ -32,4 +32,22 @@ changelog: build-changelog changelog.yaml --org PolicyEngine --repo policyengine-api --output CHANGELOG.md --template .github/changelog_template.md bump-version changelog.yaml setup.py policyengine_api/constants.py rm changelog_entry.yaml || true - touch changelog_entry.yaml \ No newline at end of file + touch changelog_entry.yaml + +DB_NAME=my_local_db +DB_USER=postgres +DB_HOST=localhost + + +delete-db: + PGPASSWORD=$(PGPASSWORD) dropdb -U $(DB_USER) -h $(DB_HOST) $(DB_NAME) || echo "Database not found." + +create-db: + PGPASSWORD=$(PGPASSWORD) createdb -U $(DB_USER) -h $(DB_HOST) $(DB_NAME) + +reset-db: delete-db create-db + +create-schema: + PGPASSWORD=$(PGPASSWORD) psql -U $(DB_USER) -h $(DB_HOST) -d $(DB_NAME) -f schema.sql + +recreate-db: reset-db create-schema From be5a20bcdb3949b576976b17e0e6fd7ab6ccd1ed Mon Sep 17 00:00:00 2001 From: Swetna <48342893+Swetna@users.noreply.github.com> Date: Mon, 2 Jun 2025 12:22:40 -0400 Subject: [PATCH 3/4] Delete .github/workflows/push.yml --- .github/workflows/push.yml | 124 ------------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index 888639e61..000000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,124 +0,0 @@ -name: Push - -on: - push: - branches: - - master - -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - -concurrency: - group: deploy - -jobs: - Lint: - runs-on: ubuntu-latest - if: | - (github.repository == 'PolicyEngine/policyengine-uk') - && (github.event.head_commit.message == 'Update PolicyEngine API') - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - name: Check formatting - uses: "lgeiger/black-action@master" - with: - args: ". -l 79 --check" - versioning: - name: Update versioning - if: | - (github.repository == 'PolicyEngine/policyengine-api') - && !(github.event.head_commit.message == 'Update PolicyEngine API') - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v4 - with: - repository: ${{ github.event.pull_request.head.repo.full_name }} - ref: ${{ github.event.pull_request.head.ref }} - token: ${{ secrets.POLICYENGINE_GITHUB }} - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: "3.11" - - name: Build changelog - run: pip install yaml-changelog && make changelog - - name: Preview changelog update - run: ".github/get-changelog-diff.sh" - - name: Update changelog - uses: EndBug/add-and-commit@v9 - with: - add: "." - committer_name: Github Actions[bot] - author_name: Github Actions[bot] - message: Update PolicyEngine API - deploy: - name: Deploy API - runs-on: ubuntu-latest - if: | - (github.repository == 'PolicyEngine/policyengine-api') - && (github.event.head_commit.message == 'Update PolicyEngine API') - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: "3.11" - - name: GCP authentication - uses: "google-github-actions/auth@v2" - with: - credentials_json: "${{ secrets.GCP_SA_KEY }}" - - name: Set up GCloud - uses: "google-github-actions/setup-gcloud@v2" - - name: Deploy - run: make deploy - env: - POLICYENGINE_DB_PASSWORD: ${{ secrets.POLICYENGINE_DB_PASSWORD }} - GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GCP_SA_KEY }} - POLICYENGINE_GITHUB_MICRODATA_AUTH_TOKEN: ${{ secrets.POLICYENGINE_GITHUB_MICRODATA_AUTH_TOKEN }} - ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }} - OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} - HUGGING_FACE_TOKEN: ${{ secrets.HUGGING_FACE_TOKEN }} - docker: - name: Docker - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.POLICYENGINE_DOCKER }} - - name: Build container - run: docker build -t ghcr.io/policyengine/policyengine docker - - name: Push container - run: docker push ghcr.io/policyengine/policyengine - publish-to-pypi: - name: Publish to PyPI - if: github.event_name == 'release' - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.11" - - - name: Install build tools - run: | - python -m pip install --upgrade pip - pip install build - - - name: Build package - run: python -m build - - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - user: __token__ - password: ${{ secrets.PYPI }} \ No newline at end of file From 5bdc8d8429db8ca5ec9fc4465507e92595ec5a91 Mon Sep 17 00:00:00 2001 From: Swetna Date: Mon, 2 Jun 2025 12:23:28 -0400 Subject: [PATCH 4/4] change log --- changelog_entry.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog_entry.yaml b/changelog_entry.yaml index a2156692e..f417805f9 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -1,4 +1,4 @@ bump: patch changes: changed: - - Added a new file to publish to pypi \ No newline at end of file + - Updated make file to show delete local database \ No newline at end of file