Compare commits

..

9 Commits
v6.52 ... v6.53

Author SHA1 Message Date
Jay Lee
27461b067a Update var.py 2023-03-31 09:17:10 -04:00
Jay Lee
017712742b Merge branch 'main' of https://github.com/GAM-team/GAM 2023-03-30 17:37:23 +00:00
Jay Lee
afce21a1bd Add steps to trust GAM client_ID 2023-03-30 17:34:59 +00:00
Jay Lee
030e2e270f Another attempt at fixing cryptography 2023-03-30 10:14:24 -04:00
Jay Lee
c69a86b535 use constraints.txt to prevent any downgrades during pip install 2023-03-28 08:49:03 -04:00
Jay Lee
b64e4cf3dc [no ci] that didn't work, we'll try rolling forward... 2023-03-28 08:43:57 -04:00
Jay Lee
a2e06adbbe pin cryptography to 39.0.2 for time being 2023-03-28 08:21:46 -04:00
Jay Lee
43b3397541 Rebuild for cryptography 2023-03-25 10:00:29 -04:00
Jay Lee
bd0bb1542c AppSheet licenses 2023-03-22 12:54:27 +00:00
3 changed files with 40 additions and 4 deletions

View File

@@ -103,7 +103,7 @@ jobs:
path: | path: |
bin.tar.xz bin.tar.xz
src/cpython src/cpython
key: gam-${{ matrix.jid }}-20230314 key: gam-${{ matrix.jid }}-20230326
- name: Untar Cache archive - name: Untar Cache archive
if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@@ -410,6 +410,7 @@ jobs:
- name: Install pip requirements - name: Install pip requirements
run: | run: |
"${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS}
if [[ "${RUNNER_OS}" == "macOS" ]]; then if [[ "${RUNNER_OS}" == "macOS" ]]; then
"${PYTHON}" -m pip install --upgrade cffi ${PIP_ARGS} "${PYTHON}" -m pip install --upgrade cffi ${PIP_ARGS}
"${PYTHON}" -m pip download --only-binary :all: \ "${PYTHON}" -m pip download --only-binary :all: \
@@ -419,8 +420,9 @@ jobs:
--platform macosx_10_15_universal2 \ --platform macosx_10_15_universal2 \
cryptography cryptography
"${PYTHON}" -m pip install --force-reinstall --no-deps cryptography*.whl "${PYTHON}" -m pip install --force-reinstall --no-deps cryptography*.whl
else
"${PYTHON}" -m pip install --force-reinstall --no-deps --upgrade cryptography
fi fi
"${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS}
"${PYTHON}" -m pip list "${PYTHON}" -m pip list
- name: Install PyInstaller - name: Install PyInstaller

View File

@@ -7465,6 +7465,24 @@ def _createClientSecretsOauth2service(httpObj, projectId, login_hint):
fileutils.write_file(GC_Values[GC_CLIENT_SECRETS_JSON], fileutils.write_file(GC_Values[GC_CLIENT_SECRETS_JSON],
cs_data, cs_data,
continue_on_error=False) continue_on_error=False)
print(f'''
Now it's important to mark the GAM Client ID as trusted by your Workspace instance.
1. Please go to:
https://admin.google.com/ac/owl/list?tab=configuredApps
2. Click on: Add app > OAuth App Name Or Client ID.
3. Enter the following Client ID value:
{client_id}
4. Search for the ID, select the GAM app, check the box and press Select.
5. Keep the default scope or select a preferred scope that includes your GAM admin.
6. Press Continue
7. Select Trusted radio button, Continue and Finish.
''')
input('Press Enter when complete.')
print('That\'s it! Your GAM Project is created and ready to use.') print('That\'s it! Your GAM Project is created and ready to use.')

View File

@@ -8,7 +8,7 @@ import platform
import re import re
GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>' GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
GAM_VERSION = '6.52' GAM_VERSION = '6.53'
GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
GAM_URL = 'https://jaylee.us/gam' GAM_URL = 'https://jaylee.us/gam'
@@ -62,6 +62,21 @@ SKUS = {
'aliases': ['cloudsearch'], 'aliases': ['cloudsearch'],
'displayName': 'Google Cloud Search', 'displayName': 'Google Cloud Search',
}, },
'1010380001': {
'product': '101038',
'aliases': ['appsheetcore'],
'displayName': 'AppSheet Core',
},
'1010380002': {
'product': '101038',
'aliases': ['appsheetstandard', 'appsheetenterprisestandard'],
'displayName': 'AppSheet Enterprise Standard',
},
'1010380003': {
'product': '101038',
'aliases': ['appsheetplus', 'appsheetenterpriseplus'],
'displayName': 'AppSheet Enterprise Plus',
},
'1010310002': { '1010310002': {
'product': '101031', 'product': '101031',
'aliases': ['gsefe', 'e4e', 'gsuiteenterpriseeducation'], 'aliases': ['gsefe', 'e4e', 'gsuiteenterpriseeducation'],
@@ -300,6 +315,7 @@ PRODUCTID_NAME_MAPPINGS = {
'101035': 'Cloud Search', '101035': 'Cloud Search',
'101036': 'Google Meet Global Dialing', '101036': 'Google Meet Global Dialing',
'101037': 'G Suite Workspace for Education', '101037': 'G Suite Workspace for Education',
'101038': 'AppSheet',
'101039': 'Assured Controls', '101039': 'Assured Controls',
'101040': 'Beyond Corp', '101040': 'Beyond Corp',
'Google-Apps': 'Google Workspace', 'Google-Apps': 'Google Workspace',