diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fc91db6..49db244 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -42,7 +42,7 @@ jobs: - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@v0 with: - project_id: policyengine-api + project_id: policyengine-api-light service_account_key: ${{ secrets.GCP_SA_KEY }} export_default_credentials: true - name: Install dependencies diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d6733c7..c9be330 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,7 +20,7 @@ jobs: versioning: name: Update versioning if: | - (github.repository == 'PolicyEngine/policyengine-api') + (github.repository == 'PolicyEngine/policyengine-api-light') && !(github.event.head_commit.message == 'Update PolicyEngine API') runs-on: ubuntu-latest steps: @@ -49,7 +49,7 @@ jobs: name: Deploy API runs-on: ubuntu-latest if: | - (github.repository == 'PolicyEngine/policyengine-api') + (github.repository == 'PolicyEngine/policyengine-api-light') && (github.event.head_commit.message == 'Update PolicyEngine API') steps: - name: Checkout repo diff --git a/Makefile b/Makefile index 5c23498..1c7a517 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ deploy: python gcp/export.py gcloud config set app/cloud_build_timeout 1800 cp gcp/policyengine_api_light/* . - y | gcloud app deploy --service-account=github-deployment@policyengine-api.iam.gserviceaccount.com + y | gcloud app deploy --service-account=github-deployment@policyengine-api-light.iam.gserviceaccount.com rm app.yaml rm Dockerfile rm .gac.json @@ -25,7 +25,7 @@ deploy: changelog: build-changelog changelog.yaml --output changelog.yaml --update-last-date --start-from 0.1.0 --append-file changelog_entry.yaml - build-changelog changelog.yaml --org PolicyEngine --repo policyengine-api --output CHANGELOG.md --template .github/changelog_template.md + build-changelog changelog.yaml --org PolicyEngine --repo policyengine-api-light --output CHANGELOG.md --template .github/changelog_template.md bump-version changelog.yaml setup.py policyengine_api_light/constants.py rm changelog_entry.yaml || true touch changelog_entry.yaml \ No newline at end of file diff --git a/changelog.yaml b/changelog.yaml index ac8ba68..22300d7 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -2,4 +2,4 @@ added: - Initial API. date: 2023-12-14 00:00:00 - version: 0.1.0 \ No newline at end of file + version: 0.1.0 \ No newline at end of file diff --git a/changelog_entry.yaml b/changelog_entry.yaml index d510a98..8e185fc 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -1,5 +1,4 @@ -- bump: minor +- bump: patch changes: changed: - - Migrated existing API into API-light folder - - Updated paths to match API name \ No newline at end of file + - Change links to re-enable changelog building \ No newline at end of file diff --git a/setup.py b/setup.py index 25ac0b8..ba37248 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from policyengine_api_light.constants import __version__ setup( - name="policyengine-api", + name="policyengine-api-light", version=__version__, author="PolicyEngine", author_email="hello@policyengine.org", @@ -40,7 +40,7 @@ # script policyengine-api-setup -> policyengine_api_light.setup_data:setup_data entry_points={ "console_scripts": [ - "policyengine-api-setup=policyengine_api_light.setup_data:setup_data", + "policyengine-api-light-setup=policyengine_api_light.setup_data:setup_data", ], }, )