Merge branch 'dev/7.0.x' of https://github.com/archesproject/arches i…

…nto stable/7.0.0
archesproject · Sep 1, 2022 · 8c8bbf5 · 8c8bbf5
2 parents 53a31ec + deb60ae
commit 8c8bbf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
@@ -11,7 +11,7 @@ SPARQLWrapper==1.8.5
 django-recaptcha==2.0.6
 edtf==4.0.1
 couchdb==1.2
-django-revproxy @ git+https://github.com/jazzband/django-revproxy@d2234005135dc0771b7c4e0bb0465664ccfa5787
+arches-django-revproxy==0.10.0
 django-cors-headers==3.1.1
 django-oauth-toolkit==1.2.0
 polib==1.1.1

diff --git a/releases/7.0.0.md b/releases/7.0.0.md
@@ -41,6 +41,7 @@ Python:
         pyotp>=2.6.0
         qrcode>=7.3.1
         django-webpack-loader==1.5.0
+        arches-django-revproxy==1.10.0
 
 JavaScript:
     Upgraded:
@@ -85,21 +86,23 @@ JavaScript:
 ### Upgrading Arches
 1. You must be upgraded to at least version 6.1.0 before proceeding.
 
-2. Be sure to backup your database before proceeding.
+2. Remove django-revproxy `pip uninstall django-revproxy`
 
-3. Upgrade to Arches 7.0.0
+3. Be sure to backup your database before proceeding.
+
+4. Upgrade to Arches 7.0.0
     ```
     pip install --upgrade arches
     ```
 
-4. Within your project with your Python 3 virtual environment activated:
+5. Within your project with your Python 3 virtual environment activated:
 
         python manage.py migrate
         python manage.py updateproject
         python manage.py es reindex_database
 
-5. **Important:** If you are maintaining an Arches package, be sure to export your graphs and resource instance data before re-importing or reloading your package.
-6. <a name="elasticsearch"></a> Elasticsearch 8 (ES 8) enables a feature called xpack security by default.  See the elasticsearch 8 documentation for details on the new features and how you can use them to secure your elasticsearch instance. 
+6. **Important:** If you are maintaining an Arches package, be sure to export your graphs and resource instance data before re-importing or reloading your package.
+7. <a name="elasticsearch"></a> Elasticsearch 8 (ES 8) enables a feature called xpack security by default.  See the elasticsearch 8 documentation for details on the new features and how you can use them to secure your elasticsearch instance. 
     - By default, xpack security turns on SSL with a self-signed certificate and will expect requests to come from an ES user.  Elasticsearch users can be created via the elasticsearch-users command. Uncomment and override `ELASTICSEARCH_CONNECTION_OPTIONS` in `settings.py` line as needed (with an appropriate password and certificate settings) in your project settings or settings_local files.  
     - If you choose to turn off xpack security in your ES 8 instance (not recommended) you will need to override the `ELASTICSEARCH_HOSTS` setting and change the scheme to "http".