From 3590ad966e0dd2cb235724a59d67615e0d4639ef Mon Sep 17 00:00:00 2001 From: Nate Walck Date: Wed, 2 Feb 2022 12:11:20 -0500 Subject: [PATCH 1/5] Update to Python 3.9.10 and update libs --- ...thon_3.9.5.yml => build_python_3.9.10.yml} | 67 ++++++++-------- build_all_python_frameworks.zsh | 1 - build_python_framework_pkgs.zsh | 4 +- requirements_minimal.txt | 8 +- requirements_opinionated.txt | 76 ------------------- requirements_recommended.txt | 65 ++++++++-------- 6 files changed, 74 insertions(+), 147 deletions(-) rename .github/workflows/{build_python_3.9.5.yml => build_python_3.9.10.yml} (72%) delete mode 100644 requirements_opinionated.txt diff --git a/.github/workflows/build_python_3.9.5.yml b/.github/workflows/build_python_3.9.10.yml similarity index 72% rename from .github/workflows/build_python_3.9.5.yml rename to .github/workflows/build_python_3.9.10.yml index ba5aba6..a125b79 100644 --- a/.github/workflows/build_python_3.9.5.yml +++ b/.github/workflows/build_python_3.9.10.yml @@ -3,7 +3,7 @@ name: Build and upload recommended package env: TYPE: "recommended" DEV_ID: "Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)" - PYTHON_VERSION: "3.9.5" + PYTHON_VERSION: "3.9.10" on: pull_request: @@ -46,39 +46,44 @@ jobs: release_name: Python ${{env.PYTHON_VERSION}} (${{env.BUILD_DATE_RELEASE}}) body: | # Notes - Python 3.9.5 Framework + Python 3.9.10 Framework ## Changes - - Upgraded Python to 3.9.5 + - Upgraded Python to 3.9.10 + **Note: Some of these updates have breaking changes. Always test your code before deploying to production!** - Updated the following libraries: - - attrs to 21.2.0 - - black to 21.6b0 - - certifi to 2021.05.30 - - cffi to 1.14.5 - - cfgv to 3.3.0 - - distlib to 0.3.2 - - docklib to 1.3.0 - - flake8-bugbear to 21.4.3 - - flake8 to 3.9.2 - - identify to 2.2.10 - - importlib-metadata to 4.6.1 - - isort to 5.9.2 - - nodeenv to 1.6.0 - - packaging to 21.0 - - pathspec to 0.8.1 - - pre-commit to 2.13.0 - - pycodestyle to 2.7.0 - - pyflakes to 2.3.1 - - PyYAML to 5.4.1 - - regex to 2021.7.6 - - requests to 2.25.1 - - six to 1.16.0 - - tokenize-rt to 4.1.0 - - toml to 0.10.2 - - typed-ast to 1.4.3 - - urllib3 to 1.26.6 - - virtualenv to 20.0.27 - - zipp to 3.5.0 + - attrs to 21.4.0 + - black to 22.1.0 + - certifi to 2021.10.8 + - cffi to 1.15.0 + - cfgv to 3.3.1 + - chardet to 4.0.0 + - click to 8.0.3 + - distlib to 0.3.4 + - filelock to 3.4.2 + - flake8-bugbear to 22.1.11 + - flake8 to 4.0.1 + - identify to 2.4.7 + - idna to 3.3 + - importlib-metadata to 4.10.1 + - isort to 5.10.1 + - packaging to 21.3 + - pathspec to 0.9.0 + - pre-commit to 2.17.0 + - pycodestyle to 2.8.0 + - pycparser to 2.21 + - pyflakes to 2.4.0 + - pyobjc to 7.3 + - pyparsing to 3.0.7 + - PyYAML to 6.0 + - regex to 2022.1.18 + - requests to 2.27.1 + - tokenize-rt to 4.2.0 + - typed-ast to 1.5.2 + - urllib3 to 1.26.8 + - virtualenv to 20.13.0 + - xattr to 0.9.9 + - zipp to 3.7.0 # Flavors of Python At this time, the automated build process will **only** create the Recommended package diff --git a/build_all_python_frameworks.zsh b/build_all_python_frameworks.zsh index f8aa059..53d1e3b 100755 --- a/build_all_python_frameworks.zsh +++ b/build_all_python_frameworks.zsh @@ -11,4 +11,3 @@ SIGNING_IDENTITY="Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)" "$TOOLSDIR/build_python_framework_pkgs.zsh" minimal ${SIGNING_IDENTITY} "$TOOLSDIR/build_python_framework_pkgs.zsh" no_customization ${SIGNING_IDENTITY} "$TOOLSDIR/build_python_framework_pkgs.zsh" recommended ${SIGNING_IDENTITY} -"$TOOLSDIR/build_python_framework_pkgs.zsh" opinionated ${SIGNING_IDENTITY} diff --git a/build_python_framework_pkgs.zsh b/build_python_framework_pkgs.zsh index 3e2a439..b78e509 100755 --- a/build_python_framework_pkgs.zsh +++ b/build_python_framework_pkgs.zsh @@ -26,12 +26,10 @@ if [ -n "$1" ]; then TYPE=$1 elif [[ "$1" == "no_customization" ]]; then TYPE=$1 - elif [[ "$1" == "opinionated" ]]; then - TYPE=$1 elif [[ "$1" == 'recommended' ]]; then TYPE=$1 else - echo "Specified positional argument other than opinionated or recommended. Using minimal workflow" + echo "Specified positional argument other than recommended. Using minimal workflow" TYPE='minimal' fi else diff --git a/requirements_minimal.txt b/requirements_minimal.txt index 51b8211..0ec1832 100644 --- a/requirements_minimal.txt +++ b/requirements_minimal.txt @@ -1,6 +1,6 @@ -cffi==1.14.4 +cffi==1.15.0 --no-binary cffi -pycparser==2.20 -pyobjc==7.0.1 -xattr==0.9.7 +pycparser==2.21 +pyobjc==7.3 +xattr==0.9.9 --no-binary xattr diff --git a/requirements_opinionated.txt b/requirements_opinionated.txt deleted file mode 100644 index 9679f91..0000000 --- a/requirements_opinionated.txt +++ /dev/null @@ -1,76 +0,0 @@ -alabaster==0.7.12 -appdirs==1.4.4 -arrow==0.15.7 -asn1crypto==1.4.0 ---no-binary asn1crypto -aspy.yaml==1.3.0 -atomicwrites==1.4.0 -attrs==19.3.0 -Babel==2.9.1 -black==19.10b0 -boto==2.49.0 -certifi==2020.6.20 -cffi==1.14.4 ---no-binary cffi -cfgv==3.1.0 -chardet==3.0.4 -click==7.1.2 -distlib==0.3.1 -docklib==1.3.0 -docutils==0.16 -entrypoints==0.3 -filelock==3.0.12 -flake8-bugbear==20.1.4 -flake8==3.8.3 -funcsigs==1.0.2 -identify==1.4.21 -idna==2.10 -imagesize==1.2.0 -importlib-metadata==1.7.0 -isort==5.0.6 -Jinja2==2.11.3 -MarkupSafe==1.1.1 -mccabe==0.6.1 -more-itertools==8.4.0 -nodeenv==1.4.0 -packaging==20.4 -pathspec==0.8.0 -pluggy==0.13.1 -pre-commit==2.6.0 -py==1.10.0 -pyasn1==0.4.8 -pycodestyle==2.6.0 -pycparser==2.20 -pyflakes==2.2.0 -Pygments==2.7.4 -pyobjc==7.0.1 -pyparsing==2.4.7 -pytest-docker==0.7.2 -pytest==5.4.3 -python-dateutil==2.8.1 -python-dotenv==0.14.0 -pytz==2020.1 -PyYAML==5.4.1 -regex==2020.6.8 -requests==2.25.1 -rsa==4.7 -six==1.15.0 -slacker==0.14.0 -snowballstemmer==2.0.0 -Sphinx==3.1.2 -sphinxcontrib-applehelp==1.0.2 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==1.0.3 -sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.4 -tokenize-rt==4.0.0 -toml==0.10.1 -typed-ast==1.4.1 ---no-binary typed-ast -urllib3==1.26.5 -virtualenv==20.0.26 -wcwidth==0.2.5 -xattr==0.9.7 ---no-binary xattr -zipp==3.1.0 diff --git a/requirements_recommended.txt b/requirements_recommended.txt index 4978349..44b963c 100644 --- a/requirements_recommended.txt +++ b/requirements_recommended.txt @@ -1,46 +1,47 @@ appdirs==1.4.4 asn1crypto==1.4.0 --no-binary asn1crypto -attrs==21.2.0 -black==21.6b0 -certifi==2021.05.30 -cffi==1.14.5 +attrs==21.4.0 +black==22.1.0 +--no-binary black +certifi==2021.10.8 +cffi==1.15.0 --no-binary cffi -cfgv==3.3.0 -chardet==3.0.4 -click==7.1.2 -distlib==0.3.2 +cfgv==3.3.1 +chardet==4.0.0 +click==8.0.3 +distlib==0.3.4 docklib==1.3.0 entrypoints==0.3 -filelock==3.0.12 -flake8-bugbear==21.4.3 -flake8==3.9.2 -identify==2.2.10 -idna==2.10 -importlib-metadata==4.6.1 -isort==5.9.2 +filelock==3.4.2 +flake8-bugbear==22.1.11 +flake8==4.0.1 +identify==2.4.7 +idna==3.3 +importlib-metadata==4.10.1 +isort==5.10.1 mccabe==0.6.1 nodeenv==1.6.0 -packaging==21.0 -pathspec==0.8.1 -pre-commit==2.13.0 -pycodestyle==2.7.0 -pycparser==2.20 -pyflakes==2.3.1 -pyobjc==7.0.1 -pyparsing==2.4.7 -PyYAML==5.4.1 +packaging==21.3 +pathspec==0.9.0 +pre-commit==2.17.0 +pycodestyle==2.8.0 +pycparser==2.21 +pyflakes==2.4.0 +pyobjc==7.3 +pyparsing==3.0.7 +PyYAML==6.0 --no-binary PyYAML -regex==2021.7.6 +regex==2022.1.18 --no-binary regex -requests==2.25.1 +requests==2.27.1 six==1.16.0 -tokenize-rt==4.1.0 +tokenize-rt==4.2.0 toml==0.10.2 -typed-ast==1.4.3 +typed-ast==1.5.2 --no-binary typed-ast -urllib3==1.26.6 -virtualenv==20.0.27 -xattr==0.9.7 +urllib3==1.26.8 +virtualenv==20.13.0 +xattr==0.9.9 --no-binary xattr -zipp==3.5.0 +zipp==3.7.0 From 2fcd1cf639cffe33e32f2bdeaf585c67d3181f1f Mon Sep 17 00:00:00 2001 From: Nate Walck Date: Wed, 2 Feb 2022 12:55:26 -0500 Subject: [PATCH 2/5] Fix tokenize-rt version as 4.2.0 was yanked --- requirements_recommended.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_recommended.txt b/requirements_recommended.txt index 44b963c..f182262 100644 --- a/requirements_recommended.txt +++ b/requirements_recommended.txt @@ -36,7 +36,7 @@ regex==2022.1.18 --no-binary regex requests==2.27.1 six==1.16.0 -tokenize-rt==4.2.0 +tokenize-rt==4.2.1 toml==0.10.2 typed-ast==1.5.2 --no-binary typed-ast From 57073d5e3437ec9a42bdda9f5c7773a08a976c92 Mon Sep 17 00:00:00 2001 From: Nate Walck Date: Wed, 2 Feb 2022 13:19:57 -0500 Subject: [PATCH 3/5] PyObjC doesn't seem universal anymore, trying to force a build --- requirements_recommended.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements_recommended.txt b/requirements_recommended.txt index f182262..a4dd422 100644 --- a/requirements_recommended.txt +++ b/requirements_recommended.txt @@ -29,6 +29,7 @@ pycodestyle==2.8.0 pycparser==2.21 pyflakes==2.4.0 pyobjc==7.3 +--no-binary pyobjc pyparsing==3.0.7 PyYAML==6.0 --no-binary PyYAML From 2fe11965bbe06504e11745021ea931f7028950cc Mon Sep 17 00:00:00 2001 From: Nate Walck Date: Wed, 2 Feb 2022 13:34:50 -0500 Subject: [PATCH 4/5] Let's upgrade to latest release of PyObjC --- requirements_recommended.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements_recommended.txt b/requirements_recommended.txt index a4dd422..b61bbfe 100644 --- a/requirements_recommended.txt +++ b/requirements_recommended.txt @@ -28,8 +28,7 @@ pre-commit==2.17.0 pycodestyle==2.8.0 pycparser==2.21 pyflakes==2.4.0 -pyobjc==7.3 ---no-binary pyobjc +pyobjc==8.2 pyparsing==3.0.7 PyYAML==6.0 --no-binary PyYAML From 29d67d57ee1f4f9fe30b2b211283ef0fe0ba19da Mon Sep 17 00:00:00 2001 From: Nate Walck Date: Wed, 2 Feb 2022 13:44:04 -0500 Subject: [PATCH 5/5] Update release notes to reflect PyObjC change --- .github/workflows/build_python_3.9.10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_python_3.9.10.yml b/.github/workflows/build_python_3.9.10.yml index a125b79..4c7ed3b 100644 --- a/.github/workflows/build_python_3.9.10.yml +++ b/.github/workflows/build_python_3.9.10.yml @@ -73,7 +73,7 @@ jobs: - pycodestyle to 2.8.0 - pycparser to 2.21 - pyflakes to 2.4.0 - - pyobjc to 7.3 + - pyobjc to 8.2 - pyparsing to 3.0.7 - PyYAML to 6.0 - regex to 2022.1.18