debugging conda workflow

Author: JarryShaw

.github/workflows/create-release.yml

@@ -102,6 +102,27 @@ jobs:
           ref: v${{ needs.version_check.outputs.PCAPKIT_VERSION }}
           fetch-depth: 0
 
+      - name: Reset Build Number
+        run: |
+          set -x
+
+          echo 0 > conda/build
+
+      - name: Commit Changes
+        run: |
+          set -x
+
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+
+          git add conda/build
+          git commit -m"Reset conda build number"
+
+      - name: Push Changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.PYPCAPKIT }}
+
       - name: Create Tag
         run: |
           set -x
@@ -110,7 +131,7 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git tag "conda-${{ needs.version_check.outputs.PCAPKIT_VERSION }}+0" -m"Conda Build"
 
-      - name: Push Changes
+      - name: Push Tag
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.PYPCAPKIT }}
@@ -219,11 +240,10 @@ jobs:
 
       - name: Setup Conda Distribution
         run: |
-          export PCAPKIT_DEVMODE=1
-          export PCAPKIT_VERBOSE=1
+          set -x
 
-          echo 0 > conda/build
-          python util/conda-dist.py
+          mkdir -p conda/wheels
+          python -m pip download -r conda/requirements.txt -d conda/wheels
 
       - name: Conda environment creation and activation
         uses: conda-incubator/setup-miniconda@v2

.github/workflows/cron-conda.yml

@@ -7,41 +7,11 @@ on:
     branches: [main, ]
 
 jobs:
-  get-version:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-
-      - name: Install and Setup
-        run: |
-          set -x
-
-          python -m pip install -U pip setuptools wheel
-          python -m pip install -e .
-
-      - name: Get Version
-        id: get_version
-        run: |
-          set -x
-
-          echo "PCAPKIT_VERSION=$(python -c 'import pcapkit; print(pcapkit.__version__)')" >> $GITHUB_OUTPUT
-
-    outputs:
-      PCAPKIT_VERSION: ${{ steps.get_version.outputs.PCAPKIT_VERSION }}
-
   conda-update:
     runs-on: ubuntu-latest
-    needs: [ get-version ]
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: v${{ needs.get-version.outputs.PCAPKIT_VERSION }}
           fetch-depth: 0
 
       - uses: actions/setup-python@v4
@@ -164,10 +134,10 @@ jobs:
 
       - name: Setup Conda Distribution
         run: |
-          export PCAPKIT_DEVMODE=1
-          export PCAPKIT_VERBOSE=1
+          set -x
 
-          python util/conda-dist.py
+          mkdir -p conda/wheels
+          python -m pip download -r conda/requirements.txt -d conda/wheels
 
       - name: Conda environment creation and activation
         uses: conda-incubator/setup-miniconda@v2

.github/workflows/cron-vendor.yml

@@ -7,41 +7,10 @@ on:
     branches: [main, ]
 
 jobs:
-  get-version:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-
-      - name: Install and Setup
-        run: |
-          set -x
-
-          python -m pip install -U pip setuptools wheel
-          python -m pip install -e .
-
-      - name: Get Version
-        id: get_version
-        run: |
-          set -x
-
-          echo "PCAPKIT_VERSION=$(python -c 'import pcapkit; print(pcapkit.__version__)')" >> $GITHUB_OUTPUT
-
-    outputs:
-      PCAPKIT_VERSION: ${{ steps.get_version.outputs.PCAPKIT_VERSION }}
-
   vendor-update:
     runs-on: macos-latest
-    needs: [ get-version ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          ref: v${{ needs.get-version.outputs.PCAPKIT_VERSION }}
 
       - uses: actions/setup-python@v4
         with:

.gitignore

@@ -28,6 +28,7 @@ release
 /VERSION
 
 pcapkit/_extern
+conda/wheels/
 
 # Created by https://www.gitignore.io/api/macos,python,visualstudiocode
 

MANIFEST.in

@@ -14,4 +14,5 @@ prune test
 include README.rst
 include LICENSE
 
+include pcapkit/_extern
 exclude pcapkit/protocols/*/NotImplemented

Makefile

@@ -45,6 +45,7 @@ docs-clean:
 isort:
 	pipenv run isort -l100 -ppcapkit --skip-glob '**/__init__.py' pcapkit temp/sort.py
 	pipenv run isort -l100 -ppcapkit pcapkit/{const,vendor}/*/*.py
+	pipenv run isort -l100 -ppcapkit util/*.py
 
 vermin:
 	pipenv run vermin pcapkit --backport argparse --backport enum --backport importlib --backport ipaddress --backport typing --backport typing_extensions --no-parse-comments --eval-annotations -vv pcapkit > temp/vermin.txt

conda/pypcapkit/build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+$PYTHON -m pip install conda/wheels/* --target pcapkit/_extern -vv
+$PYTHON -m pip install . -vv

conda/pypcapkit/meta.yaml

@@ -7,16 +7,17 @@ package:
   version: "{{ version }}"
 
 source:
-  git_url: https://github.com/JarryShaw/PyPCAPKit.git
-  git_rev: "conda-{{ version }}+{{ build_number }}"
-  git_depth: 1 # (Defaults to -1/not shallow)
+  path: ../..
+  #git_url: https://github.com/JarryShaw/PyPCAPKit.git
+  #git_rev: "conda-{{ version }}+{{ build_number }}"
+  #git_depth: 1 # (Defaults to -1/not shallow)
 
 build:
   number: {{ build_number }}
   entry_points:
     - pcapkit-cli = pcapkit.__main__:main
     - pcapkit-vendor = pcapkit.vendor.__main__:main
-  script: "{{ PYTHON }} -m pip install . -vv"
+  #script: "{{ PYTHON }} -m pip install . -vv"
 
 requirements:
   build:

conda/requirements.txt

@@ -1,27 +1,28 @@
 aenum==3.1.12
 appdirs==1.4.4
-
 beautifulsoup4==4.12.2
 certifi==2023.5.7
 chardet==5.1.0
 charset-normalizer==3.1.0
 dictdumper==0.8.4.post2
 dpkt==1.9.8
-emoji==2.4.0
+emoji==2.2.0
 html5lib==1.1
 idna==3.4
 lxml==4.9.2
 packaging==23.1
 pathlib2==2.3.7.post1
 
+
+
 pyshark==0.6
 pysocks==1.7.1
-requests==2.31.0
+requests==2.30.0
 scapy==2.5.0
 six==1.16.0
 soupsieve==2.4.1
 tbtrim==0.3.1
 termcolor==2.3.0
-typing-extensions==4.6.3
+typing-extensions==4.5.0
 urllib3==2.0.2
 webencodings==0.5.1

util/bump_version.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import os
-import pkg_resources
 from typing import TYPE_CHECKING, cast
 
+import pkg_resources
+
 if TYPE_CHECKING:
     from packaging.version import Version
 

util/conda-dist.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import os
-import sys
+
 import pkg_resources
-import subprocess  # nosec B404
 
 req_file = os.path.join('conda', 'requirements.txt')
 
@@ -17,15 +16,3 @@
 with open(req_file, 'w') as file:
     for key, value in sorted(data.items()):
         print(f'{key}=={value}', file=file)
-
-try:
-    import pcapkit
-    path = os.path.join(pcapkit.__path__[0], '_extern')
-except ImportError:
-    path = os.path.join('pcapkit', '_extern')
-os.makedirs(path, exist_ok=True)
-
-subprocess.check_call([  # nosec B603
-    sys.executable, '-m', 'pip', 'install',
-    '--target', path, '-r', req_file,
-])