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.

Sign up for GitHub

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

Switch from yarn to npm #58

Merged
merged 2 commits into from
Mar 24, 2021
Merged

Switch from yarn to npm #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee393c3
Switch from yarn to npm
Stormheg Mar 20, 2021
ac8aed2
Apply suggestions from code review
thibaudcolas Mar 24, 2021
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: 2 additions & 2 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- uses: actions/setup-node@v2-beta
with:
node-version: "${{ steps.nvm.outputs.NVMRC }}"
- run: yarn install
- run: yarn frontend
- run: npm install
- run: npm run frontend
- uses: actions/setup-python@v2
with:
python-version: 3.7
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ docs: ## Regenerate Sphinx HTML documentation, including API docs

.PHONY: frontend
frontend: ## Compile frontend files
yarn run frontend
npm run frontend


.PHONY: install
Expand Down Expand Up @@ -167,7 +167,7 @@ setup: setup-python setup-frontend ## Setup all

.PHONY: setup-frontend
setup-frontend: ##- Setup node modules
yarn install
npm install


.PHONY: setup-python
Expand Down
17 changes: 4 additions & 13 deletions docs/development.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Development
===========

For local development you need a system with Node v12.x, Yarn, Python3, Git and
For local development you need a system with Node v12.x, npm, Python3, Git and
make. It is strongly recommended to use a Python virtual environment (`venv`_).
The build process derives the version from repository data, so it's necessary
to clone the repository and not just download a single snapshot.
Expand Down Expand Up @@ -83,16 +83,7 @@ check the rendering.
Javascript package management
=============================

Use `yarn` for package management.

To upgrade a Javascript package to a newer version use the following. This
keeps `package.json` and `yarn.lock` in sync as BOTH will be modified:

.. code-block:: shell

# ATTENTION: Select only those with reasonable version numbers.
# Be very careful if the MAJOR number would change
yarn upgrade-interactive --latest
Use `npm` for package management.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed most of this section as npm has no interactive upgrade mechanism as far as I'm aware.



Release process
Expand All @@ -112,8 +103,8 @@ With an active virtual environment:
python -m pip install --upgrade -r requirements.txt
make clean
make clean-frontend
yarn
yarn build
npm install
npm run build
prerelease
python -m build
python -m twine upload --repository pypi dist/*
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# unless otherwise overridden by more specific contexts.
[build]
publish = "docs/_build/html"
command = "yarn build && pip install -e . && make docs"
command = "npm run build && pip install -e . && make docs"

[build.environment]
PYTHON_VERSION = "3.7"
Loading