From 46387a71ee69b6e7c1a33ca4531b8713ff2be340 Mon Sep 17 00:00:00 2001 From: rmorshea Date: Sun, 20 Jun 2021 11:29:55 -0700 Subject: [PATCH 1/3] test bdist_wheel and sdist --- .github/workflows/test.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db39f8222..71deb0bb3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,3 +77,16 @@ jobs: git fetch --depth=1 origin +refs/tags/*:refs/tags/* - name: Build Docker Image run: docker build . --file docs/Dockerfile + test-build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2-beta + with: + node-version: "14" + - name: Use Latest Python + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Test Build Creation + run: python setup.py bdist_wheel sdist From a90675e663bc837f2420aa2797cd5f3cbfdd2515 Mon Sep 17 00:00:00 2001 From: rmorshea Date: Sun, 20 Jun 2021 11:32:54 -0700 Subject: [PATCH 2/3] install npm latest everywhere --- .github/workflows/release-pkg.yml | 4 ++++ .github/workflows/test.yml | 26 ++++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-pkg.yml b/.github/workflows/release-pkg.yml index 44a14404a..cf9a2a10e 100644 --- a/.github/workflows/release-pkg.yml +++ b/.github/workflows/release-pkg.yml @@ -17,6 +17,10 @@ jobs: uses: actions/setup-python@v1 with: python-version: "3.x" + - name: Install latest NPM + run: | + npm install -g npm@latest + npm --version - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 71deb0bb3..ad349c8ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,12 +23,14 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.9 + - name: Install latest NPM + run: | + npm install -g npm@latest + npm --version - name: Install Python Dependencies run: pip install -r requirements/test-run.txt - name: Run Tests - run: | - npm install -g npm@v7.13.0 - nox -s test -- --headless + run: nox -s test -- --headless test-python-versions: runs-on: ${{ matrix.os }} strategy: @@ -45,12 +47,14 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Install latest NPM + run: | + npm install -g npm@latest + npm --version - name: Install Python Dependencies run: pip install -r requirements/test-run.txt - name: Run Tests - run: | - npm install -g npm@v7.13.0 - nox -s test -- --headless --no-cov + run: nox -s test -- --headless --no-cov test-javascript: runs-on: ubuntu-latest steps: @@ -58,11 +62,13 @@ jobs: - uses: actions/setup-node@v2 with: node-version: "14" + - name: Install latest NPM + run: | + npm install -g npm@latest + npm --version - name: Test Javascript working-directory: ./src/idom/client/app run: | - npm --version - npm install -g npm@v7.13.0 npm install npm test npm run build @@ -88,5 +94,9 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.9 + - name: Install latest NPM + run: | + npm install -g npm@latest + npm --version - name: Test Build Creation run: python setup.py bdist_wheel sdist From 5df5218d2821850b73e0bb7bb84aa9aadff1f4d4 Mon Sep 17 00:00:00 2001 From: rmorshea Date: Sun, 20 Jun 2021 11:39:36 -0700 Subject: [PATCH 3/3] create requirements file for build deps --- .github/workflows/release-pkg.yml | 2 +- .github/workflows/test.yml | 6 +++++- requirements.txt | 5 +---- requirements/build-pkg.txt | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 requirements/build-pkg.txt diff --git a/.github/workflows/release-pkg.yml b/.github/workflows/release-pkg.yml index cf9a2a10e..daa201d15 100644 --- a/.github/workflows/release-pkg.yml +++ b/.github/workflows/release-pkg.yml @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools wheel twine + pip install -r requirements/build-pkg.txt - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ad349c8ae..dd5082c40 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,7 +83,7 @@ jobs: git fetch --depth=1 origin +refs/tags/*:refs/tags/* - name: Build Docker Image run: docker build . --file docs/Dockerfile - test-build: + test-build-package: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -98,5 +98,9 @@ jobs: run: | npm install -g npm@latest npm --version + - name: Install Python Dependencies + run: | + pip install --upgrade pip + pip install -r requirements/build-pkg.txt - name: Test Build Creation run: python setup.py bdist_wheel sdist diff --git a/requirements.txt b/requirements.txt index e20f89d91..d755f2a53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,5 @@ -pre-commit -twine -wheel -setuptools_scm -r requirements/build-docs.txt +-r requirements/build-pkg.txt -r requirements/check-style.txt -r requirements/check-types.txt -r requirements/pkg-deps.txt diff --git a/requirements/build-pkg.txt b/requirements/build-pkg.txt new file mode 100644 index 000000000..ceb36abba --- /dev/null +++ b/requirements/build-pkg.txt @@ -0,0 +1,4 @@ +pre-commit +twine +wheel +setuptools_scm