Skip to content

Commit 98e20a0

Browse files
authored
Removed bower
`bower` is maintained but not recommended for use by its developers. Our `bower.json` file now only includes two dependencies: `jquery` and `jquery-flot`. At this point, `bower` is not doing much to serve the project. Refs #1827
1 parent 260bf7d commit 98e20a0

File tree

130 files changed

+5
-46163
lines changed

Some content is hidden

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

130 files changed

+5
-46163
lines changed

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ locale/*/LC_MESSAGES/django.mo
1414
.envrc
1515
.tox
1616
djangoproject/cache
17-
djangoproject/static/js/lib/jquery-flot/examples
1817
djangoproject/static/css/*.map
1918
djangoproject/static/css/*.css
20-
node_modules/

Dockerfile

-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ RUN apt-get update \
1616
libpq5 \
1717
make \
1818
netcat-openbsd \
19-
npm \
2019
postgresql-client-15 \
2120
rsync \
2221
zlib1g \
@@ -41,10 +40,6 @@ RUN apt-get update \
4140
zlib1g-dev \
4241
&& rm -rf /var/lib/apt/lists/*
4342

44-
# install node dependencies
45-
COPY ./package.json ./package.json
46-
RUN npm install
47-
4843
# copy project
4944
COPY . .
5045

Makefile

-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.PHONY: all ci clean collectstatics compile-scss compile-scss-debug install run test watch-scss
22

33
APP_LIST ?= accounts aggregator blog contact dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
4-
JQUERY_FLOT=djangoproject/static/js/lib/jquery-flot
54
SCSS = djangoproject/scss
65
STATIC = djangoproject/static
76

@@ -19,21 +18,13 @@ compile-scss-debug:
1918

2019
install:
2120
python -m pip install --requirement requirements/dev.txt
22-
npm install
2321

2422
isort:
2523
python -m isort $(APP_LIST)
2624

2725
isort-check:
2826
python -m isort --check $(APP_LIST)
2927

30-
$(JQUERY_FLOT)/:
31-
npm run bower install
32-
33-
$(JQUERY_FLOT)/jquery.flot.min.js: $(JQUERY_FLOT)
34-
cat $(JQUERY_FLOT)/jquery.flot.js $(JQUERY_FLOT)/jquery.flot.time.js > $(JQUERY_FLOT)/jquery.flot.concat.js
35-
yuicompressor $(JQUERY_FLOT)/jquery.flot.concat.js -o $(JQUERY_FLOT)/jquery.flot.min.js
36-
3728
migrations-check:
3829
python -m manage makemigrations --check --dry-run
3930

README.rst

+3-18
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Install and run locally from a virtual environment
2020
#. Install dependencies::
2121

2222
python3 -m pip install -r requirements/dev.txt
23-
npm install
2423

2524
Alternatively, use the make task::
2625

@@ -234,23 +233,9 @@ Check out the ``Procfile`` file for all the process names.
234233
JavaScript libraries
235234
--------------------
236235

237-
This project uses `Bower <https://bower.io/>`_ to manage JavaScript libraries.
238-
239-
At any time, you can run it to install a new library (e.g., ``jquery-ui``)::
240-
241-
npm run bower install jquery-ui --save
242-
243-
or check if there are newer versions of the libraries that we use::
244-
245-
npm run bower ls
246-
247-
If you need to update an existing library, the easiest way is to change the
248-
version requirement in ``bower.json`` and then to run
249-
``npm run bower install`` again.
250-
251-
We commit the libraries to the repository, so if you add, update, or remove a
252-
library from ``bower.json``, you will need to commit the changes in
253-
``djangoproject/static`` too.
236+
This project's JavaScript libraries can be found in
237+
``djangoproject/static/js/lib/``. If you need to add a library, commit the
238+
minified version of it to this directory.
254239

255240
Documentation search
256241
--------------------

bower.json

-8
This file was deleted.

djangoproject/static/js/lib/jquery-flot/.bower.json

-18
This file was deleted.

djangoproject/static/js/lib/jquery-flot/.gitignore

-3
This file was deleted.

djangoproject/static/js/lib/jquery-flot/.travis.yml

-3
This file was deleted.

0 commit comments

Comments
 (0)