Merge branch 'series-4.1'

README.rst

@@ -110,12 +110,12 @@ included. It will move to newer versions automatically. Follow this branch
 if you want to stay up to date in a production environment.
 
 Each version has its own branch named by version number. At the time of
-writing, the latest release is ``4.1.1``, tagged from the ``series-4.1``
+writing, the latest release is ``4.1.2``, tagged from the ``series-4.1``
 branch. Follow this branch for your production installation and
 perform version upgrades manually.
 
 Each bug fix or set of fixes bumps the minor version and each new release is
-tagged, eg. ``4.1.2``. Use tagged releases if you are paranoid about changes to
+tagged, eg. ``4.1.3``. Use tagged releases if you are paranoid about changes to
 the code you have not tested yourself.
 
 To follow development, please see the contributing section below.

docker-ci/Dockerfile-base

@@ -26,7 +26,7 @@ RUN apt-get update && apt-get install \
     libmysqlclient20 \
     && apt-get clean
 
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN apt-get install -y nodejs
 
 RUN mkdir /appenv

docs/changelog.rst

@@ -1,6 +1,12 @@
 Releases
 ========
 
+4.1.2
+-----
+* Allow .jsx files to be included in assets/js/tardis_portal/ and ensure that
+  they won't be linted using the jQuery ESLint configuration
+* Switch back to the official version of the pyoai dependency
+
 4.1.1
 -----
 * Fix Python 3 bug with string encoding in deep download mapper

install-ubuntu-py2-requirements.sh

@@ -7,5 +7,5 @@ apt-get install git libldap2-dev libmagickwand-dev libsasl2-dev \
   python-dev python-pip python-virtualenv virtualenvwrapper \
   zlib1g-dev libfreetype6-dev libjpeg-dev
 
-curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 sudo apt-get install -y nodejs

install-ubuntu-py3-requirements.sh

@@ -7,5 +7,5 @@ apt-get install \
    libssl-dev libxml2-dev libxslt1-dev libmagic-dev curl gnupg \
    python3-dev python3-pip python3-venv zlib1g-dev libfreetype6-dev libjpeg-dev    
 
-curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 sudo apt-get install -y nodejs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytardis",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
@@ -83,7 +83,7 @@
     "react-test-renderer": "^16.10.2"
   },
   "scripts": {
-    "eslint.jquery": "eslint -c .eslintrc assets/js/tardis_portal js_tests/tardis_portal/ tardis/apps/sftp/static/js/sftp/sftp.js tardis/apps/openid_migration/static/js/openid_migration/migrate_accounts.js",
+    "eslint.jquery": "eslint -c .eslintrc --ext .js assets/js/tardis_portal js_tests/tardis_portal/ tardis/apps/sftp/static/js/sftp/sftp.js tardis/apps/openid_migration/static/js/openid_migration/migrate_accounts.js",
     "eslint.angular": "eslint -c .eslintrc.angular assets/js/tardis_portal/facility_view/facility_view.js",
     "eslint.react": "eslint -c .eslintrc.react --ext .js,.jsx assets/js/apps/search/",
     "test-build": "webpack --config test-webpack.config.js --progress --colors --mode production",

requirements-base.txt

@@ -27,7 +27,7 @@ kombu==4.6.5
 lxml==4.4.1
 paramiko==2.6.0
 pillow==6.2.0
-git+https://github.com/mytardis/pyoai.git@v2.5.1-mytardis-py3#egg=pyoai
+pyoai==2.5.0
 pystache==0.5.4
 python-dateutil==2.8.0
 # python-magic

test.sh

@@ -42,7 +42,7 @@ case "$TEST_TYPE" in
 	(( exit_status = exit_status || $? ))
     ;;
     behave)
-        npm install && npm audit && npm run-script build && \
+        npm install && npm audit --production && npm run-script build && \
         npm test && python test.py behave
 	(( exit_status = exit_status || $? ))
     ;;