Merge pull request #45 from CAPESandbox/pyproject

pyproject

Author: doomedraven

.github/actions/python-setup/action.yml

@@ -0,0 +1,31 @@
+name: 'Python setup steps that can be reused'
+description: 'Install dependencies, poetry, requirements'
+inputs:
+  python-version:
+    required: true
+    description: The python version
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install dependencies
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: |
+        sudo apt update && sudo apt-get install -y --no-install-recommends libxml2-dev libxslt-dev python3-dev libgeoip-dev ssdeep libfuzzy-dev zpaq p7zip-full rar unace-nonfree cabextract lzip libjpeg8-dev zlib1g-dev gnupg
+
+    - name: Install poetry
+      shell: bash
+      run: pip install poetry
+
+    - name: Set up Python ${{ inputs.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ inputs.python-version }}
+        cache: 'poetry'
+
+    - name: Install requirements
+      shell: bash
+      run: |
+        poetry install --no-interaction --no-root
+

.github/workflows/pythonpackage.yml

@@ -1,30 +1,30 @@
 name: build
 
+env:
+  COLUMNS: 132
+
 on: [push, pull_request]
 
 jobs:
-  tester:
-    name: Test them all
-    runs-on: ${{ matrix.operating-system }}
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
     strategy:
-      max-parallel: 4
       matrix:
-        operating-system: [ubuntu-latest]
         python-version: ["3.10", "3.11"]
-
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        sudo apt-get install zpaq p7zip-full rar unace-nonfree cabextract lzip libjpeg8-dev zlib1g-dev gnupg
-        python -m pip install --upgrade pip
-        pip install pytest>=3.6 mock "pytest-cov<2.6.0" codecov
-        pip install -e ".[shellcode]"
-    - name: Test with pytest
-      run: |
-        pip install pytest
-        pytest
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - uses: ./.github/actions/python-setup/
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          poetry run pip install "pytest-cov<2.6.0" codecov
+          poetry run pip install -e ".[shellcode,dev,linux]"
+
+      - name: Run unit tests
+        run: poetry run python -m pytest --import-mode=append
+

poetry.lock

@@ -0,0 +1,49 @@
+
+[tool.poetry]
+name = "SFlock2"
+version = "0.3.64"
+description = "Sample staging and detonation utility"
+readme = "README.md"
+license = "GPLv3"
+include = ["sflock/**"]
+keywords = [ "sflock", "unarchive"]
+authors = ["Hatching B.V. <[email protected]>"]
+
+packages = [{ include = "sflock" }]
+
+[tool.poetry.dependencies]
+python = ">=3.8,<4.0"
+click = "*"
+cryptography = ">=2.1"
+olefile = ">=0.43"
+pefile = "*"
+python-magic-bin = {version = ">=0.4.14", markers = "sys_platform == 'win32'" }
+python-magic = {version = ">=0.4.13", markers = "sys_platform == 'linux'" }
+
+unicorn = {version = ">=2.0.0", optional = true }
+yara-python = {version = ">=4.1.0", optional = true }
+
+mock = {version = ">=5.1.0", optional = true }
+pytest = {version = ">=8.2.2", optional = true }
+
+[tool.distutils.bdist_wheel]
+universal = true
+
+[tool.poetry.extras]
+shellcode = ["unicorn", "yara-python"]
+dev = ["mock", "pytest"]
+win32 = ["python-magic-bin"]
+linux = ["python-magic"]
+
+[tool.poetry.scripts]
+sflock = "sflock.main:main"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.setuptools]
+include-package-data = false
+
+[tool.setuptools.packages.find]
+exclude = ["docs*", "tests*"]

pyproject.toml

@@ -5,4 +5,3 @@
 import magic
 from sflock.exception import UnpackException
 from sflock.main import ident, unpack, supported, zipify
-from sflock.__version__ import __version__