From 55fb7c68f571eb60e6eec13831769e2a35515adb Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Fri, 23 Feb 2024 04:26:37 -0500 Subject: [PATCH 1/6] feat: add python312 support --- .github/workflows/ci.yml | 11 +++++------ tox.ini | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4d9231..b70cdfb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: Python CI on: push: branches: - - master + - master pull_request: branches: - - '**' + - '**' jobs: run_tests: @@ -15,10 +15,9 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 - python-version: - - 3.8 - toxenv: [ py38,quality ] + - ubuntu-20.04 + python-version: [3.8, '3.8', '3.12'] + toxenv: [py38, quality, django42] steps: - uses: actions/checkout@v1 - name: setup python diff --git a/tox.ini b/tox.ini index 77c89a6..6aabaac 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38,quality +envlist = py{38, 312}quality [testenv] deps = -r{toxinidir}/requirements/test.txt From a165ddae8cc05b3ed57e8afcef1fea9d4f4aff62 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 27 Feb 2024 12:57:58 +0500 Subject: [PATCH 2/6] build: update tox and ci workflow --- .github/workflows/ci.yml | 6 +++--- tox.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b70cdfb..6f6f8d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,12 @@ jobs: matrix: os: - ubuntu-20.04 - python-version: [3.8, '3.8', '3.12'] + python-version: ['3.8', '3.12'] toxenv: [py38, quality, django42] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} diff --git a/tox.ini b/tox.ini index 6aabaac..f01eefb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 312}quality +envlist = py{38,312},quality [testenv] deps = -r{toxinidir}/requirements/test.txt From c9a5486dafba64ac948f1b5ca4ae025bc46f0d4d Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 27 Feb 2024 13:00:13 +0500 Subject: [PATCH 3/6] build: update tox and ci workflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f6f8d8..eeac4be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: os: - ubuntu-20.04 python-version: ['3.8', '3.12'] - toxenv: [py38, quality, django42] + toxenv: [py38,py312,quality] steps: - uses: actions/checkout@v3 - name: setup python From 084454f68a17a92f9222435a7bfa163808e73697 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 27 Feb 2024 13:05:07 +0500 Subject: [PATCH 4/6] build: exclude mutually exclusive toxenv --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeac4be..d0e2b3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,11 @@ jobs: - ubuntu-20.04 python-version: ['3.8', '3.12'] toxenv: [py38,py312,quality] + exclude: + - python-version: '3.8' + toxenv: 'py312' + - python-version: '3.12' + toxenv: 'py38' steps: - uses: actions/checkout@v3 - name: setup python From 576310e21473354eff7fc02b373fa790240de3c0 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 27 Feb 2024 13:08:44 +0500 Subject: [PATCH 5/6] fix: include setuptools in requirements --- Makefile | 8 ++++---- requirements/base.in | 1 + requirements/base.txt | 4 ++++ requirements/pip-tools.txt | 6 ++++-- requirements/pip.txt | 2 +- requirements/test.txt | 18 +++++++++++------- requirements/tox.txt | 6 +++--- 7 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 3843a0e..8f798ee 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,9 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in - pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in + pip-compile --allow-unsafe --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - pip-compile --upgrade -o requirements/base.txt requirements/base.in - pip-compile --upgrade -o requirements/tox.txt requirements/tox.in - pip-compile --upgrade -o requirements/test.txt requirements/test.in + pip-compile --allow-unsafe --upgrade -o requirements/base.txt requirements/base.in + pip-compile --allow-unsafe --upgrade -o requirements/tox.txt requirements/tox.in + pip-compile --allow-unsafe --upgrade -o requirements/test.txt requirements/test.in diff --git a/requirements/base.in b/requirements/base.in index d7afac9..f443872 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,3 +1,4 @@ -c constraints.txt requests +setuptools diff --git a/requirements/base.txt b/requirements/base.txt index d03f44e..5e4174d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,3 +14,7 @@ requests==2.31.0 # via -r requirements/base.in urllib3==2.2.1 # via requests + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.1.1 + # via -r requirements/base.in diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d9..ab115fa 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -29,5 +29,7 @@ zipp==3.17.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools +pip==24.0 + # via pip-tools +setuptools==69.1.1 + # via pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 71954cc..6665603 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.42.0 # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.1.1 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 3f716f9..b0d9492 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==3.0.3 +astroid==3.1.0 # via pylint certifi==2024.2.2 # via @@ -14,11 +14,11 @@ charset-normalizer==3.3.2 # via # -r requirements/base.txt # requests -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via # -r requirements/test.in # pytest-cov -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.in dill==0.3.8 # via pylint @@ -46,9 +46,9 @@ pycodestyle==2.11.1 # via -r requirements/test.in pydocstyle==6.3.0 # via -r requirements/test.in -pylint==3.0.3 +pylint==3.1.0 # via -r requirements/test.in -pytest==8.0.1 +pytest==8.0.2 # via # -r requirements/test.in # pytest-cov @@ -65,9 +65,9 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.12.3 +tomlkit==0.12.4 # via pylint -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # astroid # pylint @@ -75,3 +75,7 @@ urllib3==2.2.1 # via # -r requirements/base.txt # requests + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.1.1 + # via -r requirements/base.txt diff --git a/requirements/tox.txt b/requirements/tox.txt index ccd6766..bed4c3d 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,13 +4,13 @@ # # make upgrade # -cachetools==5.3.2 +cachetools==5.3.3 # via tox chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.4.1 +coverage==7.4.3 # via -r requirements/tox.in distlib==0.3.8 # via virtualenv @@ -36,5 +36,5 @@ tomli==2.0.1 # tox tox==4.13.0 # via -r requirements/tox.in -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox From 01fad3d395255c4eaebaa257a8046ba3e3994af3 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 27 Feb 2024 14:27:23 +0500 Subject: [PATCH 6/6] docs: bump package version --- analyticsclient/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analyticsclient/__init__.py b/analyticsclient/__init__.py index 93eab7e..6f21092 100644 --- a/analyticsclient/__init__.py +++ b/analyticsclient/__init__.py @@ -1 +1 @@ -__version__ = '0.18.2' +__version__ = '0.18.3'