Compare commits

...
4 Commits
3 changed files with 40 additions and 17 deletions
+36 -15
View File
@@ -105,20 +105,30 @@ platform:
vatiant: Fedora vatiant: Fedora
steps: steps:
- name: Build package files - name: Build package files
commands: commands:
- python setup.py sdist - python setup.py sdist
- name: Versie toevoegen aan download - name: Versie toevoegen aan download
environment: environment:
DOWNLOADDIR: /usr/share/nginx/html/download/python/ddoperapi DOWNLOADDIR: /usr/share/nginx/html/download/python/ddoperapi
commands: commands:
- mkdir -p "$${DOWNLOADDIR}" - mkdir -p "$${DOWNLOADDIR}"
- cd dist - cd dist
- for f in *;do if [ -f "$${DOWNLOADDIR}/$${f}" ] ; then echo version error;exit 1;else cp "$${f}" "$${DOWNLOADDIR}";fi;done - |
- ls -l "$${DOWNLOADDIR}" for f in *
when: do
branch: if [ -f "$${DOWNLOADDIR}/$${f}" ]
- master then
echo version error
exit 1
else
cp "$${f}" "$${DOWNLOADDIR}"
fi
done
- ls -l "$${DOWNLOADDIR}"
when:
branch:
- master
depends_on: depends_on:
- CentOS7_test - CentOS7_test
@@ -139,11 +149,22 @@ steps:
# Make sure we run the pip installed version # Make sure we run the pip installed version
commands: commands:
- rm -rf ddOperApi - rm -rf ddOperApi
# - pip install --extra-index-url https://marceln.org/download/python ddOperApi #
# todo: Uitzoeken
#
# - >
# pip install --extra-index-url
# https://marceln.org/download/python ddOperApi
# - python -c "import lmwsip" # - python -c "import lmwsip"
# - python -c "import lmwsip; print(lmwsip.__version__)" # - python -c "import lmwsip; print(lmwsip.__version__)"
# - > # - >
# [ $(python -c "import lmwsip; print(lmwsip.__version__)") = # [ $(python -c "import lmwsip; print(lmwsip.__version__)") =
# $(python setup.py --version) ] # $(python setup.py --version) ]
# - python -m unittest -v lmwsip.tests # - python -m unittest -v lmwsip.tests
when:
branch:
- master
depends_on:
- Build
+2 -1
View File
@@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh -e
VERSION=$(grep version setup.py | sed -e 's/.*="//' -e 's/",//') VERSION=$(grep version setup.py | sed -e 's/.*="//' -e 's/",//')
sed -i "s/^__version__ = .*/__version__ = '${VERSION}'/" ddOperApi/__init__.py sed -i "s/^__version__ = .*/__version__ = '${VERSION}'/" ddOperApi/__init__.py
git add ddOperApi/__init__.py git add ddOperApi/__init__.py
python setup.py test python setup.py test
yamllint .drone.yml
+2 -1
View File
@@ -16,7 +16,8 @@ setuptools.setup(
install_requires=[ install_requires=[
'python-dateutil', 'python-dateutil',
'requests', 'requests',
'numpy' 'numpy',
'pyopenssl'
], ],
classifiers=[ classifiers=[
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",