Skip to content

Commit

Permalink
fixup! fixup! fixup! feat: switch to github + bump library + bump pyt…
Browse files Browse the repository at this point in the history
…hon libraries
  • Loading branch information
vrenaville committed Sep 11, 2024
1 parent 4878cf1 commit 574555a
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
#odoo_serie: ["11.0","12.0", "13.0", "14.0", "15.0", "16.0", "17.0"]
odoo_serie: ["13.0"]
odoo_serie: ["12.0"]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion 12.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN set -x; \
&& /install/kwkhtml_client.sh \
&& /install/kwkhtml_client_force_python3.sh \
&& /install/dev_package.sh \
&& python3 -m pip install --force-reinstall pip \
&& python3 -m pip install --force-reinstall pip "setuptools<58" \
&& pip3 install -r /odoo/base_requirements.txt --ignore-installed \
&& /install/purge_dev_package_and_cache.sh

Expand Down
84 changes: 39 additions & 45 deletions 12.0/base_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,66 +3,60 @@
# sys_platform != 'win32'
# this is a copy of Odoo dependencies with some bumped versions
# unused official dependencies are commented to avoid dependabot alerts
Babel==2.3.4
Babel==2.6.0
chardet==3.0.4
decorator==4.0.10
docutils==0.12
decorator==4.3.0
docutils==0.14
ebaysdk==2.1.5
# gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7'
gevent==1.5.0 ; python_version >= '3.7'
# greenlet==0.4.10 ; python_version < '3.7'
greenlet==0.4.14 ; python_version >= '3.7'
html2text==2016.9.19
Jinja2==2.11.3 # official 2.10.1
libsass==0.12.3
gevent==22.10.2
greenlet==2.0.2
html2text==2018.1.9
Jinja2==3.1.4 # official 2.10.1
libsass==0.17.0
# lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7'
lxml==4.6.3 ; sys_platform != 'win32' and python_version >= '3.7' # official 4.2.3
lxml==4.6.3 ; sys_platform != 'win32' and python_version >= '3.7' # official 4.3.2
# lxml ; sys_platform == 'win32'
Mako==1.0.4
MarkupSafe==0.23
Mako==1.3.5
MarkupSafe==2.1.5 # official 1.1.0
mock==2.0.0
num2words==0.5.6
ofxparse==0.16
passlib==1.6.5
# Pillow==6.2.2 ; python_version < '3.7' # official 4.0.0
Pillow==8.1.1 ; python_version >= '3.7' # official 6.1.0
psutil==5.7.0; sys_platform != 'win32' # official 4.3.1
# psutil==5.6.3; sys_platform == 'win32'
psycopg2==2.8.3; sys_platform == 'win32' or python_version >= '3.8'
pydot==1.2.3
pyldap==2.4.28; sys_platform != 'win32'
pyparsing==2.1.10
num2words==0.5.10 # official 0.5.6
ofxparse==0.19
passlib==1.7.2 # official 1.7.1
Pillow==8.3.2 ; python_version < '3.7' or sys_platform != 'win32' # official 5.4.1
# Pillow==6.1.0 ; sys_platform == 'win32' and python_version >= '3.7'
polib==1.1.0
psutil==5.7.0; sys_platform != 'win32'
psycopg2==2.9.9; sys_platform == 'win32' or python_version >= '3.8'
pydot==1.4.1
python-ldap==3.2.0; sys_platform != 'win32' # official 3.1.0
pyparsing==2.2.0
PyPDF2==1.26.0
pyserial==3.1.1
python-dateutil==2.5.3
pyserial==3.4
python-dateutil==2.7.3
pytz==2024.1
pyusb==1.0.0
qrcode==5.3
pyusb==1.0.2
qrcode==6.1
reportlab==3.6.9
requests==2.20.0
suds-jurko==0.6
requests==2.25.1 # official 2.21.0
zeep==3.2.0
vatnumber==1.2
vobject==0.9.3
Werkzeug==0.16.0 ; sys_platform != 'win32' # official 0.11.15
# Werkzeug==0.16.0 ; sys_platform == 'win32'
XlsxWriter==0.9.3
vobject==0.9.6.1
Werkzeug==0.16.1 ; sys_platform != 'win32' # official 0.14.1
# Werkzeug==0.16.0 ; sys_platform == 'win32'
XlsxWriter==1.1.2
xlwt==1.3.*
xlrd==1.0.0
xlrd==1.1.0
# pypiwin32 ; sys_platform == 'win32'

# last version compatible with 2to3 (for vatnumber)
setuptools<58

# Not part of official requirements, but used by some addons
chardet==3.0.4
# colorama==0.3.9
gdata==2.0.18
html5lib==1.0.1
odfpy==1.3.5
odfpy==1.4.1
pyinotify==0.9.6
python-stdnum==1.9
simplejson==3.11.1
urllib3==1.24.2
python-stdnum==1.13
simplejson==3.17.0
urllib3==1.26.7

# Migration tools
marabunta==0.12.0
Expand Down Expand Up @@ -92,7 +86,7 @@ pbr==4.0.4
pexpect==4.6.0
ptyprocess==0.5.2
py==1.5.3
pycodestyle==2.3.1
pyflakes==1.6.0
pycodestyle==2.5.0
pyflakes==2.1.1
unicodecsv==0.14.1
wrapt==1.10.11
1 change: 0 additions & 1 deletion 12.0/extra_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ PyNaCl==1.2.1
pytesseract==0.2.2
regex==2018.6.9
s3transfer==0.1.13
suds-jurko==0.6
tzlocal==1.5.1
Unidecode==1.0.22
yarl==1.2.6

0 comments on commit 574555a

Please sign in to comment.