Skip to content

Commit

Permalink
Issue 23: fix up setup.py (#24)
Browse files Browse the repository at this point in the history
* add a little more stuff to delivery and try using a patched version of pydot3.

Added README.md and LICENSE to the egg data directory just because. Seems better to have it all around than to not have it at all. Might be misguided.

Built a patched version of [pydot3](https://github.com/log0/pydot3) in my [fork of it](https://github.com/al-niessner/pydot3/releases/tag/1.0.10) then pushed it to PyPI as [dawgie-pydot3](https://pypi.org/project/dawgie-pydot3/1.0.10/). Once built and deployed, then changed this setup.py to depend upon it.

* fix vulnerability
  • Loading branch information
al-niessner authored Jul 28, 2019
1 parent 137cd79 commit 4d2808b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .ci/pypi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ fi

# sudo pip3 install -U twine wheel setuptools
export DAWGIE_VERSION=$1
#wdir=$(mkdtemp -d)
#cd $wdir
wdir=$(mkdtemp -d)
cd $wdir
cd Python
cp ../README.md README.md
cat ../COPYRIGHT.txt > LICENSE
Expand All @@ -55,7 +55,7 @@ echo "" >> LICENSE
cat ../LICENSE.txt >> LICENSE
python3 setup.py sdist bdist_wheel
twine check dist/*
twine upload --verbose --repository-url https://test.pypi.org/legacy/ dist/*
#twine upload --verbose --repository-url https://test.pypi.org/legacy/ dist/*
#twine upload --verbose dist/*
#cd -
#rm -rf $wdir
cd -
rm -rf $wdir
5 changes: 3 additions & 2 deletions Python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
deps = ['bokeh>=1.2',
'boto3>=1.7.80',
'cryptography>=2.1.4',
'dawgie-pydot3==1.0.10',
'GitPython>=2.1.11',
'matplotlib>=2.1.1',
'psycopg2>=2.7.4',
'pydot3==1.0.9',
'pyparsing>=2.2',
'python-gnupg==0.4.3',
'python-gnupg==0.4.4',
'pyxb==1.2.6',
'requests>=2.20.0',
'transitions==0.6.8',
Expand Down Expand Up @@ -105,6 +105,7 @@
"Operating System :: OS Independent",
'License :: Free To Use But Restricted',
'Development Status :: 5 - Production/Stable'],
data_files=[('.', ['LICENSE', 'README.md'])],
description='Data and Algorithm Work-flow Generation, Introspection, and Execution (DAWGIE)',
license='see LICENSE file for details',
long_description=description,
Expand Down

0 comments on commit 4d2808b

Please sign in to comment.