bugfix for distro workflow

Author: JarryShaw

.gitignore

@@ -31,6 +31,8 @@ temp
 _build
 Pipfile.lock
 
+build_tmp
+
 # Created by https://www.gitignore.io/api/macos,python,visualstudiocode
 
 ### macOS ###

.vscode/settings.json

@@ -216,6 +216,7 @@
         "pycapfile",
         "pyenv",
         "pypcap",
+        "pyproject",
         "qsfn",
         "qsnn",
         "qsopt",

Makefile

@@ -25,21 +25,41 @@ pipenv: update-pipenv
 # update: update-const update-date
 update: update-const
 
-dist:
-	mkdir -p dist sdist eggs wheels
-	find dist -iname '*.egg' -exec mv {} eggs \;
-	find dist -iname '*.whl' -exec mv {} wheels \;
-	find dist -iname '*.tar.gz' -exec mv {} sdist \;
-	rm -rf build dist *.egg-info
-	pipenv run python setup.py sdist
-	pypy3.7 setup.py bdist_egg bdist_wheel --python-tag='pp37'
-	python3.7 setup.py bdist_egg bdist_wheel --python-tag='cp37'
-	python3.8 setup.py bdist_egg bdist_wheel --python-tag='cp38'
-	python3.9 setup.py bdist_egg bdist_wheel --python-tag='cp39'
-	python3.10 setup.py bdist_egg bdist_wheel --python-tag='cp310'
-	twine check dist/* || true
-	twine upload dist/* -r pypi --skip-existing
-	twine upload dist/* -r pypitest --skip-existing
+dist-update:
+	~/.pyenv/versions/pypy3.7-*/bin/python3.7 -m pip install -U pip setuptools wheel
+	~/.pyenv/versions/pypy3.8-*/bin/python3.8 -m pip install -U pip setuptools wheel
+	~/.pyenv/versions/pypy3.9-*/bin/python3.9 -m pip install -U pip setuptools wheel
+	~/.pyenv/versions/3.7.*/bin/python3.7 -m pip install -U pip setuptools wheel
+	~/.pyenv/versions/3.8.*/bin/python3.8 -m pip install -U pip setuptools wheel
+	python3.9 -m pip install -U pip setuptools wheel
+	python3.10 -m pip install -U pip setuptools wheel
+	python3.11 -m pip install -U pip setuptools wheel
+
+dist-build:
+	rm -rf build_tmp
+	mkdir build_tmp
+	cp -r pcapkit LICENSE MANIFEST.in pyproject.toml README.rst setup.cfg setup.py build_tmp
+	cd build_tmp && mkdir -p dist sdist eggs wheels
+	cd build_tmp && python3.11 setup.py bdist_egg bdist_wheel --python-tag='cp311'
+	cd build_tmp && python3.10 setup.py bdist_egg bdist_wheel --python-tag='cp310'
+	cd build_tmp && python3.9 setup.py bdist_egg bdist_wheel --python-tag='cp39'
+	cd build_tmp && ~/.pyenv/versions/pypy3.9-*/bin/python3.9 setup.py bdist_egg bdist_wheel --python-tag='pp39'
+	cd build_tmp && pipenv run walrus --no-archive pcapkit
+	cd build_tmp && ~/.pyenv/versions/3.8.*/bin/python3.8 setup.py bdist_egg bdist_wheel --python-tag='cp38'
+	cd build_tmp && ~/.pyenv/versions/pypy3.8-*/bin/python3.8 setup.py bdist_egg bdist_wheel --python-tag='pp38'
+	cd build_tmp && ~/.pyenv/versions/3.7.*/bin/python3.7 setup.py bdist_egg bdist_wheel --python-tag='cp37'
+	cd build_tmp && ~/.pyenv/versions/pypy3.7-*/bin/python3.7 setup.py bdist_egg bdist_wheel --python-tag='pp37'
+	cd build_tmp && python3.11 setup.py sdist
+
+dist-upload:
+	twine check build_tmp/dist/*
+	twine upload build_tmp/dist/* -r pypi --skip-existing
+	# twine upload build_tmp/dist/* -r pypitest --skip-existing
+	find build_tmp/dist -name "*.egg" -exec mv {} eggs \;
+	find build_tmp/dist -name "*.whl" -exec mv {} wheels \;
+	find build_tmp/dist -name "*.tar.gz" -exec mv {} sdist \;
+
+dist: dist-update dist-build dist-upload
 
 docs:
 	PCAPKIT_SPHINX=1 pipenv run $(MAKE) -C doc/sphinx html
@@ -139,7 +159,7 @@ dist-pypi-old: dist-f2format
 
 # upload PyPI distribution
 .ONESHELL:
-dist-upload:
+dist-upload-old:
 	set -ex
 	cd $(DIR)
 	twine check dist/*

setup.py

@@ -165,17 +165,43 @@
     },
     setup_requires=[
         # version compatibility
-        #'bpc-f2format; python_version < "3.6"',
         'f2format; python_version < "3.6"',
-        #'bpc-walrus; python_version < "3.8"',
-        'python-walrus==0.1.5rc1; python_version < "3.8"',
+        'bpc-walrus; python_version < "3.8"',
         'pathlib2>=2.3.2; python_version == "3.4"',
     ]
 )
 
+
+def refactor() -> 'None':
+    """Refactor code."""
+    if version_info < (3, 6):
+        try:
+            subprocess.check_call(  # nosec
+                [sys.executable, '-m', 'f2format', '--no-archive', 'pcapkit']
+            )
+        except subprocess.CalledProcessError as error:
+            print('Failed to perform assignment expression backport compiling.'
+                  'Please consider manually install `bpc-f2format` and try again.', file=sys.stderr)
+            sys.exit(error.returncode)
+
+    if version_info < (3, 8):
+        try:
+            subprocess.check_call(  # nosec
+                [sys.executable, '-m', 'walrus', '--no-archive', 'pcapkit']
+            )
+        except subprocess.CalledProcessError as error:
+            print('Failed to perform assignment expression backport compiling.'
+                  'Please consider manually install `bpc-walrus` and try again.', file=sys.stderr)
+            sys.exit(error.returncode)
+
+
 try:
     from setuptools import setup
-    from setuptools.command.build_py import build_py
+    from setuptools.command.bdist_egg import bdist_egg as _bdist_egg
+    from setuptools.command.build_py import build_py as _build_py
+    from setuptools.command.develop import develop as _develop
+    from setuptools.command.install import install as _install
+    from setuptools.command.sdist import sdist as _sdist
 
     version_info = sys.version_info[:2]
 
@@ -191,38 +217,99 @@
         python_requires='>=3.6',
         zip_safe=True,  # type: ignore
     ))
+
+
+    class bdist_egg(_bdist_egg):
+        """Add on-distribution backport code conversion."""
+
+        def run(self) -> 'None':
+            """Run command."""
+            refactor()
+            _bdist_egg.run(self)
+
+
+    class develop(_develop):
+        """Add on-develop backport code conversion."""
+
+        def run(self) -> 'None':
+            """Run command."""
+            refactor()
+            _develop.run(self)
+
+
+    cmdclass = {
+        'bdist_egg': bdist_egg,
+        'develop': develop,
+    }
+
 except ImportError:
     from distutils.core import setup  # pylint: disable=deprecated-module
-    from distutils.command.build_py import build_py  # pylint: disable=deprecated-module
+    from distutils.command.bdist import bdist as _bdist  # pylint: disable=deprecated-module
+    from distutils.command.build_py import build_py as _build_py  # pylint: disable=deprecated-module
+    from distutils.command.install import install as _install  # pylint: disable=deprecated-module
+    from distutils.command.sdist import sdist as _sdist  # pylint: disable=deprecated-module
+
+
+    class bdist(_bdist):
+        """Add on-distribution backport code conversion."""
+
+        def run(self) -> 'None':
+            """Run command."""
+            refactor()
+            _bdist.run(self)
+
+
+    cmdclass = {
+        'bdist': bdist,
+    }
 
 
-class build(build_py):
+try:
+    from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
+
+
+    class bdist_wheel(_bdist_wheel):
+        """Add on-wheel backport code conversion."""
+
+        def run(self) -> 'None':
+            """Run command."""
+            refactor()
+            _bdist_wheel.run(self)
+
+
+    cmdclass['bdist_wheel'] = bdist_wheel
+except ImportError:
+    pass
+
+
+class build_py(_build_py):
     """Add on-build backport code conversion."""
 
     def run(self) -> 'None':
-        if version_info < (3, 6):
-            try:
-                subprocess.check_call(  # nosec
-                    [sys.executable, '-m', 'f2format', '--no-archive', 'pcapkit']
-                )
-            except subprocess.CalledProcessError as error:
-                print('Failed to perform assignment expression backport compiling.'
-                      'Please consider manually install `bpc-f2format` and try again.', file=sys.stderr)
-                sys.exit(error.returncode)
-
-        if version_info < (3, 8):
-            try:
-                subprocess.check_call(  # nosec
-                    [sys.executable, '-m', 'walrus', '--no-archive', 'pcapkit']
-                )
-            except subprocess.CalledProcessError as error:
-                print('Failed to perform assignment expression backport compiling.'
-                      'Please consider manually install `bpc-walrus` and try again.', file=sys.stderr)
-                sys.exit(error.returncode)
-        build_py.run(self)
+        refactor()
+        _build_py.run(self)
+
+
+class install(_install):
+    """Add on-install backport code conversion."""
+
+    def run(self) -> 'None':
+        refactor()
+        _install.run(self)
+
+
+class sdist(_sdist):
+    """Add on-distribution backport code conversion."""
+
+    def run(self) -> 'None':
+        refactor()
+        _sdist.run(self)
 
 
 # set-up script for pip distribution
 setup(cmdclass={
-    'build_py': build,
+    'build_py': build_py,
+    'install': install,
+    'sdist': sdist,
+    **cmdclass,
 }, **attrs)