Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT - Maintenance improvements to repo #56

Merged
merged 9 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ tests

**/__tests__
ui-tests

# Ignore files for NPM and YARN
package-lock.json
yarn.lock
2 changes: 1 addition & 1 deletion .github/workflows/build.yml → .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Build extension'
name: 'Continuous Integration'

on:
push:
Expand Down
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ node_modules
**/lib
**/package.json
jupyterlab_conda_store

# Ignore files for NPM and YARN
package-lock.json
yarn.lock
39 changes: 22 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,46 +64,51 @@ pip uninstall jupyterlab-conda-store
cd jupyterlab-conda-store
```

3. Optional but recommended - Create and activate a development environment with conda:
3. Create a new conda environment:

```bash
# Create environment named `jupyterlab-conda-store`
conda create -n jupyterlab-conda-store
conda env create -f environment.yml

# activate the environment
conda activate jupyterlab-conda-store
```

4. Install JupyterLab and NodeJS **if not installed**:
4. Install the package in development mode:

```bash
# Install node and jupyterlab from conda-forge
conda install -c conda-forge 'nodejs>16' 'jupyterlab>=4'
python -m pip install -e .
```

5. Install the package in development mode:
5. Now you'll need to link the development version of the extension to JupyterLab and rebuild the Typescript source:

```bash
pip install -e .
# Install the extension dependencies
jlpm install
# Link your development version of the extension with JupyterLab
jupyter labextension develop . --overwrite
```

6. Now you'll need to link the development version of the extension to JupyterLab and rebuild the Typescript source:
6. On the first installation, or after making some changes, to visualize them in your local JupyterLab re-run the following command:

```bash
# Link your development version of the extension with JupyterLab
jupyter labextension develop . --overwrite
# Rebuild extension Typescript source after making changes
jlpm run build
```

7. On the first installation, or after making some changes, to visualize them in your local JupyterLab re-run the following command:
7. Run JupyterLab and check that the installation worked:

```bash
# Rebuild extension Typescript source after making changes
jlpm build
# Run JupyterLab
jupyter lab
```

8. Run JupyterLab and check that the installation worked:
> [!TIP]
> At times you might need to clean your local repo with the command `npm run clean:slate`. This will clean the repository, and re-install and rebuild.

To lint files as you work on contributions, you can run:

```bash
# Run JupyterLab
jupyter lab
jlpm run lint:check
```

### Uninstalling the development version
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ All the Python packaging instructions in the `pyproject.toml` file to wrap your
> [!IMPORTANT]
> There is no need to update the version in `pyproject.toml` as it is automatically updated by `hatch` when generating the package.

3. Optional - if there is a newer release of `conda-store-ui`, update the `conda-store-ui` dependency in the package.json file.
3. Optional - if there is a newer release of `conda-store-ui`, update the `conda-store-ui` dependency in the `package.json` file.

```bash
yarn upgrade @conda-store/conda-store-ui@<version>
Expand All @@ -27,7 +27,7 @@ All the Python packaging instructions in the `pyproject.toml` file to wrap your
4. To create a Python source package (`.tar.gz`) and the binary package (`.whl`) in the `dist/` directory, do:

```bash
python -m build
hatch build
```

`python setup.py sdist bdist_wheel` is deprecated and will not work for this package.
Expand Down
8 changes: 8 additions & 0 deletions environment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: jupyterlab-conda-store
channels:
- conda-forge
- nodefaults
dependencies:
- python>=3.9
- nodejs=20
- jupyterlab>=4
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "jupyterlab-conda-store"
description = "A JupyterLab extension that provides a user-friendly graphical interface for building and managing environments using an existing conda-store server"
readme = "README.md"
license = { file = "LICENSE" }
requires-python = ">=3.8"
requires-python = ">=3.9"
maintainers = [{ name = "Tania Allard", email = "[email protected]" }]
keywords = ["Jupyter", "JupyterLab", "JupyterLab4", "conda", "environments"]
classifiers = [
Expand Down Expand Up @@ -37,6 +37,7 @@ test = [
"pytest-cov",
"pytest-tornasync"
]
dev = ["hatch"]

[project.urls]
Homepage = "https:/conda-incubator/jupyterlab-conda-store"
Expand Down
Loading