Skip to content

Commit

Permalink
WIP: CI 2
Browse files Browse the repository at this point in the history
  • Loading branch information
pajod committed Dec 26, 2023
1 parent 35125c0 commit 95233f8
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/actions/pydpkg/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
inputs:
workaround:
default: false
default: ""
required: true
path:
default: "debian"
Expand Down Expand Up @@ -34,7 +34,7 @@ runs:
chmod --changes +x ${{ inputs.path }}/gunicorn-21.2.0/debian/control
ls -l ${{ inputs.path }}/gunicorn-21.2.0/
- name: prepare deb source dir (${{ inputs.path }})
if: ${{ inputs.workaround }}
if: ${{ inputs.workaround != "" }}
shell: bash
run: |
echo 'extend-diff-ignore = "^setup\.cfg$"' >> ${{ inputs.path }}/gunicorn-21.2.0/debian/source/options
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
uses: ./source/.github/actions/pydpkg
with:
path: debian-workaround
workaround: true
workaround: "all"
- name: "Build dpkg package (default)"
uses: ./source/.github/actions/pydpkg
continue-on-error: true
with:
path: debian
workaround: false
workaround: ""
- uses: actions/upload-artifact@v4
with:
path: |
Expand Down
3 changes: 0 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
include .gitignore
include LICENSE
include NOTICE
include README.rst
include THANKS
include requirements_dev.txt
include requirements_test.txt
recursive-include tests *
recursive-include examples *
recursive-include docs *
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
build:
virtualenv venv
venv/bin/pip install -e .
venv/bin/pip install -r requirements_dev.txt
venv/bin/pip install -e .[dev,testing]

test:
venv/bin/python -m pytest
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ details.

### CI

[![CI:buildpackage](https://github.com/pajod/gunicorn/actions/workflows/buildpackage.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/buildpackage.yml)
[![CI:packaging](https://github.com/pajod/gunicorn/actions/workflows/packaging.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/packaging.yml)
[![CI:CodeQL](https://github.com/pajod/gunicorn/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/github-code-scanning/codeql)
[![CI:lint](https://github.com/pajod/gunicorn/actions/workflows/lint.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/lint.yml)
[![CI:tox](https://github.com/pajod/gunicorn/actions/workflows/tox.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/tox.yml)
Expand Down
9 changes: 9 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ testing = [
# pytest 7.2.0 starts using Python 3.11 stdlib tomllib
"pytest>=7.2.0",
]
dev = [
# setuptools v68.0 fails hard on invalid pyproject.toml
# which a developer would want to know
# otherwise, oldest known-working version is 61.2
"setuptools>=68.0",
"sphinx",
"sphinx_rtd_theme",
]


[project.scripts]
# duplicates "python -m gunicorn" handling in __main__.py
Expand Down
9 changes: 0 additions & 9 deletions requirements_dev.txt

This file was deleted.

8 changes: 0 additions & 8 deletions requirements_test.txt

This file was deleted.

0 comments on commit 95233f8

Please sign in to comment.