Skip to content

Commit

Permalink
chore: merge branch 'main' into feature/improve-swap-support
Browse files Browse the repository at this point in the history
  • Loading branch information
mbdevpl committed Oct 23, 2024
2 parents 57348d0 + e18c258 commit f442df5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]
python-version: ['3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
architecture: x64
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
}

environment {
PYTHON_PACKAGE = 'system-query'
PYTHON_PACKAGE = 'system_query'
}

agent {
Expand All @@ -24,7 +24,7 @@ pipeline {

stage('Lint') {
environment {
PYTHON_MODULES = "${env.PYTHON_PACKAGE.replace('-', '_')} test *.py"
PYTHON_MODULES = "${env.PYTHON_PACKAGE} test *.py"
}
steps {
sh """#!/usr/bin/env bash
Expand Down Expand Up @@ -96,7 +96,7 @@ pipeline {
sh """#!/usr/bin/env bash
set -Eeuxo pipefail
python3 -m twine upload \
dist/${PYTHON_PACKAGE.replace('-', '_')}-${VERSION}-py3-none-any.whl \
dist/${PYTHON_PACKAGE}-${VERSION}-py3-none-any.whl \
dist/${PYTHON_PACKAGE}-${VERSION}.tar.gz \
dist/${PYTHON_PACKAGE}-${VERSION}.zip
"""
Expand All @@ -113,7 +113,7 @@ pipeline {
steps {
script {
githubUtils.createRelease([
"dist/${PYTHON_PACKAGE.replace('-', '_')}-${VERSION}-py3-none-any.whl",
"dist/${PYTHON_PACKAGE}-${VERSION}-py3-none-any.whl",
"dist/${PYTHON_PACKAGE}-${VERSION}.tar.gz",
"dist/${PYTHON_PACKAGE}-${VERSION}.zip"
])
Expand Down
6 changes: 3 additions & 3 deletions requirements_ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ coverage ~= 7.2
flake518 ~= 1.6; python_version >= '3.9'
mypy ~= 1.5
pydocstyle ~= 6.3
pylint ~= 2.17
twine ~= 4.0
types-psutil ~= 5.6
pylint ~= 3.3
twine ~= 5.1
types-psutil ~= 6.1
2 changes: 1 addition & 1 deletion requirements_memory.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
psutil ~= 5.6
psutil ~= 6.1

0 comments on commit f442df5

Please sign in to comment.