Skip to content

Commit

Permalink
BLD: Use modern jupyter_packaging and jupyterlab (#111)
Browse files Browse the repository at this point in the history
* BLD: Use modern jupyter_packaging and jupyterlab

* Update setup.py

[ci skip]

* Update ci_tests.yml

[ci skip]

* Create dependabot.yml

* Update ci_tests.yml

* Bump jupyterlab/builder

as suggested by dhomeier

* Add back really old Python versions

because Maarten wanted them back [ci skip]

* Update ci_tests.yml

* Update pyproject.toml

Co-authored-by: Derek Homeier <[email protected]>

* Update js/package.json

Co-authored-by: Iisakki Rotko <[email protected]>

* Remove Python 3.6 part 1

[ci skip]

* Remove Python 3.6 from CI

* Fix mac runner bug by bumping OpenAstronomy pin

* Update ci_tests.yml

* py37 on linux now

* Use old ubuntu for py37

* Hands

* Update ci_tests.yml

---------

Co-authored-by: Derek Homeier <[email protected]>
Co-authored-by: Iisakki Rotko <[email protected]>
  • Loading branch information
3 people authored Dec 23, 2024
1 parent 016df3d commit 5c8af3b
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 19 deletions.
23 changes: 23 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "monthly"
groups:
actions:
patterns:
- "*"
- package-ecosystem: "github-actions" # See documentation for possible values
directory: ".github/workflows" # Location of package manifests
schedule:
interval: "monthly"
groups:
actions:
patterns:
- "*"
39 changes: 24 additions & 15 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,55 @@ on:
- '*'
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install node
uses: actions/setup-node@v2
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install Python
uses: actions/setup-python@v2
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install twine wheel jupyter-packaging "jupyterlab<4"
pip install twine wheel jupyter-packaging jupyterlab
- name: Build
run: |
python setup.py sdist bdist_wheel
- name: Upload builds
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: bqplot-image-gl-dist-${{ github.run_number }}
path: ./dist

visual-regression-tests:
runs-on: ubuntu-latest
needs: [build]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: bqplot-image-gl-dist-${{ github.run_number }}
path: ./dist

- name: Install Python
uses: actions/setup-python@v2
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: '3.x'

Expand All @@ -72,14 +77,14 @@ jobs:
- name: Upload UI Test artifacts
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: bqplot-image-gl-ui-test-output
path: |
test-results
tests:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@d68193b68216da64eafaa618f53c59f5d271c56e # v1.14.0
with:
coverage: codecov

Expand All @@ -88,15 +93,19 @@ jobs:
- linux: codestyle
coverage: false
- linux: py36-test
runs-on: ubuntu-20.04
- linux: py37-test
runs-on: ubuntu-22.04
- linux: py38-test
- linux: py313-test
- macos: py37-test
- macos: py310-test
- macos: py312-test
- windows: py39-test
- windows: py311-test
- linux: py38-notebooks
- macos: py37-notebooks
- linux: py37-notebooks
runs-on: ubuntu-22.04
- macos: py38-notebooks
runs-on: macos-13
- windows: py39-notebooks
2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"postinstall": "patch-package"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0-rc.4",
"@jupyterlab/builder": "^3.0.0-rc.4 || ^4.0.0",
"npm-run-all": "^4.1.5",
"raw-loader": "^4",
"rimraf": "^2.6.1",
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = ["jupyter-packaging~=0.7.12",
"jupyterlab~=3.0.0",
requires = ["jupyter_packaging>=0.10.6",
"jupyterlab>=3.6",
"setuptools>=40.8.0",
"wheel"]
build-backend = "setuptools.build_meta"
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@
'Intended Audience :: Science/Research',
'Topic :: Multimedia :: Graphics',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
],
)

0 comments on commit 5c8af3b

Please sign in to comment.