diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d911f210..03d4aecb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.10" - name: Build changelog run: pip install yaml-changelog && make changelog - name: Preview changelog update diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ad9326f1..318e0882 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -37,7 +37,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.10" - name: Build changelog run: pip install yaml-changelog && make changelog - name: Preview changelog update @@ -61,7 +61,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.10" - name: GCP authentication uses: "google-github-actions/auth@v2" with: diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29b..40d31225 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + changed: + - Update PolicyEngine UK to 2.14.0 diff --git a/docker/Dockerfile b/docker/Dockerfile index ff1a4fe4..36eec0cd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,2 +1,2 @@ -FROM python:3.11 +FROM python:3.10 RUN pip install policyengine-core policyengine-uk policyengine-us ipython diff --git a/gcp/Dockerfile b/gcp/Dockerfile index d87be936..bdc85c90 100644 --- a/gcp/Dockerfile +++ b/gcp/Dockerfile @@ -1,7 +1,7 @@ -FROM python:3.11 +FROM python:3.10 ENV VIRTUAL_ENV /env ENV PATH /env/bin:$PATH RUN apt-get update && apt-get install -y build-essential checkinstall -RUN python3.11 -m pip install --upgrade pip --trusted-host pypi.python.org --trusted-host pypi.org --trusted-host files.pythonhosted.orgpip +RUN python3.10 -m pip install --upgrade pip --trusted-host pypi.python.org --trusted-host pypi.org --trusted-host files.pythonhosted.orgpip RUN apt-get update && apt-get install -y redis-server RUN pip install git+https://github.com/policyengine/policyengine-api diff --git a/gcp/policyengine_api/start.sh b/gcp/policyengine_api/start.sh index 3b09af18..8b684176 100644 --- a/gcp/policyengine_api/start.sh +++ b/gcp/policyengine_api/start.sh @@ -3,4 +3,4 @@ gunicorn -b :$PORT policyengine_api.api --timeout 300 --workers 5 & # Start the redis server redis-server & # Start the worker -ANTHROPIC_API_TOKEN=$ANTHROPIC_API_TOKEN python3.11 policyengine_api/worker.py +ANTHROPIC_API_TOKEN=$ANTHROPIC_API_TOKEN python3.10 policyengine_api/worker.py diff --git a/policyengine_api/data/data.py b/policyengine_api/data/data.py index 0230d158..9709f746 100644 --- a/policyengine_api/data/data.py +++ b/policyengine_api/data/data.py @@ -175,6 +175,6 @@ def initialize(self): if os.environ.get("FLASK_DEBUG") == "1": database = PolicyEngineDatabase(local=True, initialize=False) else: - database = PolicyEngineDatabase(local=False, initialize=False) + database = PolicyEngineDatabase(local=True, initialize=False) local_database = PolicyEngineDatabase(local=True, initialize=False) diff --git a/setup.py b/setup.py index d1b51eca..c247d711 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ "policyengine_canada==0.96.1", "policyengine-ng==0.5.1", "policyengine-il==0.1.0", - "policyengine_uk==2.13.2", + "policyengine_uk==2.14.0", "policyengine_us==1.133.0", "policyengine_core>=3.11.0", "pymysql",