Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix poetry install errors #12902

Merged
merged 11 commits into from
Oct 11, 2023
Merged

Fix poetry install errors #12902

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3b489d3
poetry self add setuptools
ancalita Oct 7, 2023
aa371fe
Test 2: Trigger CI
ancalita Oct 7, 2023
6aef1ae
Test 3: Trigger CI
ancalita Oct 7, 2023
1f7b0cc
Test 4: Trigger CI
ancalita Oct 7, 2023
414eb6a
Test 5: Trigger CI
ancalita Oct 7, 2023
0b20f43
Test 6: Trigger CI
ancalita Oct 7, 2023
54016df
Test 7: Trigger CI
ancalita Oct 7, 2023
95e44ff
Test 8: Trigger CI
ancalita Oct 7, 2023
096e0d5
Test 9: Trigger CI
ancalita Oct 7, 2023
e9bf8ec
Test 10: Trigger CI
ancalita Oct 7, 2023
d0ba9d1
Merge branch '3.6.x' into ATO-1563-try-new-poetry-solution-suggestion…
ancalita Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .github/workflows/continous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ jobs:
with:
poetry-version: ${{ env.POETRY_VERSION }}

- name: Inject setuptools into poetry's runtime environment
if: needs.changes.outputs.backend == 'true'
run: |
poetry self add setuptools

- name: Load Poetry Cached Libraries ⬇
id: cache-poetry
if: needs.changes.outputs.backend == 'true'
Expand Down Expand Up @@ -163,7 +168,7 @@ jobs:
# This is a workaround for that issue
run: |
sudo apt-get -y install libpq-dev
make install-full || make install-full || make install-full
make install-full

- name: Checkout target branch to be able to diff
if: needs.changes.outputs.backend == 'true' && github.event_name == 'pull_request'
Expand Down Expand Up @@ -277,6 +282,11 @@ jobs:
with:
poetry-version: ${{ env.POETRY_VERSION }}

- name: Inject setuptools into poetry's runtime environment
if: needs.changes.outputs.backend == 'true'
run: |
poetry self add setuptools

- name: Load Poetry Cached Libraries ⬇
id: cache-poetry
if: needs.changes.outputs.backend == 'true'
Expand Down Expand Up @@ -311,7 +321,7 @@ jobs:
# This is a workaround for that issue
run: |
sudo apt-get -y install libpq-dev
make install-full | tee .output || make install-full | tee .output || make install-full | tee .output
make install-full | tee .output
if grep 'The lock file is not up to date' .output; then exit 1; fi
make prepare-tests-ubuntu

Expand All @@ -330,7 +340,7 @@ jobs:
Remove-Item -Force -Recurse $spacy_data_dir
New-Item -Path $spacy_data_dir -Type Directory
}
make install-full || make install-full || make install-full
make install-full
make prepare-tests-windows-gha

- name: Add github workflow problem matchers
Expand Down Expand Up @@ -427,6 +437,11 @@ jobs:
with:
poetry-version: ${{ env.POETRY_VERSION }}

- name: Inject setuptools into poetry's runtime environment
if: needs.changes.outputs.backend == 'true'
run: |
poetry self add setuptools

- name: Load Poetry Cached Libraries ⬇
id: cache-poetry
if: needs.changes.outputs.backend == 'true'
Expand Down
Loading