Skip to content

Commit 6d38727

Browse files
authored
Merge pull request #34 from geoadmin/bug-publish
Fixed auto-publish - #patch
2 parents 25bb974 + 340c493 commit 6d38727

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

.github/workflows/semver.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
if: ${{ github.ref == 'refs/heads/master' }}
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
20-
fetch-depth: '10'
20+
fetch-depth: 0
2121

2222
- name: Build and Publish Package on PyPI
2323
run: make publish

Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DEV_REQUIREMENTS_TIMESTAMP = $(VENV)/.dev-requirements.timestamp
2121

2222
# general targets timestamps
2323
TIMESTAMPS = .timestamps
24-
PREP_PACKAGING_TIMESTAMP = $(TIMESTAMPS)/.prep-packaging.timestamp
2524

2625
# Find all python files that are not inside a hidden directory (directory starting with .)
2726
PYTHON_FILES := $(shell find ./* -type d \( -path ./build -o -path ./dist \) -prune -false -o -type f -name "*.py" -print)
@@ -107,7 +106,7 @@ test: $(DEV_REQUIREMENTS_TIMESTAMP)
107106
# Packaging target
108107

109108
.PHONY: package
110-
package: $(PREP_PACKAGING_TIMESTAMP)
109+
package: $(DEV_REQUIREMENTS_TIMESTAMP)
111110
$(PYTHON) -m build
112111

113112

@@ -158,11 +157,6 @@ $(DEV_REQUIREMENTS_TIMESTAMP): $(VENV_TIMESTAMP) $(DEV_REQUIREMENTS)
158157
@touch $(DEV_REQUIREMENTS_TIMESTAMP)
159158

160159

161-
$(PREP_PACKAGING_TIMESTAMP): $(TIMESTAMPS)
162-
python3 -m pip install --user --upgrade setuptools wheel twine
163-
@touch $(PREP_PACKAGING_TIMESTAMP)
164-
165-
166160
publish-check:
167161
@echo "Check if publish is allowed"
168162
@if [ -n "`git status --porcelain`" ]; then echo "ERROR: Repo is dirty !" >&2; exit 1; fi

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66
name = "logging-utilities"
77
requires-python = ">=3.0"
88
description = """\
9-
A collection of useful logging formatters and filters.
9+
A collection of useful logging formatters and filters.\
1010
Logging Context, JSON Formatter, Extra Formatter, ISO Time Filter, Flask Filter, Django Filter, ...\
1111
"""
1212
readme = "README.md"

0 commit comments

Comments
 (0)