Merge branch 'master' into qt6.5

ucam-department-of-psychiatry · Aug 22, 2023 · 364f85a · 364f85a
2 parents 7ce0220 + 63beaf6
commit 364f85a
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 22 deletions.
diff --git a/docs/source/administrator/_camcops_server_allhelp.txt b/docs/source/administrator/_camcops_server_allhelp.txt
@@ -2,7 +2,7 @@ USAGE: camcops_server [-h] [--allhelp] [--version] [-v] [--no_log]
                       {docs,demo_camcops_config,demo_supervisor_config,demo_apache_config,upgrade_db,dev_upgrade_db,dev_downgrade_db,dev_add_dummy_data,show_db_title,show_db_schema,merge_db,create_db,ddl,reindex,check_index,make_superuser,reset_password,enable_user,export,show_export_queue,crate_dd,cris_dd,serve_cherrypy,serve_gunicorn,serve_pyramid,convert_athena_icd_snomed_to_xml,launch_workers,launch_scheduler,launch_monitor,housekeeping,purge_jobs,dev_cli,list_tasks}
                       ...
 
-CamCOPS server, created by Rudolf Cardinal; version 2.4.16.
+CamCOPS server, created by Rudolf Cardinal; version 2.4.17.
 Use 'camcops_server <COMMAND> --help' for more detail on each command.
 
 OPTIONS:

diff --git a/docs/source/administrator/_demo_apache_config.conf b/docs/source/administrator/_demo_apache_config.conf
@@ -1,5 +1,5 @@
 # Demonstration Apache config file section for CamCOPS.
-# Created by CamCOPS version 2.4.16.
+# Created by CamCOPS version 2.4.17.
 #
 # Under Ubuntu, the Apache config will be somewhere in /etc/apache2/
 # Under CentOS, the Apache config will be somewhere in /etc/httpd/

diff --git a/docs/source/administrator/_demo_camcops_config.ini b/docs/source/administrator/_demo_camcops_config.ini
@@ -1,6 +1,6 @@
 # Demonstration CamCOPS server configuration file.
 #
-# Created by CamCOPS server version 2.4.16.
+# Created by CamCOPS server version 2.4.17.
 # See help at https://camcops.readthedocs.io/.
 #
 # Using defaults for Docker environment: False

diff --git a/docs/source/administrator/_demo_supervisor_config.ini b/docs/source/administrator/_demo_supervisor_config.ini
@@ -1,6 +1,6 @@
 # =============================================================================
 # Demonstration 'supervisor' (supervisord) config file for CamCOPS.
-# Created by CamCOPS version 2.4.16.
+# Created by CamCOPS version 2.4.17.
 # =============================================================================
 # See https://camcops.readthedocs.io/en/latest/administrator/server_configuration.html#start-camcops
 

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -3796,5 +3796,14 @@ Current C++/SQLite client, Python/SQLAlchemy server
   text is greater in height than the images.
 
 
-**Client and server v2.4.17,  IN PROGRESS**
+**Client and server v2.4.17, released 19 Aug 2023**
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Remove odd newlines from CAPS task summary.
+
+- No change in functionality of the client. Client release to Google Play Store
+  only. Target Android version now 33.
+
+
+**Client and server v2.4.18,  IN PROGRESS**
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/developer/releasing.rst b/docs/source/developer/releasing.rst
@@ -169,16 +169,18 @@ Google Play Store release history
 | 2.4.13        | 27 (32-bit ARM);    | 2.4.13              | 2022-08-19         | 23      | 30      |
 |               | 28 (64-bit ARM)     |                     |                    |         |         |
 +---------------+---------------------+---------------------+--------------------+---------+---------+
+| 2.4.14        | N/A, server only    | N/A                 | N/A                | 23      | 30      |
+|               |                     |                     |                    |         |         |
++---------------+---------------------+---------------------+--------------------+---------+---------+
 | 2.4.15        | 29 (32-bit ARM);    | 2.4.15              | 2023-03-27         | 23      | 31      |
 |               | 30 (64-bit ARM)     |                     |                    |         |         |
 +---------------+---------------------+---------------------+--------------------+---------+---------+
 | 2.4.16        | 31 (32-bit ARM);    | 2.4.16              | 2023-06-15         | 23      | 31      |
 |               | 32 (64-bit ARM)     |                     |                    |         |         |
 +---------------+---------------------+---------------------+--------------------+---------+---------+
-
-
-Note: target API of 33 required as of Aug 2023:
-https://developer.android.com/google/play/requirements/target-sdk
+| 2.4.17        | 33 (32-bit ARM);    | 2.4.17              | 2023-08-21         | 23      | 33      |
+|               | 34 (64-bit ARM)     |                     |                    |         |         |
++---------------+---------------------+---------------------+--------------------+---------+---------+
 
 
 iOS client

diff --git a/server/camcops_server/cc_modules/cc_version_string.py b/server/camcops_server/cc_modules/cc_version_string.py
@@ -41,8 +41,8 @@
 # -----------------------------------------------------------------------------
 # When you alter the server, it is normal to change these two:
 
-CAMCOPS_SERVER_VERSION_STRING = "2.4.16"
-CAMCOPS_SERVER_CHANGEDATE = "2023-06-13"
+CAMCOPS_SERVER_VERSION_STRING = "2.4.17"
+CAMCOPS_SERVER_CHANGEDATE = "2023-08-19"
 
 # +++ NOW ALSO UPDATE: +++
 #

diff --git a/server/installer/installer_requirements.txt b/server/installer/installer_requirements.txt
@@ -1,7 +1,7 @@
 # dev only
 flake8
 
-cryptography==41.0.2
+cryptography==41.0.3
 python-on-whales==0.50.0
 prompt-toolkit==3.0.30
 semantic_version==2.10.0

diff --git a/server/setup.py b/server/setup.py
@@ -161,7 +161,7 @@
     "alabaster==0.7.12",  # for sphinx
     "amqp==5.0.6",  # for celery
     "Chameleon==3.8.1",  # for Deform
-    "tornado==6.3.2",  # for celery
+    "tornado==6.3.3",  # for celery
     "webob==1.8.6",  # for pyramid
 ]
 

diff --git a/tablet_qt/android/AndroidManifest.xml b/tablet_qt/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.camcops.camcops" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.16" android:versionCode="32" android:installLocation="auto">
+<manifest package="org.camcops.camcops" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.17" android:versionCode="34" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt.android.bindings.QtApplication" android:label="CamCOPS" android:icon="@drawable/icon" android:allowBackup="false">
         <!-- singleTask is necessary to stop a second, inactive window from opening when the app is launched both from URL and icon -->
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.camcops.camcops.CamcopsActivity" android:label="CamCOPS" android:screenOrientation="unspecified" android:launchMode="singleTask" android:exported="true">
@@ -27,7 +27,7 @@
             <meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape"/>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31"/>
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

diff --git a/tablet_qt/camcops_windows_innosetup.iss b/tablet_qt/camcops_windows_innosetup.iss
@@ -13,7 +13,7 @@
 ; VERSION-DEPENDENT VALUES
 ; =============================================================================
 
-#define CamcopsClientVersion "2.4.16"
+#define CamcopsClientVersion "2.4.17"
 
 ; =============================================================================
 ; VALUES DEPENDING ON THE DEVELOPER'S BUILD ENVIRONMENT

diff --git a/tablet_qt/ios/Info.plist b/tablet_qt/ios/Info.plist
@@ -28,9 +28,9 @@
          if the version has been approved by Apple.
     -->
 	<key>CFBundleShortVersionString</key>
-        <string>2.4.16</string>
+        <string>2.4.17</string>
 	<key>CFBundleVersion</key>
-        <string>2.4.16.1</string>
+        <string>2.4.17.1</string>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>

diff --git a/tablet_qt/version/camcopsversion.cpp b/tablet_qt/version/camcopsversion.cpp
@@ -27,8 +27,8 @@ namespace camcopsversion {  // http://semver.org/
 // ----------------------------------------------------------------------------
 // Increase this when the client is changed:
 
-const Version CAMCOPS_CLIENT_VERSION(2, 4, 16);
-const QDate CAMCOPS_CLIENT_CHANGEDATE(2023, 6, 13);
+const Version CAMCOPS_CLIENT_VERSION(2, 4, 17);
+const QDate CAMCOPS_CLIENT_CHANGEDATE(2023, 8, 19);
 
 // +++ NOW ALSO UPDATE: +++
 //

diff --git a/tools/release_new_version.py b/tools/release_new_version.py
@@ -740,9 +740,8 @@ def release(self) -> None:
             print("Uploading to PyPI...")
             self.run_with_check(["twine", "upload"] + pypi_packages)
 
-            # TODO: It takes some time so change this message:
             print(
-                "A new release should have been created on GitHub with the "
+                "A new release will be created on GitHub with the "
                 ".rpm and .deb files attached. They are also in "
                 f"{SERVER_PACKAGE_DIR}"
             )