Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade Python requirements #201

Merged
merged 4 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['3.8', '3.11', '3.12']
python-version: ['3.11', '3.12']
TOX_ENV: [coverage, quality, django42]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- run: make ci.test TOX_ENV=${{ matrix.TOX_ENV }}
6 changes: 3 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ web-fragments==2.2.0
# via xblock
webob==1.8.7
# via xblock
xblock==4.0.1
xblock==5.0.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.1.2
pip==24.2
# via -r requirements/pip.in
setuptools==71.0.4
setuptools==72.0.0
# via -r requirements/pip.in
6 changes: 3 additions & 3 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ pluggy==1.5.0
# pytest
pycodestyle==2.12.0
# via -r requirements/quality.in
pylint==3.2.5
pylint==3.2.6
# via -r requirements/quality.in
pytest==8.3.1
pytest==8.3.2
# via
# -r requirements/test.txt
# pytest-django
Expand Down Expand Up @@ -104,7 +104,7 @@ webob==1.8.7
# via
# -r requirements/base.txt
# xblock
xblock==4.0.1
xblock==5.0.0
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
pytest==8.3.1
pytest==8.3.2
# via pytest-django
pytest-django==4.8.0
# via -r requirements/test.in
26 changes: 0 additions & 26 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import re

from setuptools import setup
from setuptools.command.test import test as TestCommand


def package_data(pkg, roots):
Expand Down Expand Up @@ -89,30 +88,6 @@ def is_requirement(line):
return line and line.strip() and not line.startswith(('-r', '#', '-e', 'git+', '-c'))


class Tox(TestCommand):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setuptools.command.test is removed in setuptools 72 and I couldn't find any usage of this class.

user_options = [('tox-args=', 'a', 'Arguments to pass to tox')]

def initialize_options(self):
TestCommand.initialize_options(self)
self.tox_args = None

def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = []
self.test_suite = True

def run_tests(self):
# import here, cause outside the eggs aren't loaded
import shlex

import tox
args = self.tox_args
if args:
args = shlex.split(self.tox_args)
errno = tox.cmdline(args=args)
sys.exit(errno)


def get_version(file_path):
"""
Extract the version string from the file at the given relative path fragments.
Expand Down Expand Up @@ -155,7 +130,6 @@ def get_version(file_path):
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
downloadcache = {toxworkdir}/_download/
envlist = py{38,311,312}-django{42},coverage,quality
envlist = py{311,312}-django{42},coverage,quality

[testenv]
deps =
Expand Down