From 03bf955422dd42de115986b641473ad0e27eaf4f Mon Sep 17 00:00:00 2001
From: Marek Chrastina <marek.chrastina@vsb.cz>
Date: Fri, 16 Aug 2019 14:21:06 +0200
Subject: [PATCH] Add history
---
.gitlab-ci.yml | 15 ++++++++-------
MANIFEST.in | 6 ++++++
docs/HISTORY.txt | 0
setup.py | 1 +
4 files changed, 15 insertions(+), 7 deletions(-)
create mode 100644 MANIFEST.in
create mode 100644 docs/HISTORY.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29c4be0..1b92e28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,9 +39,10 @@ build:
- export LC_CTYPE=en_US.UTF-8
- pip install mustache pystache
script:
+ - echo "include_merge = False" >> .gitchangelog.rc
- echo "output_engine = mustache(\"restructuredtext\")" >> .gitchangelog.rc
- - gitchangelog >> HISTORY.txt
- - cat HISTORY.txt
+ - gitchangelog >> docs/HISTORY.txt
+ - cat docs/HISTORY.txt
- echo "output_engine = mustache(\"markdown\")" >> .gitchangelog.rc
- echo >> README.md
- gitchangelog | sed -r '1,/^# Changelog$/s/^(# Changelog)$/#\1/' >> README.md
@@ -67,11 +68,11 @@ versioncheck:
- export BUILD_VERSION="$(python setup.py --version)"
- >-
export PUBLISHED_VERSION="$(pip install pipdeps== 2>&1 | grep -oE "\(from versions: .*)" | sed "s/(from versions: //" | sed "s/)//" | tr ", " "\n" | tail -n1)"
- #- CMP_VERSION="$(cmp-version $BUILD_VERSION $PUBLISHED_VERSION)"
- #- if [ $CMP_VERSION -eq 1 ]; then true; else echo 'Git tag is older/same version as module already available from public pypi repository. Please run git tag -a <version> -m "<version>"'; false; fi
- - >-
- echo -e "import sys\nfrom packaging.version import Version, LegacyVersion\nver1=Version('$BUILD_VERSION')\nver2=Version('$PUBLISHED_VERSION')\nif ver1>ver2: sys.exit(0)\nif ver1<ver2: sys.exit(1)\nif ver1==ver2: sys.exit(2)" | python
- - if [ $? -eq 0 ]; then true; else echo 'Git tag is older/same version as module already available from public pypi repository. Please run git tag -a <version> -m "<version>"'; false; fi
+ - CMP_VERSION="$(cmp-version $BUILD_VERSION $PUBLISHED_VERSION)"
+ - if [ $CMP_VERSION -eq 1 ]; then true; else echo 'Git tag is older/same version as module already available from public pypi repository. Please run git tag -a <version> -m "<version>"'; false; fi
+ #- >-
+ # echo -e "import sys\nfrom packaging.version import Version, LegacyVersion\nver1=Version('$BUILD_VERSION')\nver2=Version('$PUBLISHED_VERSION')\nif ver1>ver2: sys.exit(0)\nif ver1<ver2: sys.exit(1)\nif ver1==ver2: sys.exit(2)" | python
+ #- if [ $? -eq 0 ]; then true; else echo 'Git tag is older/same version as module already available from public pypi repository. Please run git tag -a <version> -m "<version>"'; false; fi
upload:
stage: deploy
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..c2359ec
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+recursive-include docs *
+include *
+exclude .gitchangelog.rc
+exclude .gitlab-ci.yml
+global-exclude *.pyc
+global-exclude .gitignore
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
index 10457bd..ee78dd6 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@ setup(
license='GPLv3+',
packages=find_packages(),
namespace_packages=['pipdeps'],
+ include_package_data=True,
zip_safe=False,
version_format='{tag}',
long_description_markdown_filename='README.md',
--
GitLab