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.8 to 3.11 mongo 7.0 #6236

Open
wants to merge 116 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
21e34fb
Update pymongo and mongoengine to display deprecation warnings.
nzlosh Feb 28, 2024
1ad6c34
Bump version for py3.10 support
nzlosh Mar 6, 2024
634a7b3
Replace nose with pytest
nzlosh Mar 12, 2024
2102851
Remove unittest2, switch nosetest to pytest
nzlosh Mar 12, 2024
12b8254
update requirements
nzlosh Mar 12, 2024
071c2b0
Replace nosetest with pytest (without concurrency)
nzlosh Mar 12, 2024
a1d35a7
Fix for DeprecationWarning: Please use assertRaisesRegex
nzlosh Mar 12, 2024
ca7db1d
Fix DeprecationWarning: The 'warn' method is deprecated, use 'warning…
nzlosh Mar 12, 2024
4cbbdfc
Fix DeprecationWarning: Please use assertRegex instead.
nzlosh Mar 12, 2024
848d9c2
Fix for DeprecationWarning: Please use assertNotEqual instead.
nzlosh Mar 12, 2024
21ebac7
Fix for DeprecationWarning: the imp module is deprecated in favour of…
nzlosh Mar 13, 2024
7d3990e
Fix ssl_cert_reqs choices and update data type of newer version of os…
nzlosh Mar 13, 2024
9753982
Enable testing with py3.10
nzlosh Mar 13, 2024
a87373c
Fixed more DeprecationWarning: The 'warn' method is deprecated, use '…
nzlosh Mar 13, 2024
b4a915c
Bump kombu to add py3.10 support.
nzlosh Mar 13, 2024
6cda1dd
Regenerate pants lockfile with py3.10 support enabled.
nzlosh Mar 13, 2024
5dcc31c
Bump prompt-toolkit to 3.0.43 for py3.10 support
nzlosh Mar 13, 2024
be108b3
Replace 'warn' with 'warning' method
nzlosh Mar 13, 2024
d8657cc
Switch python-editor to editor for py3.10 support.
nzlosh Mar 13, 2024
e09c0ac
Update pants lockfiles with py3.10 support
nzlosh Mar 13, 2024
a5c0483
Bumped prance to 23.6.21.0 for py3.10 support.
nzlosh Mar 14, 2024
6b55018
Black formatting
nzlosh Mar 14, 2024
758eb65
Use pygment token in place of prompt_toolkit
nzlosh Mar 14, 2024
5116589
Relax pinning for amqp, update pants requirements to align with fixed…
nzlosh Mar 14, 2024
9913406
Remove editor.EditorError since editor defaults to output redirection…
nzlosh Mar 14, 2024
c5b1943
Update pygment to be included in st2client and bump argcomplete to su…
nzlosh Mar 14, 2024
45c256a
Update pants lockfile to include Pygment
nzlosh Mar 14, 2024
c574b29
Fix for DeprecationWarning: This method will be removed in Python 3.1…
nzlosh Mar 14, 2024
9f72797
Skip test_warn_on_bad_config_permissions when run as root user.
nzlosh Mar 14, 2024
861af2f
Skip test_get_cached_auth_token_invalid_permissions if run as root
nzlosh Mar 14, 2024
999aa4f
Test for alternative argparse text on py3.10 for test_help_command_li…
nzlosh Mar 14, 2024
bcc74d8
Bump semver for py3.10 and fix DeprecationWarning: Function semver.ma…
nzlosh Mar 14, 2024
6aaaaaf
Fix semver patch strip function and replace deprecated self.assertIte…
nzlosh Mar 14, 2024
2368557
Removed test for application_headers when no compression enabled.
nzlosh Mar 18, 2024
33af575
Fix bash syntax error in test_pause_resume_with_error
nzlosh Mar 19, 2024
c2d9d01
Bump Jinja2 + MarkupSafe to support py3.10
nzlosh Mar 19, 2024
2998a0d
Pytest compatibility - Add stub test files for local/remote runners t…
nzlosh Mar 19, 2024
02b7beb
Port fixed-requirements constraints to pants and regenerate lockfiles.
nzlosh Mar 21, 2024
0b0d677
Bump jinja2 to support py3.10 and remove nose from test requirements.
nzlosh Mar 26, 2024
ddf4fbb
Test: Bump pylint and astroid to latest 2.x
nzlosh Mar 27, 2024
de424bd
Remove options to fix pylint Unknown option value warning.
nzlosh Mar 29, 2024
2c15886
Fix Useless option value for W0142, W0232 and R0201
nzlosh Mar 29, 2024
12b9eda
Fix E0601: Using variable 'result' before assignment (used-before-ass…
nzlosh Mar 29, 2024
d18fb02
Bump linting tools and update pylint code for compatibility.
nzlosh Mar 29, 2024
a6a0bfd
Fix E721 do not compare types
nzlosh Mar 29, 2024
a804694
Initialise variables to avoid E0601: Use before assignment.
nzlosh Mar 29, 2024
bdfbd77
Bump pylint and astroid to support latest dnspython.
nzlosh Mar 31, 2024
15a2b6e
Update pylint calls for support 3.1
nzlosh Mar 31, 2024
48b1ced
Update requirements and pants lockfiles with module pinning for py3.8…
nzlosh Apr 2, 2024
4668ed5
Fix E0601: used-before-assign lint errors.
nzlosh Apr 3, 2024
02d2c3d
Disable linting on pants-plugins due to unresolvable conflicting cons…
nzlosh Apr 3, 2024
647fca8
Disable false alert on import error.
nzlosh Apr 3, 2024
1659e96
More dependency tweaks and update commandline for pip-compile
nzlosh Apr 3, 2024
9174603
Update pygment and redis pinning to avoid version conflicts in st2cli…
nzlosh Apr 4, 2024
e04e25e
Update launchdev.sh to use tmux instead of screen which is deprecated…
nzlosh Apr 8, 2024
7b17a85
Merge branch 'master' into mongo_upgrade
cognifloyd May 16, 2024
b928290
include py3.10 in pants lockfiles
cognifloyd May 2, 2024
3167134
loosen some fixed requirements
cognifloyd May 17, 2024
ec74e43
revert some pants changes
cognifloyd May 17, 2024
eb9d408
remove some constraints from lockfiles/st2-constraints.txt
cognifloyd May 17, 2024
4dbcc36
Regenerate lockfiles/st2.lock
cognifloyd May 17, 2024
bd629b4
update fixed-requirements.txt using versions from lockfiles/st2.lock
cognifloyd May 17, 2024
aba09f3
Remove std lib dep (argparse) from requirements
cognifloyd May 17, 2024
c9e2172
Merge branch 'mongo_upgrade' of github.com:nzlosh/st2
FileMagic Jul 15, 2024
a5087a1
[Broken] Attempt to add redis and add stdout printing to debug issues
FileMagic Aug 13, 2024
430a270
Inital commit based on changes from @nzlosh minus pants re-run and re…
FileMagic Aug 25, 2024
b80dd7e
Add back in some more requiremnent changes for tests.
FileMagic Aug 25, 2024
bf498c5
merge upstream changes
guzzijones Sep 6, 2024
af0e332
python 3.12; mongodb 7 working unit tests
guzzijones Sep 9, 2024
8fb707e
fix pants merge syntax error
guzzijones Sep 9, 2024
30e3a04
fix pants.toml.orig
guzzijones Sep 9, 2024
9b1d75f
fix merge conflict syntax error in build.orig
guzzijones Sep 9, 2024
48e07d0
remove BUILD.orig
guzzijones Sep 9, 2024
6900ff9
remove build.orig
guzzijones Sep 9, 2024
a5e6512
remove orig from conflict resolution
guzzijones Sep 9, 2024
c91ee41
remove more .orig from conflict merges
guzzijones Sep 9, 2024
d114898
remove more merge conflict files
guzzijones Sep 9, 2024
868720d
fix pytest cov
guzzijones Sep 10, 2024
05292f8
rerun requirements; rerun pants
guzzijones Sep 10, 2024
8e65316
add a note about conflicts to the readme. lockfiles are a nightmare
guzzijones Sep 10, 2024
820001d
enable redis
guzzijones Sep 10, 2024
863fd17
Revert "enable redis"
guzzijones Sep 10, 2024
f24533b
lint fixes
guzzijones Sep 10, 2024
6351c27
add back redis
guzzijones Sep 10, 2024
a10c8eb
already redis running integration job
guzzijones Sep 10, 2024
77ffa97
remove bad comment in ci
guzzijones Sep 10, 2024
8cf3923
pytest changes:
guzzijones Sep 10, 2024
2f840b9
add local runner test for pytest happyness
guzzijones Sep 10, 2024
baedd24
black
guzzijones Sep 10, 2024
a661075
add reason to skip
guzzijones Sep 11, 2024
6298a1d
add missing integration test for pytest
guzzijones Sep 11, 2024
0741dc7
pants lock update
guzzijones Sep 11, 2024
1a54d0b
add reason for pytest
guzzijones Sep 11, 2024
ac4f2aa
add reason
guzzijones Sep 11, 2024
657ffcb
attempt to change st2-run-packs-test with pytest instead of nose
guzzijones Sep 11, 2024
d6b337c
pants tailor
guzzijones Sep 11, 2024
02e2a60
add missing integration tests, fix st2-pack-test
guzzijones Sep 11, 2024
4779afa
remove erroneous file
guzzijones Sep 11, 2024
608ba98
change to pytest args for st2runpackstests
guzzijones Sep 11, 2024
64ba48a
st2-run-pack-tests
guzzijones Sep 11, 2024
3623211
st2 run packs changes
guzzijones Sep 11, 2024
f467b47
add reason to pytest
guzzijones Sep 11, 2024
8b539af
pytest does not support NODE_TOTAL
guzzijones Sep 11, 2024
6e7d9c6
mongo 7
guzzijones Sep 11, 2024
efe1e84
extend process execution max time for now
guzzijones Sep 11, 2024
bb75e8c
add action chain placeholder
guzzijones Sep 11, 2024
5990497
add target test for python_tests
guzzijones Sep 11, 2024
202a411
whitespace fixes
guzzijones Sep 11, 2024
5ad1538
remove 3.12; ubuntu doesn't even have an install yet for it
guzzijones Sep 12, 2024
d92b813
bump mongo
guzzijones Sep 13, 2024
7554091
remove notes
guzzijones Sep 13, 2024
2264db0
update orquesta; update requirements
guzzijones Sep 16, 2024
fc43493
Merge remote-tracking branch 'upstream/master' into python_3.8_to_3.10
guzzijones Sep 16, 2024
88785da
remove double import
guzzijones Sep 16, 2024
acefb9f
change orquesta
guzzijones Sep 16, 2024
7ecffd8
Merge branch 'master' into python_3.8_to_3.10
guzzijones Sep 16, 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
132 changes: 79 additions & 53 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@ jobs:
task: 'ci-compile'
python-version-short: '3.9'
python-version: '3.9.14'

- name: 'Lint Checks (black, flake8, etc.)'
task: 'ci-checks'
python-version-short: '3.10'
python-version: '3.10.15'
- name: 'Compile (pip deps, pylint, etc.)'
task: 'ci-compile'
python-version-short: '3.11'
python-version: '3.11.10'
env:
TASK: '${{ matrix.task }}'
COLUMNS: '120'
Expand Down Expand Up @@ -120,7 +127,7 @@ jobs:
python-version: '3.8.14'
services:
mongo:
image: mongo:4.4
image: mongo:7.0
ports:
- 27017:27017

Expand Down Expand Up @@ -252,30 +259,31 @@ jobs:
# NOTE: To speed the CI run, we split unit and integration tests into multiple jobs where
# each job runs subset of tests.
include:
- name: 'Unit Tests (chunk 1)'
- name: 'Unit Tests'
task: 'ci-unit'
nosetests_node_total: 2
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.8'
python-version: '3.8.10'
- name: 'Unit Tests (chunk 2)'
- name: 'Unit Tests'
task: 'ci-unit'
nosetests_node_total: 2
nosetests_node_index: 1
python-version-short: '3.8'
python-version: '3.8.10'
- name: 'Unit Tests (chunk 1)'
task: 'ci-unit'
nosetests_node_total: 2
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.9'
python-version: '3.9.14'
- name: 'Unit Tests (chunk 2)'
- name: 'Unit Tests'
task: 'ci-unit'
nosetests_node_total: 2
nosetests_node_index: 1
python-version-short: '3.9'
python-version: '3.9.14'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.10'
python-version: '3.10.15'
- name: 'Unit Tests'
task: 'ci-unit'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.11'
python-version: '3.11.10'

# This job is slow so we only run in on a daily basis
# - name: 'Micro Benchmarks'
# task: 'micro-benchmarks'
Expand All @@ -284,9 +292,22 @@ jobs:
# nosetests_node_ index: 0
services:
mongo:
image: mongo:4.4
image: mongo:7.0
ports:
- 27017:27017
redis-server:
# Docker Hub image
image: redis
# Set health checks to wait until redis has started
options: >-
--name "redis"
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 6379:6379/tcp


rabbitmq:
image: rabbitmq:3.8-management
Expand All @@ -300,8 +321,6 @@ jobs:
env:
TASK: '${{ matrix.task }}'
PYTHON_VERSION_SHORT: '${{ matrix.python-version-short }}'
NODE_TOTAL: '${{ matrix.nosetests_node_total }}'
NODE_INDEX: '${{ matrix.nosetests_node_index }}'

# We need to explicitly specify terminal width otherwise some CLI tests fail on container
# environments where small terminal size is used.
Expand Down Expand Up @@ -404,39 +423,51 @@ jobs:
nosetests_node_index: 0
python-version-short: '3.8'
python-version: '3.8.10'
- name: 'Integration Tests (chunk 1)'
- name: 'Integration Tests'
task: 'ci-integration'
nosetests_node_total: 2
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.8'
python-version: '3.8.10'
- name: 'Integration Tests (chunk 2)'
task: 'ci-integration'
nosetests_node_total: 2
nosetests_node_index: 1
python-version-short: '3.8'
python-version: '3.8.10'
- name: 'Pack Tests'
task: 'ci-packs-tests'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.9'
python-version: '3.9.14'
- name: 'Integration Tests (chunk 1)'
- name: 'Integration Tests'
task: 'ci-integration'
nosetests_node_total: 2
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.9'
python-version: '3.9.14'
- name: 'Integration Tests (chunk 2)'
python-version-short: '3.10'
python-version: '3.10.15'
- name: 'Pack Tests'
task: 'ci-packs-tests'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.10'
python-version: '3.10.15'
- name: 'Integration Tests'
task: 'ci-integration'
nosetests_node_total: 2
nosetests_node_index: 1
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.9'
python-version: '3.9.14'
- name: 'Pack Tests'
task: 'ci-packs-tests'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.11'
python-version: '3.11.10'
- name: 'Integration Tests'
task: 'ci-integration'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.11'
python-version: '3.11.10'
services:
mongo:
image: mongo:4.4
image: mongo:7.0
ports:
- 27017:27017

Expand Down Expand Up @@ -471,27 +502,22 @@ jobs:
#- 4369:4369/tcp # epmd
#

# Used for the coordination backend for integration tests
# NOTE: To speed things up, we only start redis for integration tests
# where it's needed
# redis:
# # Docker Hub image
# image: redis
# # Set health checks to wait until redis has started
# options: >-
# --name "redis"
# --health-cmd "redis-cli ping"
# --health-interval 10s
# --health-timeout 5s
# --health-retries 5
# ports:
# - 6379:6379/tcp
#redis-server:
# # Docker Hub image
# image: redis
# # Set health checks to wait until redis has started
# options: >-
# --name "redis"
# --health-cmd "redis-cli ping"
# --health-interval 10s
# --health-timeout 5s
# --health-retries 5
# ports:
# - 6379:6379/tcp

env:
TASK: '${{ matrix.task }}'
PYTHON_VERSION_SHORT: '${{ matrix.python-version-short }}'
NODE_TOTAL: '${{ matrix.nosetests_node_total }}'
NODE_INDEX: '${{ matrix.nosetests_node_index }}'

# We need to explicitly specify terminal width otherwise some CLI tests fail on container
# environments where small terminal size is used.
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/microbenchmarks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,21 @@ jobs:
nosetests_node_index: 0
python-version-short: '3.9'
python-version: '3.9.14'
- name: 'Microbenchmarks'
task: 'micro-benchmarks'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.10'
python-version: '3.10.15'
- name: 'Microbenchmarks'
task: 'micro-benchmarks'
nosetests_node_total: 1
nosetests_node_index: 0
python-version-short: '3.11'
python-version: '3.11.10'
services:
mongo:
image: mongo:4.4
image: mongo:7.0
ports:
- 27017:27017

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/orquesta-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
python-version: '3.9.14'
services:
mongo:
image: mongo:4.4
image: mongo:7.0
ports:
- 27017:27017

Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ jobs:
- name: 'Test (pants runs: pytest)'
python-version-short: '3.9'
python-version: '3.9.14'
- name: 'Test (pants runs: pytest)'
python-version-short: '3.10'
python-version: '3.10.15'
- name: 'Test (pants runs: pytest)'
python-version-short: '3.11'
python-version: '3.11.10'


services:
mongo:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ Changed
* Fix misc DeprecationWarnings to prepare for python 3.10 support. #6188 (by @nzlosh)
* Update st2client deps: editor and prompt-toolkit. #6189 (by @nzlosh)
* Updated dependency oslo.config to prepare for python 3.10 support. #6193 (by @nzlosh)
* Support for Python3.8, Python3.9 and Python3.10. Update underlying modules and
remove modules that weren't compatible with newer versions of Python. #6157

* Support for Python3.8, Python3.9 and Python3.10. Update underlying modules and
remove modules that weren't compatible with newer versions of Python. #6157

Added
~~~~~
Expand Down
Loading
Loading