Skip to content

Commit 6df505c

Browse files
committed
clarify module != package name
1 parent 5890eb2 commit 6df505c

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

release-test.sh

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
set -e
44
set -x
55

6-
proj=schema-salad
6+
package=schema-salad
7+
module=schema_salad
78
repo=https://github.com/common-workflow-language/schema_salad.git
8-
run_tests="py.test ${proj}"
9+
run_tests="py.test --pyarg ${module}"
910

1011
rm -Rf testenv? || /bin/true
1112

@@ -19,25 +20,25 @@ virtualenv testenv4
1920
source testenv1/bin/activate
2021
make install-dependencies
2122
make test
22-
pip uninstall -y ${proj} || true; pip uninstall -y ${proj} || true; make install
23-
mkdir testenv1/not-${proj}
24-
# if there is a subdir named '${proj}' py.test will execute tests
23+
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
24+
mkdir testenv1/not-${module}
25+
# if there is a subdir named '${module}' py.test will execute tests
2526
# there instead of the installed module's tests
26-
pushd testenv1/not-${proj}; ../bin/${run_tests}; popd
27+
pushd testenv1/not-${module}; ../bin/${run_tests}; popd
2728

2829

2930
# Secondly we test via pip
3031

3132
cd testenv2
3233
source bin/activate
3334
pip install -U setuptools==3.4.1
34-
pip install -e git+${repo}@${HEAD}#egg=${proj}
35-
cd src/${proj}
35+
pip install -e git+${repo}@${HEAD}#egg=${package}
36+
cd src/${package}
3637
make install-dependencies
3738
make dist
3839
make test
39-
cp dist/${proj}*tar.gz ../../../testenv3/
40-
pip uninstall -y ${proj} || true; pip uninstall -y ${proj} || true; make install
40+
cp dist/${package}*tar.gz ../../../testenv3/
41+
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
4142
cd ../.. # no subdir named ${proj} here, safe for py.testing the installed module
4243
bin/${run_tests}
4344

@@ -47,12 +48,12 @@ bin/${run_tests}
4748
cd ../testenv3/
4849
source bin/activate
4950
pip install -U setuptools==3.4.1
50-
pip install ${proj}*tar.gz
51+
pip install ${package}*tar.gz
5152
pip install nose
52-
tar xzf ${proj}*tar.gz
53-
cd ${proj}*
53+
tar xzf ${package}*tar.gz
54+
cd ${package}*
5455
make dist
5556
make test
56-
pip uninstall -y ${proj} || true; pip uninstall -y ${proj} || true; make install
57-
mkdir ../not-${proj}
58-
pushd ../not-${proj} ; ../bin/${run_tests}; popd
57+
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
58+
mkdir ../not-${module}
59+
pushd ../not-${module} ; ../bin/${run_tests}; popd

0 commit comments

Comments
 (0)