diff options
| author | drebs <drebs@leap.se> | 2016-07-07 11:56:33 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-07-12 03:09:30 +0200 |
| commit | 297ecdb24b238eff7e7674c7ab2df1f116007d7e (patch) | |
| tree | 6e5d10b5d2c7e12416a2582228528f3999a4ef16 | |
| parent | 41f65e3357011dbb7f510a6e87c6693bcc1d4edf (diff) | |
[pkg] remove unneeded dirspec exceptions
| -rwxr-xr-x | client/pkg/generate_wheels.sh | 2 | ||||
| -rwxr-xr-x | client/pkg/pip_install_requirements.sh | 2 | ||||
| -rw-r--r-- | client/pkg/requirements-latest.pip | 2 | ||||
| -rw-r--r-- | client/pkg/requirements.pip | 1 | ||||
| -rwxr-xr-x | common/pkg/generate_wheels.sh | 2 | ||||
| -rwxr-xr-x | common/pkg/pip_install_requirements.sh | 2 | ||||
| -rw-r--r-- | common/pkg/requirements-latest.pip | 1 | ||||
| -rwxr-xr-x | server/pkg/generate_wheels.sh | 2 | ||||
| -rwxr-xr-x | server/pkg/pip_install_requirements.sh | 2 | ||||
| -rw-r--r-- | server/pkg/requirements-latest.pip | 2 |
10 files changed, 6 insertions, 12 deletions
diff --git a/client/pkg/generate_wheels.sh b/client/pkg/generate_wheels.sh index 496f8e01..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 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 b97c826f..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="dirspec" +insecure_packages="" leap_wheelhouse=https://lizard.leap.se/wheels show_help() { diff --git a/client/pkg/requirements-latest.pip b/client/pkg/requirements-latest.pip index fa483db7..46a7ccba 100644 --- a/client/pkg/requirements-latest.pip +++ b/client/pkg/requirements-latest.pip @@ -1,7 +1,5 @@ --index-url https://pypi.python.org/simple/ ---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 9596470f..2ae844e1 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -2,4 +2,3 @@ pysqlcipher>2.6.3 scrypt zope.proxy twisted - diff --git a/common/pkg/generate_wheels.sh b/common/pkg/generate_wheels.sh index 496f8e01..a13e2c7a 100755 --- a/common/pkg/generate_wheels.sh +++ b/common/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 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/common/pkg/pip_install_requirements.sh b/common/pkg/pip_install_requirements.sh index b97c826f..f4b5f67a 100755 --- a/common/pkg/pip_install_requirements.sh +++ b/common/pkg/pip_install_requirements.sh @@ -4,7 +4,7 @@ # Use at your own risk. # See $usage for help -insecure_packages="dirspec" +insecure_packages="" leap_wheelhouse=https://lizard.leap.se/wheels show_help() { diff --git a/common/pkg/requirements-latest.pip b/common/pkg/requirements-latest.pip index 9b579503..396d77f1 100644 --- a/common/pkg/requirements-latest.pip +++ b/common/pkg/requirements-latest.pip @@ -1,5 +1,4 @@ --index-url https://pypi.python.org/simple/ ---allow-external dirspec --allow-unverified dirspec -e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' -e . diff --git a/server/pkg/generate_wheels.sh b/server/pkg/generate_wheels.sh index 496f8e01..a13e2c7a 100755 --- a/server/pkg/generate_wheels.sh +++ b/server/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 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/server/pkg/pip_install_requirements.sh b/server/pkg/pip_install_requirements.sh index b97c826f..f4b5f67a 100755 --- a/server/pkg/pip_install_requirements.sh +++ b/server/pkg/pip_install_requirements.sh @@ -4,7 +4,7 @@ # Use at your own risk. # See $usage for help -insecure_packages="dirspec" +insecure_packages="" leap_wheelhouse=https://lizard.leap.se/wheels show_help() { diff --git a/server/pkg/requirements-latest.pip b/server/pkg/requirements-latest.pip index fa483db7..46a7ccba 100644 --- a/server/pkg/requirements-latest.pip +++ b/server/pkg/requirements-latest.pip @@ -1,7 +1,5 @@ --index-url https://pypi.python.org/simple/ ---allow-external dirspec --allow-unverified dirspec - -e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' -e '../common' -e . |