diff --git a/.github/workflows/testing_initiative.yml b/.github/workflows/testing_initiative.yml index f274866e..a5f20006 100644 --- a/.github/workflows/testing_initiative.yml +++ b/.github/workflows/testing_initiative.yml @@ -4,6 +4,7 @@ name: Testing Initiative on: + workflow_dispatch: push: branches: [ master ] paths-ignore: @@ -32,23 +33,17 @@ jobs: strategy: fail-fast: false matrix: - os: - - ubuntu-20.04 - - macos-latest - - windows-latest - python-version: [2.7, 3.6, 3.7, 3.8, 3.9, "3.10", 3.11] + os: [ubuntu-20.04, macos-13, windows-latest] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] no-coverage: [0] include: - os: ubuntu-20.04 - python-version: pypy-2.7 - no-coverage: 1 - - os: ubuntu-20.04 - python-version: pypy-3.6 + python-version: pypy-3.10 no-coverage: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python Env - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Display Python version @@ -58,7 +53,7 @@ jobs: make init - name: Run Tests env: - NOCOV: ${{ matrix.no-coverage }} + NOCOV: ${{ matrix.no-coverage }} run: | make test - name: Upload to Coveralls @@ -91,12 +86,12 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 - python-version: [3.6] + - ubuntu-latest + python-version: ["3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python Env - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Display Python version diff --git a/Makefile b/Makefile index 8222759b..486310fb 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ init: pip install -r dev_requirements.txt init_docs: - pip install sphinx==1.8.5 sphinx_rtd_theme + pip install sphinx==8.0.2 sphinx-rtd-theme COVOPTS = --cov-config .coveragerc --cov=steam diff --git a/dev_requirements.txt b/dev_requirements.txt index dcdcad2d..a5b94e85 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,14 +1,9 @@ -r requirements.txt -vcrpy==2.0.1; python_version <= '3.6' -vcrpy==4.3.0; python_version > '3.6' +vcrpy==4.3.0 PyYAML>=5.4 mock==1.3.0 - -coverage>=5.0; python_version == '2.7' or python_version >= '3.5' -pytest-cov>=2.7.0; python_version == '2.7' or python_version >= '3.5' - -# coveralls 2.0 has removed support for Python 2.7 and 3.4 -git+https://github.com/andy-maier/coveralls-python.git@andy/add-py27#egg=coveralls; python_version == '2.7' -coveralls>=2.1.2; python_version >= '3.5' +coverage>=5.0 +pytest-cov>=2.7.0 +coveralls>=2.1.2 diff --git a/requirements.txt b/requirements.txt index 0c05a09c..8a00aa95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,8 @@ -six>=1.10.0 pycryptodomex>=3.7.0 requests>=2.9.1 urllib3<2 vdf @ git+https://github.com/solsticegamestudios/vdf gevent>=1.3.0 -protobuf~=3.0; python_version >= '3' -protobuf<3.18.0; python_version < '3' +protobuf~=3.0 gevent-eventemitter~=2.1 cachetools>=3.0.0 -enum34==1.1.2; python_version < '3.4' -win-inet-pton; python_version == '2.7' and sys_platform == 'win32'