Merge fcd4dad into d0b9678

.gitignore

@@ -59,3 +59,5 @@ target/
 
 # Vim swapfiles
 .*.sw?
+
+.pytest_cache/

.travis.yml

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2020 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -49,7 +49,6 @@ install:
   - "travis_retry pip install -r .travis-${REQUIREMENTS}-requirements.txt"
   - "travis_retry pip install -e .[all]"
   - "npm update"
-  - "npm install --global --silent clean-css clean-css-cli requirejs"
 
 script:
   - "./run-tests.sh"

CHANGES.rst

@@ -8,6 +8,11 @@
 Changes
 =======
 
+Version 1.2.0 (released 2020-05-13)
+
+* Removes support for Flask-Assets and Webassets which was deprecated with
+  the release of Invenio v3.0.
+
 Version 1.1.5 (released 2020-04-28)
 
 * Webpack now uses by default in debug/development mode folder-level symlinking

INSTALL.rst

@@ -1,6 +1,6 @@
 ..
     This file is part of Invenio.
-    Copyright (C) 2015-2018 CERN.
+    Copyright (C) 2015-2020 CERN.
 
     Invenio is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
@@ -15,19 +15,5 @@ Invenio-Assets is on PyPI so all you need is:
    $ pip install invenio-assets
 
 Invenio-Assets depends on
-`Flask-WebpackExt <https://flask-webpackext.readthedocs.io/en/latest/>`_,
-`Flask-Assets <https://flask-assets.readthedocs.io/en/latest/>`_,
-`WebAssets <https://webassets.readthedocs.io/en/latest/>`_
+`Flask-WebpackExt <https://flask-webpackext.readthedocs.io/en/latest/>`_
 and `Flask-Collect <https://flask-collect.readthedocs.io/en/latest/>`_.
-
-By choosing to use Flask-Assets, you will also have many filters which depend
-on existing command line tools to be installed such as RequireJS, UglifyJS,
-Node-SASS and CleanCSS. These tools are most easily installed with
-`NPM <https://nodejs.org/en/download/>`_:
-
-.. code-block:: console
-
-    $ npm update
-    $ npm install -g node-sass clean-css clean-css-cli uglify-js \
-        requirejs
-

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2015-2018 CERN.
+Copyright (C) 2015-2020 CERN.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.rst

@@ -1,6 +1,6 @@
 ..
     This file is part of Invenio.
-    Copyright (C) 2015-2018 CERN.
+    Copyright (C) 2015-2020 CERN.
 
     Invenio is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
@@ -21,12 +21,12 @@
 .. image:: https://img.shields.io/pypi/v/invenio-assets.svg
         :target: https://pypi.org/pypi/invenio-assets
 
-Media assets management for Invenio web interface.
+Media assets management for Invenio.
 
 * Provides the processing and bundling of JavaScript and CSS files.
 
 * Provides CLI for installing and building media assets for Invenio via
-  integration with NPM.
+  integration with Webpack and NPM.
 
 Further documentation is available on
 https://invenio-assets.readthedocs.io/

docs/api.rst

@@ -1,6 +1,6 @@
 ..
     This file is part of Invenio.
-    Copyright (C) 2015-2018 CERN.
+    Copyright (C) 2015-2020 CERN.
 
     Invenio is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
@@ -11,22 +11,10 @@ API Docs
 .. automodule:: invenio_assets.ext
    :members:
 
-Filters
+Webpack
 -------
 
-.. automodule:: invenio_assets.filters
-   :members:
-
-NPM
----
-
-.. automodule:: invenio_assets.npm
-   :members:
-
-Glob
-----
-
-.. automodule:: invenio_assets.glob
+.. automodule:: invenio_assets.webpack
    :members:
 
 Command Line Interface

docs/conf.py

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015-2018 CERN.
+# Copyright (C) 2015-2020 CERN.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Sphinx configuration."""
 
-from __future__ import print_function
-
 import os
 
 import sphinx.environment
@@ -317,9 +315,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'https://docs.python.org/': None,
-    # FIXME HTTPS certificate is invalid
-    'flask': ('http://flask.pocoo.org/docs/latest/', None),
-    'flask_assets': ('https://flask-assets.readthedocs.io/en/latest/', None),
+    'flask': ('https://flask.palletsprojects.com/en/1.1.x/', None),
     'flask_collect': ('https://flask-collect.readthedocs.io/en/latest/', None),
     'flask_webpackext': ('https://flask-webpackext.readthedocs.io/en/latest/', None),
 }

docs/configuration.rst

@@ -1,6 +1,6 @@
 ..
     This file is part of Invenio.
-    Copyright (C) 2015-2018 CERN.
+    Copyright (C) 2015-2020 CERN.
 
     Invenio is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
@@ -10,10 +10,6 @@ Configuration
 
 Default values are set for following configuration variables:
 
-* ``REQUIREJS_BASEURL`` -  directory that AMD modules will be loaded from (see
-  `webassets
-  <http://webassets.readthedocs.io/en/latest/builtin_filters.html#requirejs>`_
-  for details). Default: ``app.static_folder``.
 * ``COLLECT_STATIC_ROOT`` - path to folder where static files will be
   collected to (see
   `Flask-Collect <http://flask-collect.readthedocs.io/en/latest/config.html>`_
@@ -27,3 +23,6 @@ Default values are set for following configuration variables:
 Note, normally in a production environment you should change
 ``COLLECT_STORAGE`` to ``flask_collect.storage.file`` in order to copy files
 instead of symlinking them.
+
+For Webpack related configuration please see `Flask-WebpackExt
+<https://flask-webpackext.readthedocs.io/en/latest/configuration.html>`_

docs/upgrade.rst

@@ -1,13 +1,18 @@
 ..
     This file is part of Invenio.
-    Copyright (C) 2015-2018 CERN.
+    Copyright (C) 2015-2020 CERN.
 
     Invenio is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
 
 Upgrade to Webpack
 ==================
 
+.. note::
+
+    Invenio-Assets v1.2.0 removed support for AMD/RequireJS and Flask-Assets
+    build system.
+
 In order to upgrade your module from AMD to Webpack, follow the steps below.
 
 Move files to the ``assets`` folder