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

Rework of build system to use more modern standards #153

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/copr/copr-build-setup
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ PROJECT_PR=praiskup/distgen

build_deps=(
git
distgen
make
python3
python3-setuptools
python3-pip
python3-build
)

for PROJECT in $PROJECT_PR $PROJECT_PUSH; do
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/copr/copr-custom-script
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@ else
RELEASE="PR${3}_${date}_git$short_commit"
fi

python3 -m pip install . --user
cd rpm
make RELEASE="$RELEASE"
32 changes: 0 additions & 32 deletions .github/workflows/copr/script

This file was deleted.

11 changes: 7 additions & 4 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ jobs:
id-token: write # for trusted publishing

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-python@v2

- uses: actions/setup-python@v5
with:
python-version: "3.x"

- name: Build a source tarball and a binary wheel
# https://pypa-build.readthedocs.io
run: |
python -m pip install -r requirements.txt
python setup.py sdist
python3 -m pip install build --user
python3 -m build

- name: Publish 📦 to PyPI
# https://github.com/pypa/gh-action-pypi-publish
Expand Down
35 changes: 35 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.12"
# You can also specify other tool versions:
# nodejs: "20"
# rust: "1.70"
# golang: "1.20"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/conf.py
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
# builder: "dirhtml"
# Fail on all warnings to avoid broken references
# fail_on_warning: true

# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
# - epub

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
# python:
# install:
# - requirements: docs/requirements.txt
5 changes: 0 additions & 5 deletions AUTHORS

This file was deleted.

11 changes: 0 additions & 11 deletions Dockerfile

This file was deleted.

3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
include AUTHORS
include dg
include requirements.txt
include LICENSE
include Makefile
Expand All @@ -11,3 +10,5 @@ include docs/Makefile
recursive-include build_manpages *.py
recursive-include tests *.exp *.py *.tpl *.yaml .gitkeep distros container_opt dg-opts
recursive-include tests/unittests/fixtures *
recursive-include distgen/distconf *
recursive-include distgen/templates *
8 changes: 8 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in 2.0:

* Complete rewrite of buildsystem to use pyproject.toml
* This removes version file from distgen package
- Use `version()` from `importlib.metadata` instead

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in 1.18:

* Added support for Fedora 40, 41, 42
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Distribution oriented templating system
=======================================

[![Build Status](https://travis-ci.org/devexp-db/distgen.svg?branch=master)](https://travis-ci.org/devexp-db/distgen)
[![Copr package](https://copr.fedorainfracloud.org/coprs/praiskup/distgen/package/distgen/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/praiskup/distgen/)
[![Fedora package](https://img.shields.io/fedora/v/distgen)](https://packages.fedoraproject.org/pkgs/distgen/distgen/)
[![Coverage Status](https://coveralls.io/repos/github/devexp-db/distgen/badge.svg)](https://coveralls.io/github/devexp-db/distgen)
[![Documentation Status](https://readthedocs.org/projects/distgen/badge/?version=latest)](https://distgen.readthedocs.io)

Expand Down
Loading
Loading