Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Python 3.10 and latest version of lxml 4 #402

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- 5432:5432/tcp
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.10"
- uses: actions/cache@v2
name: Cache dependencies
with:
Expand All @@ -49,10 +49,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.10"
- name: Install fabric
run: pip install fabric==2.5.0
- name: Install SSH key
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-codelists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
- name: Set up Python 3.10
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: "3.10"
- uses: actions/cache@v2
name: Cache python dependencies
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ Python Requirements

To update requirements, use pip-compile.

Make sure you are in a Python 3.8 virtual environment, and run:
Make sure you are in a Python 3.10 virtual environment, and run:

pip install pip-tools
pip-compile requirements.in
Expand Down
2 changes: 1 addition & 1 deletion iati_datastore/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Flask==1.1.2
Flask-SQLAlchemy==2.4.4
iatikit==3.3.1
lxml==4.6.2
lxml==4.9.4
python-dateutil==2.8.1
six==1.15.0
voluptuous>=0.12.0
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Flask==1.1.2
Flask-SQLAlchemy==2.4.4
iatikit==3.3.1
lxml==4.6.2
lxml==4.9.4
python-dateutil==2.8.1
six==1.15.0
voluptuous>=0.12.0
Expand Down
18 changes: 6 additions & 12 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements.in
#
Expand Down Expand Up @@ -71,7 +71,9 @@ gevent==21.12.0
# -r requirements.in
# iati-datastore
greenlet==1.1.2
# via gevent
# via
# gevent
# sqlalchemy
gunicorn==20.0.4
# via
# -r requirements.in
Expand All @@ -84,10 +86,6 @@ idna==2.10
# via requests
imagesize==1.3.0
# via sphinx
importlib-metadata==4.11.3
# via alembic
importlib-resources==5.7.1
# via alembic
itsdangerous==2.0.1
# via
# -r requirements.in
Expand All @@ -99,7 +97,7 @@ jinja2==3.0.3
# flask-babel
# pyexcelerate
# sphinx
lxml==4.6.2
lxml==4.9.4
# via
# -r requirements.in
# iati-datastore
Expand Down Expand Up @@ -213,10 +211,6 @@ xmltodict==0.12.0
# via
# -r requirements.in
# iati-datastore
zipp==3.8.0
# via
# importlib-metadata
# importlib-resources
zope-event==4.5.0
# via gevent
zope-interface==5.4.0
Expand Down
20 changes: 4 additions & 16 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile requirements_dev.in
#
Expand Down Expand Up @@ -109,6 +109,7 @@ greenlet==1.1.2
# via
# -r requirements.txt
# gevent
# sqlalchemy
gunicorn==20.0.4
# via
# -r requirements.txt
Expand All @@ -125,14 +126,6 @@ imagesize==1.3.0
# via
# -r requirements.txt
# sphinx
importlib-metadata==4.11.3
# via
# -r requirements.txt
# alembic
importlib-resources==5.7.1
# via
# -r requirements.txt
# alembic
itsdangerous==2.0.1
# via
# -r requirements.txt
Expand All @@ -144,7 +137,7 @@ jinja2==3.0.3
# flask-babel
# pyexcelerate
# sphinx
lxml==4.6.2
lxml==4.9.4
# via
# -r requirements.txt
# iati-datastore
Expand Down Expand Up @@ -310,11 +303,6 @@ xmltodict==0.12.0
# via
# -r requirements.txt
# iati-datastore
zipp==3.8.0
# via
# -r requirements.txt
# importlib-metadata
# importlib-resources
zope-event==4.5.0
# via
# -r requirements.txt
Expand Down
Loading