nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: sync up action versions with framework

Browse Source 
Fixup some tests for py312

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang
2024-03-27 12:55:46 +05:30
parent 54cd492217
commit 89b5e061af
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/patch.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
steps: steps:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Check for valid Python & Merge Conflicts - name: Check for valid Python & Merge Conflicts
run: | run: |
@@ -43,12 +43,12 @@ jobs:
fi fi
- name: Setup Python - name: Setup Python
uses: "actions/setup-python@v4" uses: actions/setup-python@v5
with: with:
python-version: '3.10' python-version: '3.11'
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v2 uses: actions/setup-node@v4
with: with:
node-version: 18 node-version: 18
check-latest: true check-latest: true
@@ -57,7 +57,7 @@ jobs:
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip - name: Cache pip
uses: actions/cache@v2 uses: actions/cache@v4
with: with:
path: ~/.cache/pip path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }} key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -66,7 +66,7 @@ jobs:
${{ runner.os }}- ${{ runner.os }}-
- name: Cache node modules - name: Cache node modules
uses: actions/cache@v2 uses: actions/cache@v4
env: env:
cache-name: cache-node-modules cache-name: cache-node-modules
with: with:
@@ -81,7 +81,7 @@ jobs:
id: yarn-cache-dir-path id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)" run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2 - uses: actions/cache@v4
id: yarn-cache id: yarn-cache
with: with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

18
.github/workflows/server-tests-mariadb.yml vendored
View File

@@ -54,12 +54,12 @@ jobs:
steps: steps:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v2 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.12'
- name: Check for valid Python & Merge Conflicts - name: Check for valid Python & Merge Conflicts
run: | run: |
@@ -70,7 +70,7 @@ jobs:
fi fi
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v2 uses: actions/setup-node@v4
with: with:
node-version: 18 node-version: 18
check-latest: true check-latest: true
@@ -79,7 +79,7 @@ jobs:
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip - name: Cache pip
uses: actions/cache@v2 uses: actions/cache@v4
with: with:
path: ~/.cache/pip path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }} key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -88,7 +88,7 @@ jobs:
${{ runner.os }}- ${{ runner.os }}-
- name: Cache node modules - name: Cache node modules
uses: actions/cache@v2 uses: actions/cache@v4
env: env:
cache-name: cache-node-modules cache-name: cache-node-modules
with: with:
@@ -103,7 +103,7 @@ jobs:
id: yarn-cache-dir-path id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)" run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2 - uses: actions/cache@v4
id: yarn-cache id: yarn-cache
with: with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -144,13 +144,13 @@ jobs:
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
steps: steps:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Download artifacts - name: Download artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
- name: Upload coverage data - name: Upload coverage data
uses: codecov/codecov-action@v2 uses: codecov/codecov-action@v4
with: with:
name: MariaDB name: MariaDB
token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.CODECOV_TOKEN }}

14
.github/workflows/server-tests-postgres.yml vendored
View File

@@ -41,12 +41,12 @@ jobs:
steps: steps:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v2 uses: actions/setup-python@v5
with: with:
python-version: '3.10' python-version: '3.12'
- name: Check for valid Python & Merge Conflicts - name: Check for valid Python & Merge Conflicts
run: | run: |
@@ -57,7 +57,7 @@ jobs:
fi fi
- name: Setup Node - name: Setup Node
uses: actions/setup-node@v2 uses: actions/setup-node@v4
with: with:
node-version: 18 node-version: 18
check-latest: true check-latest: true
@@ -66,7 +66,7 @@ jobs:
run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
- name: Cache pip - name: Cache pip
uses: actions/cache@v2 uses: actions/cache@v4
with: with:
path: ~/.cache/pip path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }} key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -75,7 +75,7 @@ jobs:
${{ runner.os }}- ${{ runner.os }}-
- name: Cache node modules - name: Cache node modules
uses: actions/cache@v2 uses: actions/cache@v4
env: env:
cache-name: cache-node-modules cache-name: cache-node-modules
with: with:
@@ -90,7 +90,7 @@ jobs:
id: yarn-cache-dir-path id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)" run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2 - uses: actions/cache@v4
id: yarn-cache id: yarn-cache
with: with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

14
erpnext/accounts/report/gross_profit/test_gross_profit.py
View File

@@ -227,7 +227,7 @@ class TestGrossProfit(FrappeTestCase):
"gross_profit_%": -50.0, "gross_profit_%": -50.0,
} }
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
self.assertDictContainsSubset(expected_entry_without_dn, gp_entry[0]) self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry_without_dn)
# make delivery note # make delivery note
dn = make_delivery_note(sinv.name) dn = make_delivery_note(sinv.name)
@@ -255,7 +255,7 @@ class TestGrossProfit(FrappeTestCase):
"gross_profit_%": 0.0, "gross_profit_%": 0.0,
} }
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
self.assertDictContainsSubset(expected_entry_with_dn, gp_entry[0]) self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry_with_dn)
def test_bundled_delivery_note_with_different_warehouses(self): def test_bundled_delivery_note_with_different_warehouses(self):
""" """
@@ -386,7 +386,7 @@ class TestGrossProfit(FrappeTestCase):
"gross_profit_%": -25.0, "gross_profit_%": -25.0,
} }
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
self.assertDictContainsSubset(expected_entry, gp_entry[0]) self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
def test_crnote_against_invoice_with_multiple_instances_of_same_item(self): def test_crnote_against_invoice_with_multiple_instances_of_same_item(self):
""" """
@@ -428,8 +428,8 @@ class TestGrossProfit(FrappeTestCase):
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
# Both items of Invoice should have '0' qty # Both items of Invoice should have '0' qty
self.assertEqual(len(gp_entry), 2) self.assertEqual(len(gp_entry), 2)
self.assertDictContainsSubset(expected_entry, gp_entry[0]) self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
self.assertDictContainsSubset(expected_entry, gp_entry[1]) self.assertEqual(gp_entry[1], gp_entry[1] | expected_entry)
def test_standalone_cr_notes(self): def test_standalone_cr_notes(self):
""" """
@@ -465,7 +465,7 @@ class TestGrossProfit(FrappeTestCase):
"gross_profit_%": 100.0, "gross_profit_%": 100.0,
} }
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
self.assertDictContainsSubset(expected_entry, gp_entry[0]) self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
def test_different_rates_in_si_and_dn(self): def test_different_rates_in_si_and_dn(self):
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
@@ -557,4 +557,4 @@ class TestGrossProfit(FrappeTestCase):
"gross_profit_%": 12.5, "gross_profit_%": 12.5,
} }
gp_entry = [x for x in data if x.parent_invoice == sinv.name] gp_entry = [x for x in data if x.parent_invoice == sinv.name]
self.assertDictContainsSubset(expected_entry, gp_entry[0]) self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)