Skip to content

Commit

Permalink
Prepare 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
agateau committed Nov 4, 2024
1 parent 3d67ecc commit a3c6a2d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 1.3.0 - 2024-11-05

- Update SQLAlchemy to 2.0.32.
- Use color to for keywords in tables.
- Fix crash handler failing on Windows.

## 1.2.0 - 2019-02-10

### New features
Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ include README.md
include LICENSE
include MANIFEST.in
include version
include NEWS
include CHANGELOG.md
include *requirements.txt
include .travis.yml
include .github
18 changes: 12 additions & 6 deletions scripts/mkdist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log() {
SRC_DIR=$(cd "$(dirname $0)/.." ; pwd)
DST_DIR=$(cd "$1" ; pwd)

[ -d "$DST_DIR" ] || die "Destination dir '$SRC_DIR' does not exist"
[ -d "$DST_DIR" ] || die "Destination dir '$DST_DIR' does not exist"

WORK_DIR=$(mktemp -d "$DST_DIR/yokadi-dist.XXXXXX")

Expand All @@ -30,7 +30,13 @@ git reset --hard HEAD
git clean -q -dxf

log "Building archives"
./setup.py -q sdist --formats=gztar,zip
python3 -m venv create "$WORK_DIR/venv"
(
. "$WORK_DIR/venv/bin/activate"
pip install build
python -m build
)
rm -rf "$WORK_DIR/venv"

log "Installing archive"
cd dist/
Expand All @@ -39,25 +45,25 @@ tar xf "$YOKADI_TARGZ"

ARCHIVE_DIR="$PWD/${YOKADI_TARGZ%.tar.gz}"

virtualenv --python python3 "$WORK_DIR/venv"
python3 -m venv create "$WORK_DIR/venv"
(
. "$WORK_DIR/venv/bin/activate"

# Install Yokadi in the virtualenv and make sure it can be started
# That ensures dependencies got installed by pip
log "Smoke test"
pip3 install "$ARCHIVE_DIR"
pip install "$ARCHIVE_DIR"
yokadi exit

log "Installing extra requirements"
pip3 install -r "$ARCHIVE_DIR/extra-requirements.txt"
pip install -r "$ARCHIVE_DIR/extra-requirements.txt"

log "Running tests"
"$ARCHIVE_DIR/yokadi/tests/tests.py"
)

log "Moving archives out of work dir"
cd "$WORK_DIR/dist"
mv ./*.tar.gz ./*.zip "$DST_DIR"
mv *.tar.gz *.whl "$DST_DIR"
rm -rf "$WORK_DIR"
log "Done"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def createFileList(sourceDir, *patterns):
# Additional files
data_files = []
data_files.append(["share/yokadi",
["README.md", "NEWS", "LICENSE"]])
["README.md", "CHANGELOG.md", "LICENSE"]])

# Doc
data_files.append(["share/yokadi/doc", createFileList("doc", "*.md")])
Expand Down
2 changes: 1 addition & 1 deletion yokadi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
@license:GPL v3 or later
"""

__version__ = "1.2.0"
__version__ = "1.3.0"

0 comments on commit a3c6a2d

Please sign in to comment.