deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 09:51:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Revert to setuptools 70.3.0

Browse Source
This commit is contained in:
Ross Scroggs
2024-07-17 19:05:54 -07:00
parent 5b6c7a30d7
commit 8e3d562830
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -460,7 +460,7 @@ jobs:
"${PYTHON}" get-pip.py
"${PYTHON}" -m pip install --upgrade pip
"${PYTHON}" -m pip install --upgrade wheel
"${PYTHON}" -m pip install --upgrade setuptools
"${PYTHON}" -m pip install --upgrade setuptools==70.3.0 --force-reinstall
- name: Install pip requirements
run: |

4
src/gam/__init__.py
View File

@@ -36922,9 +36922,9 @@ def _getCalendarEventAttribute(myarg, body, parameters, function):
body.update(jsonData)
clearJSONfields(body, EVENT_JSON_INSERT_CLEAR_FIELDS)
elif function == 'import':
if 'id' in jsonData:
jsonData['iCalUID'] = jsonData.pop('id')
body.update(jsonData)
if 'id' in body:
body['iCalUID'] = body.pop('id')
elif function == 'update':
if 'event' in jsonData and 'attendees' in jsonData['event']:
parameters['attendees'].extend(jsonData['event'].pop('attendees'))