* [gentoo-commits] proj/portage:master commit in: .github/workflows/, /
@ 2021-01-02 2:46 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2021-01-02 2:46 UTC (permalink / raw
To: gentoo-commits
commit: 8d09cb1da12366a0420341be5ab11bed987eb413
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 00:43:19 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jan 2 02:45:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8d09cb1d
.travis.yml: convert to github action
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.github/workflows/ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
.travis.yml | 26 --------------------------
tox.ini | 9 +++++++++
3 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..2ec4c57aa
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,43 @@
+name: CI
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ python-version:
+ - '3.6'
+ - '3.7'
+ - '3.8'
+ - '3.9'
+ - '3.10.0-alpha.3'
+ - 'pypy-3.6'
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install python dependencies
+ run: |
+ set -xe
+ sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev zstd
+ python -VV
+ python -m site
+ python -m pip install --upgrade pip
+ python -m pip install tox tox-gh-actions
+ - name: Test ./setup.py install --root=/tmp/install-root
+ run: |
+ printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
+ ./setup.py install --root=/tmp/install-root
+ - name: Run tox targets for ${{ matrix.python-version }}
+ run: |
+ tox -vv
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 297286ce0..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-dist: focal
-language: python
-python:
- - 3.6
- - 3.7
- - 3.8
- - 3.9
- - 3.10-dev
- - pypy3
-
-# command to install dependencies
-before_install:
- # Use "dist: bionic" to get a zstd with --long support.
- - sudo apt-get -y install zstd
-install:
- - pip install tox
-
-script:
- - printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
- - ./setup.py install --root=/tmp/install-root
- - if [[ ${TRAVIS_PYTHON_VERSION/-dev/} == ?.? ]]; then
- TOX_PYTHON_VERSION=${TRAVIS_PYTHON_VERSION/-dev/};
- tox -e py${TOX_PYTHON_VERSION/./};
- else
- tox -e ${TRAVIS_PYTHON_VERSION};
- fi
diff --git a/tox.ini b/tox.ini
index 8aabbd2ce..27b2206d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,15 @@
envlist = py36,py37,py38,py39,py310,pypy3
skipsdist = True
+[gh-actions]
+python =
+ 3.6: py36
+ 3.7: py37
+ 3.8: py38
+ 3.9: py39
+ 3.10: py310
+ pypy-3.6: pypy3
+
[testenv]
deps =
pylint
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:master commit in: .github/workflows/, /
@ 2021-02-22 3:44 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2021-02-22 3:44 UTC (permalink / raw
To: gentoo-commits
commit: 14d2182465f9921717801563f83b376cfa439bd1
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 03:26:23 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 03:41:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=14d21824
ci: upgrade to pypy-3.7-v7.3.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.github/workflows/ci.yml | 2 +-
tox.ini | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d4b960dc3..9188c9c28 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
- '3.8'
- '3.9'
- '3.10.0-alpha.3'
- - 'pypy-3.6'
+ - 'pypy-3.7-v7.3.3'
steps:
- uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 585752686..b0cfa7da3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ python =
3.8: py38
3.9: py39
3.10: py310
- pypy-3.6: pypy3
+ pypy-3.7-v7.3.3: pypy3
[testenv]
deps =
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:master commit in: .github/workflows/, /
@ 2021-06-15 19:40 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2021-06-15 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 4a8725ee4aba2c2990b63f520143a0b78db35376
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 19:06:01 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 19:19:23 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a8725ee
setup.cfg: eliminate dash-separated portage-ext-modules
* QA Notice: setuptools warnings detected:
*
* Usage of dash-separated 'portage-ext-modules' will not be supported in future versions. Please use the underscore name 'portage_ext_modules' instead
Reported-by: Patrick McLean <chutzpah <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.github/workflows/ci.yml | 2 +-
README | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9188c9c28..78e4f428b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
python -m pip install tox tox-gh-actions
- name: Test ./setup.py install --root=/tmp/install-root
run: |
- printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
+ printf "[build_ext]\nportage_ext_modules=true" >> setup.cfg
./setup.py install --root=/tmp/install-root
- name: Run tox targets for ${{ matrix.python-version }}
run: |
diff --git a/README b/README
index 54b12f8ce..d2bc9fdda 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ native extensions for all invocations of the build_ext command (the
build_ext command is invoked automatically by other build commands):
[build_ext]
- portage-ext-modules=true
+ portage_ext_modules=true
Currently, the native extensions only include libc bindings which are
used to validate LC_CTYPE and LC_COLLATE behavior for EAPI 6. If the
diff --git a/setup.py b/setup.py
index 6be38895c..879e0ca5e 100755
--- a/setup.py
+++ b/setup.py
@@ -720,7 +720,7 @@ class build_ext(_build_ext):
]
boolean_options = _build_ext.boolean_options + [
- 'portage-ext-modules',
+ 'portage_ext_modules',
]
def initialize_options(self):
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:master commit in: .github/workflows/, /
@ 2023-03-23 6:59 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-03-23 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 8003c8acb8e0a73387535c338ee2d112781fe9fd
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Wed Mar 22 05:50:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 06:59:11 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8003c8ac
actions: move pylint job into lint.yml
Enable running the pylint job outside of just pushes or PR's to master.
Don't run pylint as part of the CI/build job.
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/portage/pull/1014
Signed-off-by: Sam James <sam <AT> gentoo.org>
.github/workflows/ci.yml | 63 +++++++++++++++++++++++-----------------------
.github/workflows/lint.yml | 35 ++++++++++++++++++++++++--
tox.ini | 24 +++++++++++-------
3 files changed, 79 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12d01dd1d..29a5a60c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,41 +8,40 @@ on:
jobs:
build:
-
runs-on: ubuntu-22.04
strategy:
matrix:
python-version:
- - '3.7'
- - '3.8'
- - '3.9'
- - '3.10'
- - '3.11'
- - '3.12-dev'
- - 'pypy-3.7'
- - 'pypy-3.8'
- - 'pypy-3.9'
+ - '3.7'
+ - '3.8'
+ - '3.9'
+ - '3.10'
+ - '3.11'
+ - '3.12-dev'
+ - 'pypy-3.7'
+ - 'pypy-3.8'
+ - 'pypy-3.9'
fail-fast: false
-
steps:
- - uses: actions/checkout@v3
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python-version }}
- - name: Install python dependencies
- run: |
- set -xe
- sudo apt-get update
- sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libxml2-utils zstd
- python -VV
- python -m site
- python -m pip install --upgrade pip
- python -m pip install tox tox-gh-actions
- - name: Test ./setup.py install --root=/tmp/install-root
- run: |
- printf "[build_ext]\nportage_ext_modules=true" >> setup.cfg
- ./setup.py install --root=/tmp/install-root
- - name: Run tox targets for ${{ matrix.python-version }}
- run: |
- tox -vv
+ - uses: actions/checkout@v3
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install python dependencies
+ run: |
+ set -xe
+ sudo apt-get update
+ sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libxml2-utils zstd
+ python -VV
+ python -m site
+ python -m pip install --upgrade pip
+ python -m pip install tox tox-gh-actions
+ - name: Test ./setup.py install --root=/tmp/install-root
+ run: |
+ printf "[build_ext]\nportage_ext_modules=true" >> setup.cfg
+ ./setup.py install --root=/tmp/install-root
+ - name: Run tox test env for ${{ matrix.python-version }}
+ run: tox -vv
+ env:
+ TARGET: test
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 977f62d89..8263567a1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,9 +1,9 @@
name: Lint
-on: [push, pull_request]
+on: [ push, pull_request ]
jobs:
- lint:
+ black:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@@ -16,3 +16,34 @@ jobs:
- uses: psf/black@stable
with:
src: . ${{ steps.stragglers.outputs.missed }}
+
+ pylint:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ python-version:
+ - '3.7'
+ - '3.8'
+ - '3.9'
+ - '3.10'
+ - '3.11'
+ # Complains about importing distutils.dir_utils
+ # - '3.12-dev'
+ fail-fast: false
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install python dependencies
+ run: |
+ set -xe
+ python -VV
+ python -m site
+ python -m pip install --upgrade pip
+ python -m pip install tox tox-gh-actions
+ - name: Run tox pylint env for ${{ matrix.python-version }}
+ run: tox -vv
+ env:
+ TARGET: pylint
diff --git a/tox.ini b/tox.ini
index 6760bde03..d8b84c80a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,30 @@
[tox]
-envlist = py{37,38,39,310}-pylint,py311,pypy3
+envlist = py{37,38,39,310,311,312}-{pylint,test},pypy3-test
skipsdist = True
[gh-actions]
python =
- 3.7: py37-pylint
- 3.8: py38-pylint
- 3.9: py39-pylint
- 3.10: py310-pylint
- 3.11: py311
- pypy-3: pypy3
+ 3.7: py37
+ 3.8: py38
+ 3.9: py39
+ 3.10: py310
+ 3.11: py311
+ 3.12: py312
+ pypy-3: pypy3
+
+[gh-actions:env]
+TARGET =
+ pylint: pylint
+ test: test
[testenv]
deps =
pylint: pylint
- pyyaml
+ test: pyyaml
setenv =
PYTHONPATH={toxinidir}/lib
allowlist_externals =
./run-pylint
commands =
pylint: ./run-pylint
- python -b -Wd setup.py test
+ test: python -b -Wd setup.py test
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/portage:master commit in: .github/workflows/, /
@ 2024-01-28 23:23 Zac Medico
0 siblings, 0 replies; 5+ messages in thread
From: Zac Medico @ 2024-01-28 23:23 UTC (permalink / raw
To: gentoo-commits
commit: 0e2f316113f82582069a3e09bec49220fc9406ef
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 23:12:31 2024 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 23:15:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0e2f3161
actions: Use psf/black <AT> 24.1.1 and sync pre-commit version
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.github/workflows/lint.yml | 2 +-
.pre-commit-config.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f75eaa0e7d..2091796b7c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
echo "::set-output name=missed::$(
find bin -type f -not -name '*.py' -not -name '*.sh' | \
xargs grep -l '#!/usr/bin/env python' | tr $'\n' ' ')"
- - uses: psf/black@23.12.1
+ - uses: psf/black@24.1.1
with:
src: . ${{ steps.stragglers.outputs.missed }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 72b0df3edd..f6fca10cba 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
---
repos:
- repo: https://github.com/psf/black
- rev: 23.12.1
+ rev: 24.1.1
hooks:
- id: black
- repo: https://github.com/PyCQA/pylint
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-28 23:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-15 19:40 [gentoo-commits] proj/portage:master commit in: .github/workflows/, / Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2024-01-28 23:23 Zac Medico
2023-03-23 6:59 Sam James
2021-02-22 3:44 Zac Medico
2021-01-02 2:46 Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox