Merge pull request #114 from swimlane/6_1_1

6.1.1

.github/workflows/constraints.txt

@@ -0,0 +1,5 @@
+pip==22.1.2
+nox==2022.1.7
+nox-poetry==1.0.0
+poetry==1.1.13
+virtualenv==20.14.1

.github/workflows/quality.yml

@@ -1,56 +1,70 @@
-name: Push
+name: Quality Check
 on: [push]
 
 jobs:
-  test:
+  code-quality:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8"]
-        poetry-version: [1.1.13]
+        python-version: ["3.7"]
+        poetry-version: ["1.2.0b2"]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip
+        run: |
+          pip install --constraint=.github/workflows/constraints.txt pip
+          pip --version
       - name: Run image
         uses: abatilo/[email protected]
         with:
           poetry-version: ${{ matrix.poetry-version }}
       - name: Install dependencies
-        run: poetry install
-      - name: Run tests
-        run: poetry run coverage run -m pytest && poetry run coverage report
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
-  code-quality:
+        run: |
+          poetry run pip install --upgrade pip
+          poetry install
+      - name: Run black
+        run: poetry run black ./pyattck --line-length 120
+      - name: Run isort
+        run: poetry run isort ./pyattck --check-only --profile "black"
+      - name: Run flake8
+        run: poetry run flake8 ./pyattck
+      - name: Run bandit
+        run: poetry run bandit ./pyattck
+      - name: Run saftey
+        run: poetry run safety check --ignore=47794
+  test:
+    needs: code-quality
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
-        poetry-version: [1.1.2]
-        os: [ubuntu-latest]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        poetry-version: ["1.2.0b2"]
+        os: [ubuntu-latest,macos-latest,windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip
+        run: |
+          pip install --constraint=.github/workflows/constraints.txt pip
+          pip --version
       - name: Run image
         uses: abatilo/[email protected]
         with:
           poetry-version: ${{ matrix.poetry-version }}
       - name: Install dependencies
-        run: poetry install
-      - name: Run black
-        run: poetry run black ./pyattck --line-length 120
-      - name: Run isort
-        run: poetry run isort ./pyattck --check-only --profile "black"
-      - name: Run flake8
-        run: poetry run flake8 ./pyattck
-      - name: Run bandit
-        run: poetry run bandit ./pyattck
-      - name: Run saftey
-        run: poetry run safety check --ignore=47794
+        run: |
+          poetry run pip install --upgrade pip
+          poetry run pip install --upgrade setuptools
+          poetry install
+      - name: Run tests
+        run: poetry run coverage run -m pytest && poetry run coverage report
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1

pyattck/utils/version.py

@@ -1,2 +1,2 @@
-__version_info__ = (6, 1, 0)
+__version_info__ = (6, 1, 1)
 __version__ = ".".join(map(str, __version_info__))

pyproject.toml

@@ -1,16 +1,19 @@
 [tool.poetry]
 name = "pyattck"
-version = "6.1.0"
+version = "6.1.1"
 description = "A Python package to interact with the Mitre ATT&CK Frameworks"
 authors = ["Swimlane <[email protected]>"]
 license = "MIT"
+readme = "README.md"
+homepage = "https://github.com/swimlane/pyattck"
+repository = "https://github.com/swimlane/pyattck"
 
 [tool.poetry.dependencies]
 python = "^3.7"
 requests = "^2.27.1"
 fire = "^0.4.0"
 attrs = "^21.4.0"
-pyattck-data = "^2.3.0"
+pyattck-data = "^2.4.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.2"
@@ -23,6 +26,7 @@ flake8 = "^4.0.1"
 bandit = "^1.7.4"
 safety = "^1.10.3"
 Sphinx = "<4.4.0"
+importlib-metadata = "<3.4"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

requirements.txt

@@ -2,4 +2,4 @@ requests
 PyYaml>=5.4.1
 fire==0.3.1
 attrs==21.4.0
-pyattck-data>=2.1.1
+pyattck-data>=2.4.0