Skip to content

Commit 9860b46

Browse files
committed
[FIX] Installation of psycopg2 for python 3.6
Disable tests for Odoo 17 for now
1 parent 2444f31 commit 9860b46

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

lib/install.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ function install_odoo_py_requirements_for_version {
532532
fi
533533
elif [ "$odoo_major_version" -lt 11 ] && [[ "$dependency_stripped" =~ psycopg2* ]]; then
534534
echo "psycopg2==2.8.6";
535-
elif [[ "$dependency_stripped" =~ psycopg2* ]] && exec_py -c "import sys; assert sys.version_info <= (3, 5);" > /dev/null 2>&1; then
535+
elif [[ "$dependency_stripped" =~ psycopg2* ]] && exec_py -c "import sys; assert sys.version_info <= (3, 6);" > /dev/null 2>&1; then
536536
echo "psycopg2-binary==2.8.6";
537537
elif [[ "$dependency_stripped" =~ psycopg2* ]]; then
538538
echo "psycopg2-binary";

tests/test.bash

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -977,60 +977,60 @@ odoo-helper test bureaucrat_knowledge
977977
odoo-helper db drop odoo16-odoo-test;
978978

979979

980-
echo -e "${YELLOWC}
981-
=================================
982-
Install and check Odoo 17.0 (Py3)
983-
=================================
984-
${NC}"
980+
#echo -e "${YELLOWC}
981+
#=================================
982+
#Install and check Odoo 17.0 (Py3)
983+
#=================================
984+
#${NC}"
985985

986-
cd ../;
986+
#cd ../;
987987

988-
# Remove odoo 17
989-
# this is needed to bypass gitlab.com limitation of disk space for CI jobs
990-
rm -rf ./odoo-16.0
988+
## Remove odoo 17
989+
## this is needed to bypass gitlab.com limitation of disk space for CI jobs
990+
#rm -rf ./odoo-16.0
991991

992-
# Install odoo 16
993-
odoo-helper install sys-deps -y 17.0;
992+
## Install odoo 17
993+
#odoo-helper install sys-deps -y 17.0;
994994

995-
odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \
996-
--http-port 8569 --http-host local-odoo-16 \
997-
--db-user odoo16 --db-pass odoo --create-db-user \
998-
--build-python-if-needed
995+
#odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \
996+
#--http-port 8569 --http-host local-odoo-16 \
997+
#--db-user odoo16 --db-pass odoo --create-db-user \
998+
#--build-python-if-needed
999999

1000-
cd odoo-17.0;
1000+
#cd odoo-17.0;
10011001

1002-
# Install py-tools and js-tools
1003-
odoo-helper install py-tools;
1004-
odoo-helper install js-tools;
1002+
## Install py-tools and js-tools
1003+
#odoo-helper install py-tools;
1004+
#odoo-helper install js-tools;
10051005

1006-
odoo-helper server run --stop-after-init; # test that it runs
1006+
#odoo-helper server run --stop-after-init; # test that it runs
10071007

1008-
# Show project status
1009-
odoo-helper status;
1010-
odoo-helper server status;
1011-
odoo-helper start;
1012-
odoo-helper ps;
1013-
odoo-helper status;
1014-
odoo-helper server status;
1015-
odoo-helper stop;
1008+
## Show project status
1009+
#odoo-helper status;
1010+
#odoo-helper server status;
1011+
#odoo-helper start;
1012+
#odoo-helper ps;
1013+
#odoo-helper status;
1014+
#odoo-helper server status;
1015+
#odoo-helper stop;
10161016

1017-
# Show complete odoo-helper status
1018-
odoo-helper status --tools-versions --ci-tools-versions;
1017+
## Show complete odoo-helper status
1018+
#odoo-helper status --tools-versions --ci-tools-versions;
10191019

1020-
# Database management
1021-
odoo-helper db create --tdb --lang en_US;
1020+
## Database management
1021+
#odoo-helper db create --tdb --lang en_US;
10221022

1023-
odoo-helper addons update-list --tdb;
1024-
odoo-helper addons install --tdb --module crm;
1025-
odoo-helper addons test-installed crm;
1023+
#odoo-helper addons update-list --tdb;
1024+
#odoo-helper addons install --tdb --module crm;
1025+
#odoo-helper addons test-installed crm;
10261026

1027-
odoo-helper lsd; # List databases
1027+
#odoo-helper lsd; # List databases
10281028

1029-
## Install addon website via 'odoo-helper install'
1030-
odoo-helper install website;
1029+
### Install addon website via 'odoo-helper install'
1030+
#odoo-helper install website;
10311031

1032-
# Drop created databases
1033-
odoo-helper db drop odoo17-odoo-test;
1032+
## Drop created databases
1033+
#odoo-helper db drop odoo17-odoo-test;
10341034

10351035

10361036
echo -e "${YELLOWC}

0 commit comments

Comments
 (0)