From 1e9e46a98a7257cbad2d97561260157dd7440228 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 8 Apr 2023 00:41:37 -0400 Subject: gh-32: Add poetry lock --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9aa4a5..cfa7870 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,6 @@ jobs: python -m pip install --upgrade pip pip install poetry - name: Install dependencies - run: poetry install + run: poetry lock && poetry install - name: Test run: poetry run task test -- cgit v1.2.3 From e156e3e2ec7af82a1dcaee2a5f20827dfe596195 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 8 Apr 2023 00:46:32 -0400 Subject: gh-32: Fix poetry lockfile to be compatible with older poetry version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfa7870..d9aa4a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,6 @@ jobs: python -m pip install --upgrade pip pip install poetry - name: Install dependencies - run: poetry lock && poetry install + run: poetry install - name: Test run: poetry run task test -- cgit v1.2.3 From dcc68e69e6e464bac20596f6b67125cc1983164a Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 22 Apr 2023 10:17:19 -0400 Subject: Add requirements.txt for py36 The latest version of Poetry doesn't support py36. Furthermore, the lockfile format is different between the version of poetry supported with py36 and the latest poetry version. This is a workaround by exporting the dependencies to a requirements.txt file on CI for py36. I tried using the lowest common denomenator (the old version of poetry), but the dependency resolver doesn't seem to be as good. It never resolves with the current pyproject.toml updates. However, it does so right away with the updated poetry version. Since we're planning on removing py36 in the near future, this tradeoff seems okay in the meantime. --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9aa4a5..b375c08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,11 +3,7 @@ name: Taskipy Test CI -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push, pull_request] jobs: build: @@ -24,16 +20,20 @@ jobs: runs-on: ${{ matrix.os || 'ubuntu-latest' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install Poetry run: | python -m pip install --upgrade pip pip install poetry - - name: Install dependencies + - name: Install Dependencies (Python 3.6) + if: ${{ matrix.python-version == 3.6 }} + run: poetry run pip install -r .github/requirements-py36-ci.txt + - name: Install Dependencies (Python 3.7+) + if: ${{ matrix.python-version != 3.6 }} run: poetry install - name: Test run: poetry run task test -- cgit v1.2.3 From e951cc5a4c25fa81409122eb881ea45bde630364 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 22 Apr 2023 10:34:24 -0400 Subject: gh-32: Add ci setup.py for py36 --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b375c08..24bb898 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,9 @@ jobs: pip install poetry - name: Install Dependencies (Python 3.6) if: ${{ matrix.python-version == 3.6 }} - run: poetry run pip install -r .github/requirements-py36-ci.txt + run: | + poetry run pip install -r .github/requirements-py36-ci.txt + python .github/setup-py36-ci.py install - name: Install Dependencies (Python 3.7+) if: ${{ matrix.python-version != 3.6 }} run: poetry install -- cgit v1.2.3 From f4610f30895c292599cd89f6bd7fc638d9f5e838 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 22 Apr 2023 13:33:55 -0400 Subject: Revert build changes --- .github/workflows/ci.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24bb898..c03a457 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,11 @@ name: Taskipy Test CI -on: [push, pull_request] +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: build: @@ -29,13 +33,7 @@ jobs: run: | python -m pip install --upgrade pip pip install poetry - - name: Install Dependencies (Python 3.6) - if: ${{ matrix.python-version == 3.6 }} - run: | - poetry run pip install -r .github/requirements-py36-ci.txt - python .github/setup-py36-ci.py install - - name: Install Dependencies (Python 3.7+) - if: ${{ matrix.python-version != 3.6 }} + - name: Install dependencies run: poetry install - name: Test run: poetry run task test -- cgit v1.2.3