From 001748677f78000d236b006d8d97439873ac2290 Mon Sep 17 00:00:00 2001 From: "Maarten A. Breddels" Date: Tue, 18 Apr 2023 19:11:10 +0200 Subject: [PATCH] =?UTF-8?q?Bump=20version:=201.8.9=20=E2=86=92=201.8.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .github/workflows/test.yml | 21 ++++++++++++--------- ipyvuetify/_version.py | 2 +- js/package.json | 2 +- setup.py | 11 ++++++----- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ccd67584..f83f558a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.8.9 +current_version = 1.8.10 commit = True tag = True parse = (?P\d+)(\.(?P\d+))(\.(?P\d+))((?P.)(?P\d+))? diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6088ed4c..5a0dd3b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,11 +32,18 @@ jobs: python setup.py generate_source python setup.py sdist bdist_wheel + - name: Build + run: | + cd js + npm pack + - name: Upload builds uses: actions/upload-artifact@v3 with: name: ipyvuetify-dist-${{ github.run_number }} - path: ./dist + path: | + ./dist + ./js/*.tgz test: needs: [build] @@ -51,7 +58,6 @@ jobs: - uses: actions/download-artifact@v3 with: name: ipyvuetify-dist-${{ github.run_number }} - path: ./dist - name: Install Python uses: actions/setup-python@v2 @@ -59,7 +65,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install - run: pip install dist/*.whl + run: pip install *.whl - name: Import # do the import in a subdirectory, as after installation, files in de current directory are also imported @@ -75,7 +81,6 @@ jobs: - uses: actions/download-artifact@v3 with: name: ipyvuetify-dist-${{ github.run_number }} - path: ./dist - name: Install Python uses: actions/setup-python@v2 @@ -84,7 +89,7 @@ jobs: - name: Install vuetify and test deps run: | - wheel=(dist/*.whl) + wheel=(*.whl) pip install ${wheel}[test] "jupyter_server<2" - name: Install playwright browsers @@ -102,13 +107,12 @@ jobs: release: if: startsWith(github.event.ref, 'refs/tags/v') - needs: [test, ui-test] + needs: [test] runs-on: ubuntu-20.04 steps: - uses: actions/download-artifact@v3 with: name: ipyvuetify-dist-${{ github.run_number }} - path: ./dist - name: Install node uses: actions/setup-node@v1 @@ -134,10 +138,9 @@ jobs: - name: Publish the NPM package run: | - cd js echo $PRE_RELEASE if [[ $PRE_RELEASE == "true" ]]; then export TAG="next"; else export TAG="latest"; fi - npm publish --tag ${TAG} --access public + npm publish --tag ${TAG} --access public *.tgz env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} PRE_RELEASE: ${{ github.event.release.prerelease }} diff --git a/ipyvuetify/_version.py b/ipyvuetify/_version.py index 11fdbb2d..98584cf0 100644 --- a/ipyvuetify/_version.py +++ b/ipyvuetify/_version.py @@ -1,2 +1,2 @@ -__version__ = "1.8.9" +__version__ = "1.8.10" semver = "^" + __version__ diff --git a/js/package.json b/js/package.json index dff7141d..1f60a6df 100755 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "jupyter-vuetify", - "version": "1.8.9", + "version": "1.8.10", "description": "Jupyter widgets based on vuetify UI components", "license": "MIT", "author": "Mario Buikhuizen, Maarten Breddels", diff --git a/setup.py b/setup.py index caedce07..849bf55b 100644 --- a/setup.py +++ b/setup.py @@ -185,11 +185,12 @@ def run(self): install_requires=[ "ipyvue>=1.7,<2", ], - extras_require={ - "test": [ - "solara[pytest] @ https://github.com/widgetti/solara/archive/refs/heads/feat_test_ipywidgets.zip", - ] - }, + # we need to use the released version + # extras_require={ + # "test": [ + # "solara[pytest] @ https://github.com/widgetti/solara/archive/refs/heads/feat_test_ipywidgets.zip", + # ] + # }, packages=find_packages(exclude=["generate_source"]), zip_safe=False, cmdclass={