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

Bump version and update dev deps #276

Merged
merged 2 commits into from
Mar 21, 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
27 changes: 13 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build smbprotocol
run: |
python -m pip install build
python -m build

- name: Upload built smbprotocol
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifact
path: ./dist/*
Expand All @@ -55,7 +55,6 @@ jobs:
- windows-2019
- windows-2022
python-version:
- 3.7
- 3.8
- 3.9
- '3.10'
Expand All @@ -72,8 +71,6 @@ jobs:
python-arch: x86
- os: windows-2019
python-arch: x86
- os: windows-2019
python-version: 3.7
- os: windows-2019
python-version: 3.8
- os: windows-2019
Expand All @@ -84,23 +81,24 @@ jobs:
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 }}
architecture: ${{ matrix.python-arch }}

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: ./dist

- name: Extract OS name
shell: bash
run: |
echo NAME=$( echo '${{ matrix.os }}' | tr '-' ' ' | awk '{print $1}' )
echo "name=${NAME}" >> $GITHUB_OUTPUT
NAME=$( echo '${{ matrix.os }}' | tr '-' ' ' | awk '{print $1}' )
echo "${NAME}"
echo "name=${NAME}" >> "${GITHUB_OUTPUT}"
id: os

- name: Test
Expand All @@ -116,24 +114,25 @@ jobs:

- name: Upload Test Results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Unit Test Results (${{ matrix.os }} ${{ matrix.python-version }} ${{ matrix.python-arch }})
path: ./junit/test-results.xml

- name: Upload Coverage Results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Coverage Results (${{ matrix.os }} ${{ matrix.python-version }} ${{ matrix.python-arch }})
path: ./coverage.xml

- name: Upload Coverage to codecov
if: always()
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./coverage.xml
flags: ${{ steps.os.outputs.name }},py${{ matrix.python-version }},${{ matrix.python-arch }}
token: ${{ secrets.CODECOV_TOKEN }}

publish:
name: publish
Expand All @@ -145,7 +144,7 @@ jobs:
id-token: write

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: ./dist
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
repos:
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 24.3.0
hooks:
- id: black

- repo: https://github.com/PyCQA/isort
rev: 5.11.5
rev: 5.13.2
hooks:
- id: isort
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.14.0 - TBD

* Dropped support for Python 3.7

## 1.13.0 - 2024-03-21

* Added the property `smb_info` on `SMBDirEntry` which returns a named tuple `SMBDirEntryInformation` containing metadata already retrieved in the `scandir` operation.
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ build-backend = "setuptools.build_meta"

[project]
name = "smbprotocol"
version = "1.13.0"
version = "1.14.0"
description = "Interact with a server using the SMB 2/3 Protocol"
readme = "README.md"
requires-python = ">=3.7"
requires-python = ">=3.8"
license = {file = "LICENSE"}
authors = [
{ name = "Jordan Borean", email = "[email protected]" }
Expand All @@ -19,7 +19,6 @@ classifiers = [
"Development Status :: 4 - Beta",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down Expand Up @@ -67,7 +66,7 @@ addopts = "--import-mode=importlib"
[tool.tox]
legacy_tox_ini = """
[tox]
envlist = sanity,py37,py38,py39,py310,py311
envlist = sanity,py38,py39,py310,py311,py312
skip_missing_interpreters = true
isolated_build = true

Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
black == 23.3.0
black == 24.3.0
build
cryptography >= 2.0
isort == 5.11.5
isort == 5.13.2
pre-commit
pyspnego
pytest
Expand Down