On Fri, Apr 07, 2023 at 07:44:40AM -0600, Joel Knight wrote:
> Hi ports@,
>
> On Tue, Mar 28, 2023 at 10:03 PM Joel Knight <[email protected]> wrote:
> >
> > Hi.
> >
> > Linked below are two new (and tightly coupled) ports: the AWS CLIv2
> > and the Python bindings for the AWS Common Runtime.
> >
> > Given that AWS releases v1 and v2 of their CLI as independent
> > products, I've elected to create CLIv2 as a new port; the CLIv2 port
> > does not replace sysutils/awscli, the v1 port.
> >
> > Unlike the CLIv1, CLIv2 depends on the AWS CRT. I don't know if the
> > CRT will build on non-amd64 arches. I already know it doesn't build on
> > arm64. For now, I've set ONLY_FOR_ARCHS to amd64 in both ports.
> >
> > I've (presumptively) set myself as MAINTAINER as I'm volunteering to
> > maintain these ports.
>
> Still looking for feedback on these two ports. Even if you aren't able
> to test the port, it would be helpful to have feedback on the contents
> of the tarball.
>
> Attaching the tarball in case that's preferable to downloading it from a link.
Hi.
A few things:
- I think we also need a @conflict marker in sysutils/awscli
- add a comment to explain the reason for setting USE_NOEXECONLY
- if llvm is installed, the wrong ar is used by py-awscrt
-- CMAKE_AR found: /usr/local/bin/llvm-ar
I also think these diffs are needed:
diff -ruN /tmp/devel/py-awscrt/Makefile devel/py-awscrt/Makefile
--- /tmp/devel/py-awscrt/Makefile Tue Mar 28 21:36:29 2023
+++ devel/py-awscrt/Makefile Sat Apr 15 13:21:28 2023
@@ -19,7 +19,10 @@
MODULES = lang/python
MODPY_PI = Yes
-MODPY_SETUPTOOLS = Yes
+MODPY_PYBUILD = setuptools
+
+FLAVORS = python3
+FLAVOR = python3
BUILD_DEPENDS += devel/cmake
diff -ruN /tmp/devel/py-awscrt/pkg/PLIST devel/py-awscrt/pkg/PLIST
--- /tmp/devel/py-awscrt/pkg/PLIST Mon Mar 6 15:35:17 2023
+++ devel/py-awscrt/pkg/PLIST Sat Apr 15 13:25:26 2023
@@ -1,24 +1,39 @@
@so lib/python${MODPY_VERSION}/site-packages/_awscrt.${MODPY_PYC_MAGIC_TAG}so
lib/python${MODPY_VERSION}/site-packages/awscrt/
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/NOTICE
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/awscrt-${MODPY_EGG_VERSION}.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/awscrt/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}checksums.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}checksums.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}mqtt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}mqtt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}mqtt5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}mqtt5.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}s3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}s3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/awscrt/_test.py
lib/python${MODPY_VERSION}/site-packages/awscrt/auth.py
@@ -28,7 +43,9 @@
lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/
lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/awscrt/eventstream/rpc.py
lib/python${MODPY_VERSION}/site-packages/awscrt/exceptions.py
diff -ruN /tmp/sysutils/awscliv2/Makefile sysutils/awscliv2/Makefile
--- /tmp/sysutils/awscliv2/Makefile Wed Mar 29 05:29:52 2023
+++ sysutils/awscliv2/Makefile Sat Apr 15 13:35:37 2023
@@ -24,13 +24,16 @@
MODPY_PYBUILD = flit_core
-RUN_DEPENDS += devel/py-awscrt>=0.16.11
+FLAVORS = python3
+FLAVOR = python3
+
+RUN_DEPENDS += devel/py-awscrt${MODPY_FLAVOR}>=0.16.11
# !!! check pyproject.toml for exact dependency versions
RUN_DEPENDS += devel/py-colorama${MODPY_FLAVOR}>=0.2.5,<0.4.7
RUN_DEPENDS += textproc/py-docutils${MODPY_FLAVOR}>=0.10,<0.20
RUN_DEPENDS += security/py-cryptography${MODPY_FLAVOR}>=3.3.2,<40.0.2
RUN_DEPENDS += textproc/py-ruamel.yaml${MODPY_FLAVOR}>=0.15.0,<=0.17.21
-RUN_DEPENDS += devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.24,<3.0.37v1
+RUN_DEPENDS +=
devel/py-prompt_toolkit${MODPY_FLAVOR}>=3.0.24,<=3.0.38v1
RUN_DEPENDS += sysutils/py-distro${MODPY_FLAVOR}>=1.5.0,<1.9.0
RUN_DEPENDS += devel/py-dateutil${MODPY_FLAVOR}>=2.1,<3.0.0
RUN_DEPENDS += devel/py-jmespath${MODPY_FLAVOR}>=0.7.1,<1.1.0
diff -ruN /tmp/sysutils/awscliv2/patches/patch-pyproject_toml
sysutils/awscliv2/patches/patch-pyproject_toml
--- /tmp/sysutils/awscliv2/patches/patch-pyproject_toml Tue Mar 28 05:20:46 2023
+++ sysutils/awscliv2/patches/patch-pyproject_toml Sat Apr 15 13:35:28 2023
@@ -6,7 +6,7 @@
# we explicitly include ruamel.yaml.clib as a dependency.
"ruamel.yaml.clib>=0.2.0,<=0.2.7",
- "prompt-toolkit>=3.0.24,<3.0.29",
-+ "prompt-toolkit>=3.0.24,<3.0.37",
++ "prompt-toolkit>=3.0.24,<=3.0.38",
"distro>=1.5.0,<1.9.0",
"awscrt>=0.12.4,<0.17.0",
"python-dateutil>=2.1,<3.0.0",
diff -ruN /tmp/sysutils/awscliv2/pkg/DESCR sysutils/awscliv2/pkg/DESCR
--- /tmp/sysutils/awscliv2/pkg/DESCR Sun Feb 19 17:48:15 2023
+++ sysutils/awscliv2/pkg/DESCR Sat Apr 15 13:26:49 2023
@@ -1 +1 @@
-Universal Command Line Interface for Amazon Web Services
+Universal Command Line Interface for Amazon Web Services.
--
Antoine
