Skip to content

Commit

Permalink
Release 0.3 (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaruni96 committed Nov 17, 2024
1 parent 8fd0a9e commit 4ca67d0
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
Create_Packages:
name: "Create Packages"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -22,7 +22,7 @@ jobs:
- name: Install DEB deps
run: |
sudo apt update
sudo apt install devscripts libcairo2-dev git gcc python3 python3-dev libgirepository1.0-dev libostree-dev fuse-overlayfs python3-venv libcap-dev autoconf python3-gi python3-tomli debhelper-compat
sudo apt install devscripts debhelper-compat
- name: Run DEB pkg script
run: |
pwd
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Upcoming]
## [0.3] - 2024-11-17

### Added
- Include sysfs in the runtime as read-only
Expand Down
3 changes: 1 addition & 2 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MaPS - MaRDI Packaging System

![](https://img.shields.io/badge/version-0.3--dev-blue)
![](https://img.shields.io/badge/version-0.3-blue)

## Introduction

Expand Down Expand Up @@ -92,4 +92,3 @@ All code must conform to these settings of pylint and flake8 (enforced by CI):
pylint -d C0413,C0103,R0912,R0915,W0603 src/maps
flake8 --max-line-length 100 --ignore=E402 src/maps
```

20 changes: 19 additions & 1 deletion pkg/arch/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,26 @@ depends=('base-devel'
'gobject-introspection-runtime'
'python3'
'ostree'
'fuse-overlayfs'
'meson'
'python-tomli'
'python-gobject'
'python-progress'
# deps for tuspy
'python-aiohappyeyeballs'
'python-aiohttp'
'python-aiosignal'
'python-attrs'
'python-certifi'
'python-charset-normalizer'
'python-frozenlist'
'python-idna'
'python-multidict'
'python-requests'
'python-urllib3'
'python-yarl'
'python-tinydb' #AUR
##python-propcache
##python-tuspy
)
conflicts=('maps')
provides=('maps')
Expand Down
17 changes: 5 additions & 12 deletions pkg/debian/build-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,22 @@ cd "maps_${VERSION}" && mkdir -pv "debian/source"

echo "3.0 (quilt)" > "debian/source/format"

cp -v pkg/debian/changelog debian/changelog
cp -v "pkg/debian/changelog" "debian/changelog"

# add control

cp -v pkg/debian/control debian/control
cp -v "pkg/debian/control" "debian/control"

# add copyright

cp -v pkg/debian/copyright debian/copyright
cp -v "pkg/debian/copyright" "debian/copyright"

# debian.dirs

echo "usr/bin" > "debian/maps.dirs"
echo "usr/share/bash-completion/completions" >> "debian/maps.dirs"
cp -v "pkg/debian/maps.dirs" "debian/maps.dirs"

# debian rules

echo '#!/usr/bin/make -f
%:
dh $@
override_dh_auto_install:
$(MAKE) DESTDIR=$$(pwd)/debian/maps prefix=/usr install' > "debian/rules"
cp -v "pkg/debian/rules" "debian/rules"

# try building, see what happens

Expand Down
6 changes: 6 additions & 0 deletions pkg/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
maps (0.3-1) UNRELEASED; urgency=medium

* Update to v0.3

-- Aaruni Kaushik <[email protected]> Sun, 17 Nov 2024 13:12:32 +0200

maps (0.2-1) UNRELEASED; urgency=medium

* Update to v0.2
Expand Down
2 changes: 1 addition & 1 deletion pkg/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13)

Package: maps
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, libcairo2-dev, git, gcc (>= 11), python3, python3-dev, libgirepository1.0-dev, libostree-dev, fuse-overlayfs, python3-venv, libcap-dev, autoconf, python3-gi, python3-tomli, meson
Depends: ${shlibs:Depends}, ${misc:Depends}, libcairo2-dev, git, gcc (>= 11), python3, python3-dev, libgirepository1.0-dev, libostree-dev, python3-tuspy, libcap-dev, autoconf, python3-gi, python3-tomli, meson, python3-progress
Description: Mathematical Packaging System
MaPS helps mathematicians create and publish software runtimes,
as well as deploy and run software inside published runtimes.
2 changes: 2 additions & 0 deletions pkg/debian/maps.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
usr/bin
usr/share/bash-completion/completions
6 changes: 6 additions & 0 deletions pkg/debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/make -f
%:
dh $@

override_dh_auto_install:
$(MAKE) DESTDIR=$$(pwd)/debian/maps prefix=/usr install
10 changes: 7 additions & 3 deletions pkg/rpm/maps.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: maps
Version: 0.2.0.1
Version: 0.3.0.1
Release: 1%{?dist}
Summary: Mathematical Packaging System
BuildArch: noarch
Expand All @@ -8,7 +8,8 @@ License: GPL3
URL: https://github.com/mardi4NFDI/maps
Source0: %{name}-%{version}.tar.gz

Requires: git cairo-devel gcc python3-devel gobject-introspection-devel ostree-devel fuse-overlayfs libcap-devel autoconf cairo-gobject-devel bash-completion python-tomli meson
Requires: git cairo-devel gcc python3-devel gobject-introspection-devel ostree-devel python3-progress libcap-devel autoconf cairo-gobject-devel bash-completion python-tomli meson
#TODO: needs python3-tuspy

%description
MaPS helps mathematicians create and publish software runtimes, as well as deploy and run software inside published runtimes
Expand All @@ -33,7 +34,10 @@ cp src/completion.bash $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/%

%changelog

* Fru Jun 21 2024 Aaruni Kaushik <[email protected]> 0.2.0.1
* Sun Nov 17 2024 Aaruni Kaushik <[email protected]> 0.3.0.1
- Update to version 0.3

* Fri Jun 21 2024 Aaruni Kaushik <[email protected]> 0.2.0.1
- Update to version 0.2

* Mon Feb 12 2024 Aaruni Kaushk <[email protected]> 0.1.0.2
Expand Down
2 changes: 1 addition & 1 deletion src/maps
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ from tusclient.storage import filestorage
gi.require_version("OSTree", "1.0")
from gi.repository import OSTree, GLib

VERSION = '0.3-dev'
VERSION = '0.3'
BWRAP_DEFAULT = f"{os.getenv('HOME')}/.var/org.mardi.maps/deps/bubblewrap/_builddir/bwrap"
if os.getenv('BWRAP_CMD') is not None:
BWRAP = str(os.getenv('BWRAP_CMD'))
Expand Down

0 comments on commit 4ca67d0

Please sign in to comment.