Merge branch 'fix' into 'master'

Add history

See merge request !2

.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

MANIFEST.in

+recursive-include docs *
+include *
+exclude .gitchangelog.rc
+exclude .gitlab-ci.yml
+global-exclude *.pyc
+global-exclude .gitignore

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',