From 5a24fe1b0f8b3920ec9a006b5f0a4b54171691be Mon Sep 17 00:00:00 2001
From: vasokot <vasokot@gmail.com>
Date: Wed, 19 Jun 2024 09:50:56 +0700
Subject: [PATCH 1/2] Upgrade to work at python 3.10+

---
 .github/workflows/build.yml    |  8 ++++----
 .github/workflows/deploy.yml   |  4 ++--
 .github/workflows/pr-tests.yml |  9 ++++-----
 requirements.txt               |  8 ++++----
 setup.py                       | 19 +++++++++----------
 tests/conftest.py              |  6 ++++++
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d0e550..0dbdb7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       py_version:
         description: 'Python version'
-        default: '3.7'
+        default: '3.8'
         required: false
         type: string
 
@@ -13,10 +13,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.py_version }}
       - name: Install dependencies
@@ -27,7 +27,7 @@ jobs:
       - name: Build package
         run: python setup.py sdist bdist_wheel
       - name: Store dist for 2w
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: CrossPM packages
           path: dist/
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6ba4726..bfa0597 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,12 +16,12 @@ jobs:
     needs: build-packages
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: CrossPM packages
           path: dist/
       - name: Publish package
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@release/v4
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
index 526d68f..2a3cbe3 100644
--- a/.github/workflows/pr-tests.yml
+++ b/.github/workflows/pr-tests.yml
@@ -17,17 +17,16 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.6'
-          - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -37,7 +36,7 @@ jobs:
       - name: Run Tests on Python ${{ matrix.python-version }}
         run: |
           python -mflake8 crosspm
-          python -mcoverage run -m py.test tests
+          python -mcoverage run -m pytest tests
   build-artifact:
     uses: ./.github/workflows/build.yml
     needs: tests
diff --git a/requirements.txt b/requirements.txt
index 49c5044..3debc33 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 docopt==0.6.2
 dohq-artifactory>=0.8.3
-Jinja2>=2.11
+Jinja2>=3.1.3
 patool==1.12
 pyunpack==0.2
-PyYAML>=5.2,<6.0
-requests>=2.25.1,<3.0.0
-urllib3<1.25,>=1.21.1
+PyYAML>=6.0
+requests>=2.30.0,<3.0.0
+urllib3>=2.2.0
diff --git a/setup.py b/setup.py
index c3ed4ca..718b55d 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
     long_description=long_description,
     download_url='https://github.com/devopshq/crosspm.git',
     entry_points={'console_scripts': ['crosspm=crosspm.__main__:main']},
-    python_requires='>=3.6.0',
+    python_requires='>=3.8.0',
     classifiers=[
         'Development Status :: {}'.format(develop_status),
         'Environment :: Console',
@@ -50,9 +50,10 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     keywords=[
         'development',
@@ -75,19 +76,17 @@
     tests_require=[
         "pytest>=5.2",
         "pytest-flask>=1.0.0",
-        "PyYAML>=5.2",
+        "PyYAML>=6.0",
     ],
     install_requires=[
-        "requests>=2.25.1,<3.0.0",
-        'urllib3<1.25,>=1.21.1',
+        "requests>=2.30.0,<3.0.0",
+        'urllib3>=2.2.0',
         'docopt==0.6.2',
-        "PyYAML>=5.2,<6.0",
+        "PyYAML>=6.0",
         "dohq-artifactory>=0.8.3",
-        "Jinja2>=2.11",
+        "Jinja2>=3.1.3",
         'patool==1.12',  # need for pyunpack
         'pyunpack==0.2',
-        # 'pyopenssl>=16.2.0',
-        # 'cryptography>=1.7',
     ],
     package_data={
         '': [
diff --git a/tests/conftest.py b/tests/conftest.py
index 78f1f51..a5dfbbf 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,6 +6,12 @@
 from crosspm.helpers.package import Package
 
 
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers", "artifactoryaql: testing artifactoryaql"
+    )
+
+
 @pytest.fixture(scope="function")
 def package():
     params = {'arch': 'x86', 'osname': 'win', 'package': 'package'}

From b02d5ae76c62533d21f7f984c96d40d1efeb66fb Mon Sep 17 00:00:00 2001
From: vasokot <vasokot@gmail.com>
Date: Wed, 19 Jun 2024 10:08:03 +0700
Subject: [PATCH 2/2] Bump version

---
 crosspm/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crosspm/config.py b/crosspm/config.py
index cc08f08..9b07695 100644
--- a/crosspm/config.py
+++ b/crosspm/config.py
@@ -1 +1 @@
-__version__ = '1.0.14'
+__version__ = '1.0.15'