From 1eef8dc9362ce474ab01be9ef3a6aa7f0874c685 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Fri, 7 Jun 2024 10:07:05 +1000 Subject: [PATCH] Update CI and version and ignore black diff Updates CI to use new action versions that are not deprecated. Bumps the version of the package to reflect the latest changes and add .git-blame-ignore-revs so the GitHub UI blame will ignore the black formatting changes. --- .git-blame-ignore-revs | 3 +++ .github/workflows/ci.yml | 21 +++++++++------------ requirements.txt | 1 - setup.cfg | 3 ++- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..20e8d94 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,3 @@ +# .git-blame-ignore-revs +# Bulk black reformatting +986a8ad007d7621a464ddee681769fc186a4ed01 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17d8dfe..eccda32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,18 +31,18 @@ jobs: - python-version: '3.9' - python-version: '3.10' - python-version: '3.11' + - python-version: '3.12' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Run tests shell: bash run: | - python -m pip install -U pip setuptools python -m pip install . python -m pip install -r requirements.txt @@ -65,24 +65,21 @@ jobs: - test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - - name: Installing baseline packages - run: | - echo "Installing baseline pip packages" - python -m pip install --upgrade pip setuptools wheel + - uses: actions/checkout@v4 - name: Build package - run: python setup.py sdist bdist_wheel + run: | + python -m pip install build + python -m build - name: Capture Wheel and SDist - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifact path: dist/* - name: Publish - if: startsWith(github.ref, 'refs/tags/v') + if: startsWith(github.event.release.tag_name, 'v') uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ diff --git a/requirements.txt b/requirements.txt index 9d4d002..253db38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,3 @@ mypy == 1.10.0 pytest pytest-cov types-requests -wheel diff --git a/setup.cfg b/setup.cfg index bf051df..08d1374 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = requests_ntlm -version = 1.2.0 +version = 1.3.0 url = https://github.com/requests/requests-ntlm author = Ben Toews author_email = mastahyeti@gmail.com @@ -18,6 +18,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 License :: OSI Approved :: ISC License (ISCL) [options]