From 08ac605945eb5fdaf9b144d161caa6d6753cc24a Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 09:16:19 -0700 Subject: [PATCH 1/8] Add draft release notes, re #9841 --- releases/7.4.1.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 releases/7.4.1.md diff --git a/releases/7.4.1.md b/releases/7.4.1.md new file mode 100644 index 00000000000..1ab915b394e --- /dev/null +++ b/releases/7.4.1.md @@ -0,0 +1,88 @@ +Arches 7.4.1 release notes +------------------------ + +### Bug Fixes and Enhancements +- Updated Django to latest patch release #9731 +- Updated several JS dependencies to latest patch releases, #9782, #9814, #9527 +- Ensure tiles are properly filtered by user in resource JSON, #9780 +- Fix display of IIIF widget in reports, #8419 +- Fix for download_ready_email_notification template if link isn't available #9680 +- Prevent rich text widget language options crowding #9678 +- Fixes null check errors in the resource instance select widget #9685 +- Fixes for transaction reversal for non-superusers #9699 +- Adds template loading to package load process #9695 +- Fixes celery warning translation for search #9520 +- Replaces count method in favor of exists #9703 +- Fix zipfile upload to bulk data manager from Windows #9693 +- Handle for blank lines in branch excel #9750 +- Json-Ld fix : Omit Edge from Null Domain #9561 +- Fix for graphs with forward slash ("/") in name when using create_package #9795 +- Fix for allowing double quotation marks in i18n inputs (dev/7.4.x) #9794 +- Fix logic to use search url in bulk editor, #9806 +- Add branch excel import support for unzipped xlsx file, #8469 +- Fixes 'missing nodegroup' error when selecting a node in graph tree #9803 +- Fixes issue with creating multiple concepts from a list using cli csv loader #9818 +- Add upper bound on urllib3 (<2) #9826 +- Allow url to be imported from csv without being a json property #9523 + +### Dependency changes: +``` +Javascript: + Upgraded: + @mapbox/geojson-extent: 0.3.2 > ~1.0.1 + jquery: 3.6.1 > ^3.6.1 + jquery-migrate: 3.4.0 > ~3.4.1, + moment-timezone: 0.5.34 > ~0.5.43 + requirejs-text: 2.0.12 > ~2.0.16 + underscore: 1.13.4 > ~1.13.6 + eonasdan-bootstrap-datetimepicker: 4.17.44 > ~4.17.49 + +Python: + Upgraded: + Django 3.2.18 > 3.2.20 +``` + +### Upgrading Arches + +1. Upgrade to version 7.4.0 before proceeding. If upgrading from an earlier version, refer to the upgrade process in the [Version 7.4.0 release notes](https://github.com/archesproject/arches/blob/dev/7.4.x/releases/7.4.0.md) + +2. Be sure to backup your database before proceeding. + +3. Upgrade to Arches 7.4.1 + ``` + pip uninstall psycopg2-binary + pip install --upgrade arches==7.4.1 + ``` + +4. Update the JavaScript dependencies and devDependencies: + In the project's `package.json` file change arches from `stable/7.4.0` to `stable/7.4.1`: + ``` + "dependencies": { + "arches": "archesproject/arches#stable/7.4.1", + }, + "devDependencies": { + "arches-dev-dependencies": "archesproject/arches-dev-dependencies#stable/7.4.1" + } + ``` + +5. Start your application server in a separate terminal if it's not already running. Your webpack build will not complete without your application server running. + +6. In the same terminal window where you ran `yarn` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory. + - If running your project in development: + - `yarn start` will build the frontend of the application and then start a webpack development server + - `yarn build_development` will build a development bundle for the frontend assests of the application -- this should complete in less than 2 minutes + - If running your project in production: + - `yarn build_production` This builds a production bundle. **takes up to 2hrs depending on resources** + - Alternatively you can `cd ..` up a directory and run `python manage.py build_production`. This will create a production bundle of frontend assessts and also call `collectstatic`. + + +6. If you are running Arches on Apache, be sure to run: + + ``` + collectstatic + ``` + and restart your server: + ``` + sudo service apache2 reload + ``` + From 1440b7c5024ebab60e9df085eb1e35b6ac381f6a Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 10:33:17 -0700 Subject: [PATCH 2/8] Update release notes, re #9841 --- releases/7.4.1.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/releases/7.4.1.md b/releases/7.4.1.md index 1ab915b394e..2d2fd2e0ce6 100644 --- a/releases/7.4.1.md +++ b/releases/7.4.1.md @@ -24,6 +24,8 @@ Arches 7.4.1 release notes - Fixes issue with creating multiple concepts from a list using cli csv loader #9818 - Add upper bound on urllib3 (<2) #9826 - Allow url to be imported from csv without being a json property #9523 +- Ensure pytz and tzdata are at version compatible with Celery re #9797 +- Fix the preview in the string bulk editor #9837 ### Dependency changes: ``` From e5dd3359a6f9f58065f63fff92b0724c59e3dcea Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 10:46:33 -0700 Subject: [PATCH 3/8] Update arches version to 7.4.1 beta, re #9841 --- arches/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arches/__init__.py b/arches/__init__.py index d48b6c2155f..6f5b130fdf3 100644 --- a/arches/__init__.py +++ b/arches/__init__.py @@ -10,7 +10,7 @@ except Exception as e: pass -VERSION = (7, 4, 0, "beta", 0) # VERSION[3] options = "alpha", "beta", "rc", or "final" +VERSION = (7, 4, 1, "beta", 0) # VERSION[3] options = "alpha", "beta", "rc", or "final" __version__ = get_version(VERSION) From 91a79dad44612d2aabe55291fb36dca3d40188fc Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 10:47:46 -0700 Subject: [PATCH 4/8] Update readme with 7.4.1 link #9841 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a5095132f7..a0ce7e2a52d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Issue reports are encouraged! [Please read this article](http://polite.technolog * [Report a Bug](https://github.com/archesproject/arches/issues/new?template=bug.md) * [File a Feature Ticket](https://github.com/archesproject/arches/issues/new?template=feature.md) -[Version 7.4.0 release notes](https://github.com/archesproject/arches/blob/dev/7.4.x/releases/7.4.0.md) +[Version 7.4.1 release notes](https://github.com/archesproject/arches/blob/dev/7.4.x/releases/7.4.1.md) #### Quick Install From d1d4a29b916cf1b6c0fe6b48fbee685b19350ff2 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 16:30:50 -0700 Subject: [PATCH 5/8] Updates version number in package.json --- package.json | 2 +- releases/7.4.1.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f35f52d0b7..4791d4e1d1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arches", - "version": "7.4.0", + "version": "7.4.1", "scripts": { "build_production": "./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max_old_space_size=8192 NODE_ENV=production ./arches/app/media/node_modules/.bin/webpack --config arches/webpack/webpack.config.prod.js", "build_development": "./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max_old_space_size=8192 ./arches/app/media/node_modules/.bin/webpack --config arches/webpack/webpack.config.dev.js", diff --git a/releases/7.4.1.md b/releases/7.4.1.md index 2d2fd2e0ce6..85eb88f7bf5 100644 --- a/releases/7.4.1.md +++ b/releases/7.4.1.md @@ -26,6 +26,7 @@ Arches 7.4.1 release notes - Allow url to be imported from csv without being a json property #9523 - Ensure pytz and tzdata are at version compatible with Celery re #9797 - Fix the preview in the string bulk editor #9837 +- Filter branches from branch excel templates, #9812 ### Dependency changes: ``` From a9d4c0e0ac8c1ef0debea4be60a07ac62de63414 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 16:50:11 -0700 Subject: [PATCH 6/8] Remove step to backup db and remove psycopg2-binary, re #9841 --- releases/7.4.1.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/releases/7.4.1.md b/releases/7.4.1.md index 85eb88f7bf5..0d1a2620434 100644 --- a/releases/7.4.1.md +++ b/releases/7.4.1.md @@ -49,15 +49,12 @@ Python: 1. Upgrade to version 7.4.0 before proceeding. If upgrading from an earlier version, refer to the upgrade process in the [Version 7.4.0 release notes](https://github.com/archesproject/arches/blob/dev/7.4.x/releases/7.4.0.md) -2. Be sure to backup your database before proceeding. - -3. Upgrade to Arches 7.4.1 +2. Upgrade to Arches 7.4.1 ``` - pip uninstall psycopg2-binary pip install --upgrade arches==7.4.1 ``` -4. Update the JavaScript dependencies and devDependencies: +3. Update the JavaScript dependencies and devDependencies: In the project's `package.json` file change arches from `stable/7.4.0` to `stable/7.4.1`: ``` "dependencies": { @@ -68,9 +65,9 @@ Python: } ``` -5. Start your application server in a separate terminal if it's not already running. Your webpack build will not complete without your application server running. +4. Start your application server in a separate terminal if it's not already running. Your webpack build will not complete without your application server running. -6. In the same terminal window where you ran `yarn` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory. +5. In the same terminal window where you ran `yarn` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory. - If running your project in development: - `yarn start` will build the frontend of the application and then start a webpack development server - `yarn build_development` will build a development bundle for the frontend assests of the application -- this should complete in less than 2 minutes From ed27a914bde34217bd11b29a3b1db4e302da3708 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 16:55:23 -0700 Subject: [PATCH 7/8] Updated dependency list. re #9841 --- releases/7.4.1.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/releases/7.4.1.md b/releases/7.4.1.md index 0d1a2620434..0f0916682e2 100644 --- a/releases/7.4.1.md +++ b/releases/7.4.1.md @@ -43,6 +43,9 @@ Javascript: Python: Upgraded: Django 3.2.18 > 3.2.20 + Added: + tzdata 2023.3 + pytz 2023.3 ``` ### Upgrading Arches From 60bc79abb10367eeae4a3f738638b5e8a52e3e77 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 27 Jul 2023 17:03:01 -0700 Subject: [PATCH 8/8] Update upgrade instructions to run yarn install, re #9841 --- releases/7.4.1.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/releases/7.4.1.md b/releases/7.4.1.md index 0f0916682e2..fa63f4529ad 100644 --- a/releases/7.4.1.md +++ b/releases/7.4.1.md @@ -67,10 +67,14 @@ Python: "arches-dev-dependencies": "archesproject/arches-dev-dependencies#stable/7.4.1" } ``` + In your terminal navigate to the directory with your project's package.json file. Then run: + + yarn install + 4. Start your application server in a separate terminal if it's not already running. Your webpack build will not complete without your application server running. -5. In the same terminal window where you ran `yarn` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory. +5. In the same terminal window where you ran `yarn install` ( on the same level as `package.json` ), run `yarn start` or `yarn build_development`. This will generate your `media/build` directory. - If running your project in development: - `yarn start` will build the frontend of the application and then start a webpack development server - `yarn build_development` will build a development bundle for the frontend assests of the application -- this should complete in less than 2 minutes