Skip to content

Commit 5e259c3

Browse files
authored
Use NPM packages instead of bower for formgrader extension dependencies (#1967)
* Use NPM packages instead of bower * Remove bower as a dependency, update task.py and update documentation * Update underscore dependency * Update undescore dependencies to >=1.13.1
1 parent ab7ef18 commit 5e259c3

File tree

135 files changed

+29804
-2957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+29804
-2957
lines changed

.bowerrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/check-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
- name: Run Link Check
3636
uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
3737
with:
38-
ignore_links: http://www.opensource.org/licenses/mit-license.php
38+
ignore_links: http://www.opensource.org/licenses/mit-license.php

.gitignore

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,25 @@ nbgrader/docs/source/user_guide/source/ps1_autotest/problem1.html
9696
nbgrader/docs/source/user_guide/source/ps1_autotest/problem2.html
9797

9898
# components stuff
99-
node_modules
100-
nbgrader/server_extensions/formgrader/static/components/bootstrap/less
101-
nbgrader/server_extensions/formgrader/static/components/bootstrap/js/*
102-
nbgrader/server_extensions/formgrader/static/components/datatables.net/js/jquery.dataTables.js
103-
nbgrader/server_extensions/formgrader/static/components/datatables.net-bs/js/dataTables.bootstrap.js
104-
nbgrader/server_extensions/formgrader/static/components/datatables.net-bs/css/dataTables.bootstrap.css
105-
nbgrader/server_extensions/formgrader/static/components/jquery/jquery-migrate.min.js
106-
nbgrader/server_extensions/formgrader/static/components/jquery/jquery-migrate.js
107-
nbgrader/server_extensions/formgrader/static/components/jquery-color/test
108-
nbgrader/server_extensions/formgrader/static/components/autosize/example
109-
110-
!nbgrader/server_extensions/formgrader/static/components/autosize/dist
111-
!nbgrader/server_extensions/formgrader/static/components/bootstrap/js/bootstrap.js
112-
!nbgrader/server_extensions/formgrader/static/components/bootstrap/js/bootstrap.min.js
99+
/node_modules
100+
nbgrader/server_extensions/formgrader/static/node_modules/autosize/example
101+
nbgrader/server_extensions/formgrader/static/node_modules/autosize/src
102+
nbgrader/server_extensions/formgrader/static/node_modules/bootstrap/less
103+
nbgrader/server_extensions/formgrader/static/node_modules/bootstrap/js
104+
nbgrader/server_extensions/formgrader/static/node_modules/bootstrap/grunt
105+
nbgrader/server_extensions/formgrader/static/node_modules/jquery/external
106+
nbgrader/server_extensions/formgrader/static/node_modules/jquery/src
107+
nbgrader/server_extensions/formgrader/static/node_modules/underscore/amd
108+
nbgrader/server_extensions/formgrader/static/node_modules/underscore/cjs
109+
nbgrader/server_extensions/formgrader/static/node_modules/underscore/modules
110+
nbgrader/server_extensions/formgrader/static/node_modules/underscore/underscore-esm*
111+
nbgrader/server_extensions/formgrader/static/node_modules/underscore/underscore-node*
112+
nbgrader/server_extensions/formgrader/static/node_modules/underscore/underscore-umd*
113+
114+
!nbgrader/server_extensions/formgrader/static/node_modules/autosize/dist
115+
!nbgrader/server_extensions/formgrader/static/node_modules/bootstrap/dist
116+
!nbgrader/server_extensions/formgrader/static/node_modules/jquery/dist
117+
!nbgrader/server_extensions/formgrader/static/node_modules/jquery-color/dist
113118

114119
conda-bld
115120
gh_api.sqlite

bower.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

nbgrader/converters/generate_feedback.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ def __init__(self, coursedir=None, **kwargs):
5757
c = Config()
5858
if 'template_name' not in self.config.HTMLExporter:
5959
c.HTMLExporter.template_name = 'feedback'
60-
60+
6161
if 'extra_template_basedirs' not in self.config.HTMLExporter:
6262
template_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'server_extensions', 'formgrader', 'templates'))
6363
c.HTMLExporter.extra_template_basedirs = [template_path]
64-
65-
extra_static_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'server_extensions', 'formgrader', 'static', 'components', 'bootstrap', 'css'))
64+
65+
extra_static_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'server_extensions', 'formgrader', 'static', 'node_modules', 'bootstrap', 'dist', 'css'))
6666
c.HTMLExporter.extra_template_paths = [extra_static_path]
6767

6868
self.update_config(c)

nbgrader/docs/source/contributor_guide/js_dependencies.rst

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
11
JavaScript dependencies
22
=======================
33

4-
For the time being, we are committing JavaScript dependencies to the nbgrader
5-
repository as that makes nbgrader installation much easier.
4+
For the time being, we are committing JavaScript dependencies to the formgrader server
5+
extension, as that makes installation much easier.
66

77
Adding or updating JavaScript libraries
88
---------------------------------------
99
If you need to add a new library, or update the version of a library, you will
10-
need to have `npm` installed.
10+
need to have `jupyterlab` installed (it provides the `jlpm` command).
1111

12-
To install npm on OS X, use Homebrew to install node (npm will be installed
13-
along with node)::
14-
15-
brew update
16-
brew install node
17-
18-
To install npm on Linux with apt-get, use::
19-
20-
apt-get update
21-
apt-get install node
22-
apt-get install npm
23-
24-
Modify the ``bower.json`` file in the root of the nbgrader
25-
repository and then run::
12+
Modify the ``package.json`` file in ``nbgrader/server_extensions/formgrader/static/``
13+
and then run::
2614

2715
python tasks.py js
2816

2917
This will download and install the correct versions of the dependencies to
30-
``nbgrader/server_extensions/formgrader/static/components``.
18+
``nbgrader/server_extensions/formgrader/static/node_modules``.
3119
Usually, JavaScript libraries installed in this way include a lot of extra files
3220
(e.g. tests, documentation) that we don't want to commit to the nbgrader
3321
repository. If this is the case, please add these files to the

nbgrader/server_extensions/formgrader/static/components/autosize/.bower.json

Lines changed: 0 additions & 39 deletions
This file was deleted.

nbgrader/server_extensions/formgrader/static/components/autosize/src/autosize.js

Lines changed: 0 additions & 179 deletions
This file was deleted.

nbgrader/server_extensions/formgrader/static/components/backbone/.bower.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

nbgrader/server_extensions/formgrader/static/components/backbone/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)