diff --git a/.github/locks/linux-64_lock-environment.conda.lock b/.github/locks/linux-64_lock-environment.conda.lock index 3e2db9c..37ee80b 100644 --- a/.github/locks/linux-64_lock-environment.conda.lock +++ b/.github/locks/linux-64_lock-environment.conda.lock @@ -17,7 +17,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.1.0-h69a702a_1.cond https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-14.1.0-hc0a3c3a_1.conda#9dbb9699ea467983ba8a4ba89b08b066 https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.2-hb9d3cd8_0.conda#4d638782050ab6faa27275bed57e9b4e https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h4bc722e_7.conda#62ee74e96c5ebb0af99386de58cf9553 -https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.32.3-h4bc722e_0.conda#7624e34ee6baebfc80d67bac76cc9d9d +https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.33.1-heb4867d_0.conda#0d3c60291342c0c025db231353376dfb https://conda.anaconda.org/conda-forge/linux-64/expat-2.6.3-h5888daf_0.conda#6595440079bed734b113de44ffd3cd0a https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3 https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-hd590300_2.conda#172bf1cd1ff8629f2b1179945ed45055 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6641aa8..687ebf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ env: CONDA_EXE: mamba # our stuff SKIP_CONDA_PREFLIGHT: 1 - CACHE_EPOCH: 1 + CACHE_EPOCH: 2 jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 29b9da0..d005ff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## `2.1.0a1` + +### `@jupyrdf/jupyter-elk 2.1.0-alpha1` + +> TBD + +### `ipyelk 2.1.0a1` + +> TBD + ## `2.1.0a0` ### `@jupyrdf/jupyter-elk 2.1.0-alpha0` diff --git a/dodo.py b/dodo.py index 241eb0b..b17ab03 100644 --- a/dodo.py +++ b/dodo.py @@ -328,6 +328,9 @@ def task_setup(): else: install_targets += [P.YARN_LOCK] + if P.CI: + install_args += ["--immutable"] + install_actions = [[*P.IN_ENV, *install_args]] if not P.CI: diff --git a/package.json b/package.json index bcea886..a2b1c92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@jupyrdf/jupyter-elk", - "version": "2.1.0-alpha0", + "version": "2.1.0-alpha1", "description": "ElkJS widget for Jupyter", "license": "BSD-3-Clause", "author": "Dane Freeman", @@ -38,8 +38,8 @@ ], "types": "lib/index.d.ts", "resolutions": { - "verdaccio": "file:./scripts/not-a-package", - "@types/react": "file:./scripts/not-a-package", + "verdaccio": "link:./scripts/not-a-package", + "@types/react": "link:./scripts/not-a-package", "typescript": "5.2.2", "prettier": "^3.3.0", "elkjs": "0.9.3", diff --git a/pyproject.toml b/pyproject.toml index af7d01e..c84b1f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "flit_core.buildapi" [project] name = "ipyelk" -version = "2.1.0a0" +version = "2.1.0a1" description = "ELK widget for Jupyter" authors = [ {name = "Dane Freeman", email = "dane.freeman@gtri.gatech.edu"}, diff --git a/yarn.lock b/yarn.lock index baa8072..c86d745 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1931,12 +1931,11 @@ __metadata: languageName: node linkType: hard -"@types/react@file:./scripts/not-a-package::locator=%40jupyrdf%2Fjupyter-elk%40workspace%3A.": - version: 0.0.0 - resolution: "@types/react@file:./scripts/not-a-package#./scripts/not-a-package::hash=b79066&locator=%40jupyrdf%2Fjupyter-elk%40workspace%3A." - checksum: dcc19ae2232d5c05699eadbc5baac3b547e2ee5263573633c7df281ec9943cef2b4b893ae3056582a05a52032d4fccb0ea2cf07ff9fc923855606f11d8806bc0 +"@types/react@link:./scripts/not-a-package::locator=%40jupyrdf%2Fjupyter-elk%40workspace%3A.": + version: 0.0.0-use.local + resolution: "@types/react@link:./scripts/not-a-package::locator=%40jupyrdf%2Fjupyter-elk%40workspace%3A." languageName: node - linkType: hard + linkType: soft "@types/responselike@npm:^1.0.0": version: 1.0.3