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

Python 3.11 #2992

Merged
merged 23 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2eb9a7a
WIP upgrade python
maudetes May 4, 2023
f802b20
Add ipython flask shell in develop deps
maudetes Jun 26, 2023
06e9a84
Merge branch 'master' into chore/upgrade-python
maudetes Jul 27, 2023
a05ff2e
Upgrade deps to python3.10 compatible versions
maudetes Jul 27, 2023
6a1adc4
Modify import following deps upgrade
maudetes Jul 27, 2023
396387f
Recompile .pip deps and use pyyaml 6.0.1
maudetes Jul 27, 2023
f96b523
Update CI config with upcoming images
maudetes Jul 27, 2023
2d37aad
Upgrade cffi deps to prevent conflict
maudetes Sep 12, 2023
da8dde4
Replace deprecated flask_security get_token_status
maudetes Sep 12, 2023
7fe5b7f
Use udata/circleci correct image
maudetes Sep 12, 2023
5a1eac3
Fixed circleci config
maudetes Sep 12, 2023
fe888e0
Correct image used in assets in CI
maudetes Sep 12, 2023
a49cd9f
fix check_and_get_token_status usage
maudetes Sep 12, 2023
1882a4e
Upgrade to python 3.11
maudetes Oct 19, 2023
01db46f
Install wheel explicitly in CI
maudetes Oct 23, 2023
1ba392d
Merge master
ThibaudDauce Mar 19, 2024
9087823
Merge branch 'master' into python3.11
maudetes Apr 2, 2024
8f620a7
Merge branch 'master' into python3.11
ThibaudDauce Apr 8, 2024
de8b455
Merge branch 'master' into python3.11
ThibaudDauce Apr 8, 2024
0945328
Merge branch 'master' into python3.11
ThibaudDauce Apr 16, 2024
6082a7b
Merge branch 'master' into python3.11
ThibaudDauce Apr 17, 2024
c727247
Update changelog
ThibaudDauce Apr 18, 2024
31e0276
Merge branch 'master' into python3.11
ThibaudDauce Apr 22, 2024
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
13 changes: 6 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 2
jobs:
python:
docker:
- image: udata/circleci:2-alpine
- image: udata/circleci:py3.11
- image: mongo:6.0.4
- image: redis:alpine
environment:
Expand All @@ -24,11 +24,10 @@ jobs:
- py3-cache-v12-{{ arch }}-{{ .Environment.BASE_BRANCH }}
- run:
name: Install python dependencies
# FIXME: For now, we fix setuptools due to https://github.com/etalab/data.gouv.fr/issues/1041
command: |
virtualenv venv
python -m venv venv
source venv/bin/activate
pip install --force-reinstall setuptools==66.1.1
pip install --upgrade wheel
pip install -r requirements/develop.pip
pip install -e .
- save_cache:
Expand Down Expand Up @@ -59,7 +58,7 @@ jobs:
assets:
docker:
# TODO make an image based on 2-alpine w/ nvm and phantom deps
- image: udata/circleci:py3
- image: udata/circleci:py3.11
environment:
BASH_ENV: /root/.bashrc
steps:
Expand Down Expand Up @@ -103,7 +102,7 @@ jobs:

dist:
docker:
- image: udata/circleci:2-alpine
- image: udata/circleci:py3.11
environment:
BASH_ENV: /root/.bashrc
steps:
Expand Down Expand Up @@ -134,7 +133,7 @@ jobs:

publish:
docker:
- image: udata/circleci:2-alpine
- image: udata/circleci:py3.11
steps:
- attach_workspace:
at: .
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Current (in progress)

- **breaking change** Migrate to Python 3.11 [#2992](https://github.com/opendatateam/udata/pull/2992)
- **breaking change** Fix datetime serialization in extras (return ISO string in JSON). Warning, `ujson` shouldn't be installed anymore on the project to allow `cls` parameter to override the JSONEncoder [#3019](https://github.com/opendatateam/udata/pull/3019)
- Fix missing `bcrypt` dependency [#3019](https://github.com/opendatateam/udata/pull/3019)

Expand Down
4 changes: 0 additions & 4 deletions requirements/all.pip

This file was deleted.

3 changes: 2 additions & 1 deletion requirements/develop.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
-r test.in
-c test.pip

invoke==1.7.3
invoke==2.2.0
wheel
# Pinned Twine's version. The newest one pulls a version of the cryptography pkg that's make the CircleCi build fail.
twine==3.3.0
pre-commit==2.14.0
pip-tools==6.13.0
flask-shell-ipython==0.5.1
Loading