2.0.12 (#417)

Pull request
============

Description
-----------

Fixed error with urllib3, added Python 3.12 to testing and modules
updates

How Has This Been Tested
------------------------

GitHub Actions with pytest

Types of changes
----------------

- [x] Bug fix (#416)
- [x] Added Python 3.12 support, removed Python 3.7
- [x] Dependencies updated
- [x] Vulnerabilities fixes

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: VadVergasov

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ jobs:
         language: ["python"]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:

.github/workflows/codestyle.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Check code style
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: RojerGS/python-black-check@master
         with:
           line-length: "88"

.github/workflows/publish.yml

@@ -16,24 +16,35 @@ jobs:
   test:
     environment:
       name: Testing
-    runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            path: ~/.cache/pip
+          - os: macos-latest
+            path: ~/Library/Caches/pip
+          - os: windows-latest
+            path: ~\AppData\Local\pip\Cache
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+          path: ${{ matrix.path }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ matrix.python-version }}
+      - name: Update pip, wheel and setuptools
+        run: |
+          python -m pip install --upgrade pip wheel setuptools
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip wheel
           pip install -r requirements.txt
           pip install .
       - name: Test with pytest
@@ -45,16 +56,16 @@ jobs:
     name: Build and publish Python 🐍 distributions 📦 to PyPI
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.12"
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ matrix.python-version }}
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install requirements
@@ -65,7 +76,7 @@ jobs:
         run: |
           python setup.py sdist
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/[email protected].1
+        uses: pypa/[email protected].2
         with:
           password: ${{ secrets.pypi_password }}
   release:
@@ -75,7 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create Release
         id: create_release
         uses: actions/[email protected]

.github/workflows/wiki.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Install Python 3.8
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Install Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
       - name: Install dependencies
         run: >-
           pip install pydoc-markdown mkdocs

codeforces_api/__init__.py

@@ -14,6 +14,7 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+
 __all__ = ["CodeforcesApi", "CodeforcesApiRequestMaker", "CodeforcesParser"]
 from codeforces_api.api_request_maker import CodeforcesApiRequestMaker
 from codeforces_api.api_requests import CodeforcesApi

codeforces_api/api_request_maker.py

@@ -14,13 +14,14 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+
 import collections
 import hashlib
 import json
 import random
 import time
 
-import requests
+import urllib
 
 
 class CodeforcesApiRequestMaker:
@@ -68,7 +69,7 @@ def generate_request(self, method_name, **fields):
             fields["time"] = str(int(current_time))
             api_signature = str(self._rand) + "/" + method_name + "?"
             fields = collections.OrderedDict(sorted(fields.items()))
-            api_signature += requests.urllib3.request.urlencode(fields, safe=";")
+            api_signature += urllib.parse.urlencode(fields, safe=";")
             api_signature += "#" + str(self._secret)
             hashed_signature = hashlib.sha512(api_signature.encode("utf-8"))
             fields["apiSig"] = str(self._rand) + str(hashed_signature.hexdigest())

codeforces_api/api_requests.py

@@ -14,6 +14,7 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+
 import requests
 
 from codeforces_api.api_request_maker import CodeforcesApiRequestMaker

codeforces_api/parse_methods.py

@@ -14,6 +14,7 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+
 import requests
 from lxml import html
 
@@ -43,7 +44,12 @@ def get_solution(self, contest_id, submit_id):
             "https://codeforces.com/contest/"
             + str(contest_id)
             + "/submission/"
-            + str(submit_id)
+            + str(submit_id),
+            cookies={
+                "RCPC": "333e1cab3b9ab19c225e45305669bef8",
+                "expires": "Thu, 31-Dec-37 23:55:55 GMT",
+                "path": "/",
+            },
         )
         if int(solutionPage.status_code) != 200:
             raise Exception("Returned not OK code " + str(solutionPage))

codeforces_api/types.py

@@ -15,6 +15,7 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Source of inspiration: https://github.com/eternnoir/pyTelegramBotAPI/blob/master/telebot/types.py
 """
+
 import json
 
 

codeforces_api/version.py

@@ -1 +1 @@
-__version__ = "2.0.11"
+__version__ = "2.0.12"

requirements.txt

@@ -1,52 +1,54 @@
 appdirs==1.4.4
-astroid==2.12.9
+astroid==2.12.13
 atomicwrites==1.4.1
 attrs==22.1.0
-black==22.8.0
+black==24.4.2
 bleach==5.0.1
-certifi==2022.6.15
+certifi==2024.6.2
 chardet==5.0.0
 charset-normalizer==2.1.1
 click==8.1.3
-colorama==0.4.5
+colorama==0.4.6
 commonmark==0.9.1
-dill==0.3.5.1
+dill==0.3.6
 docutils==0.19
-idna==2.10
-importlib-metadata==4.12.0
+exceptiongroup==1.0.4
+idna==3.4
+importlib-metadata==5.0.0
 iniconfig==1.1.1
 isort==5.10.1
-keyring==23.9.1
-lazy-object-proxy==1.7.1
-lxml==4.9.1
+jaraco.classes==3.4.0
+keyring==23.11.0
+lazy-object-proxy==1.9.0
+lxml==5.2.2
 mccabe==0.6.1
+more-itertools==8.14.0
 mypy-extensions==0.4.3
-packaging==21.3
-pathspec==0.10.1
+packaging==24.1
+pathspec==0.10.2
 pkginfo==1.8.3
-platformdirs==2.5.2
+platformdirs==2.5.4
 pluggy==1.0.0
-py==1.11.0
-Pygments==2.13.0
-pylint==2.15.2
+Pygments==2.15.0
+pylint==2.15.7
 pyparsing==3.0.9
-pytest==7.1.3
+pytest==7.2.0
 pywin32-ctypes==0.2.0
-readme-renderer==37.1
-regex==2022.8.17
-requests==2.28.1
-requests-toolbelt==0.9.1
+readme-renderer==37.3
+regex==2022.10.31
+requests==2.32.3
+requests-toolbelt==0.10.1
 rfc3986==2.0.0
-rich==12.5.1
+rich==12.6.0
 six==1.16.0
 toml==0.10.2
 tomli==2.0.1
-tomlkit==0.11.4
-tqdm==4.64.1
+tomlkit==0.11.6
+tqdm==4.66.4
 twine==4.0.1
-typed-ast==1.5.4
-typing_extensions==4.3.0
-urllib3==1.26.12
+typed_ast==1.5.4
+typing_extensions==4.4.0
+urllib3==2.2.2
 webencodings==0.5.1
 wrapt==1.14.1
-zipp==3.8.1
+zipp==3.11.0

setup.py

@@ -1,6 +1,7 @@
 """
 Install script for CodeforcesApiPy module
 """
+
 import re
 
 from setuptools import setup
@@ -29,5 +30,5 @@
     ],
     keywords="codeforces api python",
     install_requires=["requests", "lxml"],
-    python_requires=">=3.7",
+    python_requires=">=3.8",
 )

tests/conftest.py

@@ -1,32 +1,43 @@
 """
 Config file for tests
 """
+
 import pytest
 
 
 def pytest_addoption(parser):
     parser.addoption(
         "--api_key",
         action="store",
-        default="api_key",
+        default="",
         help="API key for tests",
     )
     parser.addoption(
         "--api_secret",
         action="store",
-        default="api_secret",
+        default="",
         help="API secret for tests",
     )
 
 
 @pytest.fixture
 def api_key(request):
-    return request.config.getoption("--api_key")
+    try:
+        import conf
+
+        return conf.api_key
+    except ModuleNotFoundError:
+        return request.config.getoption("--api_key")
 
 
 @pytest.fixture
 def api_secret(request):
-    return request.config.getoption("--api_secret")
+    try:
+        import conf
+
+        return conf.api_secret
+    except ModuleNotFoundError:
+        return request.config.getoption("--api_secret")
 
 
 @pytest.fixture

tests/test_api.py

@@ -1,6 +1,7 @@
 """
 Testing requests to api.
 """
+
 from codeforces_api.types import BlogEntry, Comment, Party, Problem
 from codeforces_api import CodeforcesApi
 
@@ -75,7 +76,7 @@ def test_contest_list():
     contests = api.contest_list()
     for contest in contests:
         if contest.id == 1496:
-            assert contest.name == "Codeforces Round #706 (Div. 2)"
+            assert contest.name == "Codeforces Round 706 (Div. 2)"
             assert contest.contest_type == "CF"
             assert contest.phase == "FINISHED"
             assert not contest.frozen
@@ -99,7 +100,7 @@ def test_contest_rating_changes():
     for change in changes:
         if change.handle == "VadVergasov":
             assert change.contest_id == 1313
-            assert change.contest_name == "Codeforces Round #622 (Div. 2)"
+            assert change.contest_name == "Codeforces Round 622 (Div. 2)"
             assert change.rank == 2303
             assert change.rating_update_time_seconds == 1582455900
             assert change.old_rating == 1330
@@ -111,7 +112,7 @@ def test_contest_standings():
     api = CodeforcesApi()
     standings = api.contest_standings(1313, handles=["VadVergasov"])
     assert standings["contest"].id == 1313
-    assert standings["contest"].name == "Codeforces Round #622 (Div. 2)"
+    assert standings["contest"].name == "Codeforces Round 622 (Div. 2)"
     assert standings["contest"].contest_type == "CF"
     assert standings["contest"].phase == "FINISHED"
     assert not standings["contest"].frozen
@@ -187,7 +188,7 @@ def test_contest_status():
             assert row.author.contest_id == 1313
             assert row.author.room == 10
             assert row.author.start_time_seconds == 1582448700
-            assert row.programming_language == "GNU C++17"
+            assert row.programming_language == "C++17 (GCC 7-32)"
             assert row.testset == "TESTS"
             assert row.passed_test_count == 5
             assert row.time_consumed_millis == 171