diff options
| author | drebs <drebs@leap.se> | 2016-11-10 23:50:30 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-11-10 23:50:30 -0200 |
| commit | c1950b41e0995b0213227bd0ce2c633f312037dc (patch) | |
| tree | 7c1fde54442fefd3553d33b3fe5a2ec454e0196b /client/pkg | |
| parent | 507e284773d9c4954225635741f275c5d327e2a9 (diff) | |
| parent | 6b23b3f3215f2443aa3e790559b63a41b3040072 (diff) | |
Merge tag '0.8.1'
0.8.1
Diffstat (limited to 'client/pkg')
| -rwxr-xr-x | client/pkg/generate_wheels.sh | 2 | ||||
| -rwxr-xr-x | client/pkg/pip_install_requirements.sh | 4 | ||||
| -rw-r--r-- | client/pkg/requirements-latest.pip | 3 | ||||
| -rw-r--r-- | client/pkg/requirements.pip | 7 |
4 files changed, 3 insertions, 13 deletions
diff --git a/client/pkg/generate_wheels.sh b/client/pkg/generate_wheels.sh index e29c327e..a13e2c7a 100755 --- a/client/pkg/generate_wheels.sh +++ b/client/pkg/generate_wheels.sh @@ -7,7 +7,7 @@ if [ "$WHEELHOUSE" = "" ]; then fi pip wheel --wheel-dir $WHEELHOUSE pip -pip wheel --wheel-dir $WHEELHOUSE --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec -r pkg/requirements.pip +pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements.pip if [ -f pkg/requirements-testing.pip ]; then pip wheel --wheel-dir $WHEELHOUSE -r pkg/requirements-testing.pip fi diff --git a/client/pkg/pip_install_requirements.sh b/client/pkg/pip_install_requirements.sh index d0479365..f4b5f67a 100755 --- a/client/pkg/pip_install_requirements.sh +++ b/client/pkg/pip_install_requirements.sh @@ -4,7 +4,7 @@ # Use at your own risk. # See $usage for help -insecure_packages="u1db dirspec" +insecure_packages="" leap_wheelhouse=https://lizard.leap.se/wheels show_help() { @@ -80,5 +80,5 @@ insecure_flags=`return_insecure_flags` packages=`return_packages` pip install -U wheel -pip install $install_options pip +pip install -U pip pip install $install_options $insecure_flags $packages diff --git a/client/pkg/requirements-latest.pip b/client/pkg/requirements-latest.pip index a629aa57..46a7ccba 100644 --- a/client/pkg/requirements-latest.pip +++ b/client/pkg/requirements-latest.pip @@ -1,8 +1,5 @@ --index-url https://pypi.python.org/simple/ ---allow-external u1db --allow-unverified u1db ---allow-external dirspec --allow-unverified dirspec - -e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' -e '../common' -e . diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index 2f658d76..2ae844e1 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -1,11 +1,4 @@ pysqlcipher>2.6.3 -u1db scrypt -cchardet zope.proxy twisted - -# XXX -- fix me! -# oauth is not strictly needed by us, but we need it until u1db adds it to its -# release as a dep. -oauth |