From c5333fce95d691ba0ca0d8b50c8b66152f041e86 Mon Sep 17 00:00:00 2001
From: janmax <j.michal@stud.uni-goettingen.de>
Date: Sun, 11 Mar 2018 15:25:02 +0100
Subject: [PATCH] Minor changes to packaging and started signing
---
.gitlab-ci.yml | 7 +++++++
Makefile | 17 +++++++++++++++++
bin/hektor | 0
setup.py | 4 ++--
4 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 Makefile
mode change 100644 => 100755 bin/hektor
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bfbe2b..6afa155 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,13 @@ cache:
paths:
- "$CI_PROJECT_DIR/pip-cache"
+variables:
+ PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache"
+
+cache:
+ paths:
+ - "$CI_PROJECT_DIR/pip-cache"
+
test:
script:
- pip install -e .
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b39174c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+.PHONY: dist clean upload tag help
+
+help:
+ @echo "See Makefile itself for help"
+
+clean:
+ rm -r hektor.egg-info dist build __pycache__
+
+dist:
+ pip install -U setuptools pip wheel && \
+ python setup.py bdist_wheel --universal
+
+upload: dist
+ twine upload dist/*
+
+tag:
+ git tag $(python setup.py --version)
diff --git a/bin/hektor b/bin/hektor
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
index 344bda7..537679f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
setup(
name='hektor',
- version='0.2',
+ version='0.2.2',
description='A QTI-XML/XLS to JSON converter for humans',
author='Jan Maximilian Michal',
author_email='mail@janmax.org',
@@ -14,5 +14,5 @@ setup(
install_requires=["lxml~=4.1.1",
"xlrd~=1.1.0",
"xkcdpass~=1.16.0"],
- py_modules=['hektor']
+ py_modules=['hektor', 'lib']
)
--
GitLab