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 cgap-portal to pytest 7.2 (C4-183) #687

Draft
wants to merge 39 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
93fd6c6
WIP: This upgrades anew to pytest 4.5, which breaks testing.
netsettler Jan 28, 2021
578b9c9
Merge branch 'master' into kmp_C4-179_pycharm_support-checked_but_pyt…
netsettler Jan 28, 2021
bd479b8
WIP: Install the lock file from master. For debugging, it will be nec…
netsettler Jan 28, 2021
b2d45a0
Merge recent master.
netsettler Jan 20, 2023
493b1b1
Be resilient against lack of development.ini or test.ini
netsettler Jan 31, 2023
53a5728
Add makefile targets for test-full, test-unit-full and test-npm-full …
netsettler Jan 31, 2023
3e070f0
Update pyproject and poetry lock to accommodate pytest 7
netsettler Jan 31, 2023
8b1a008
Port delay_rerun back from Fourfront.
netsettler Jan 31, 2023
61267a1
Add make_testapp and friends, as well as context managers begin_neste…
netsettler Jan 31, 2023
6d23542
In conftest.py, replace yield_fixture with fixture, and add various n…
netsettler Jan 31, 2023
f9d08b9
Rearrange datafixtures to put fixtures common to cgap and fourfront a…
netsettler Jan 31, 2023
033b364
Make hidden_facet_test_data and bucket_range_data be module-scoped ra…
netsettler Jan 31, 2023
490b6ea
Rewrite some fixtures without yield_fixture in test_fixtures.py
netsettler Jan 31, 2023
77db6f2
Rewrite yield_fixture as fixture in test_generate_item_from_owl.py
netsettler Jan 31, 2023
3397313
Rewrite yield_fixture as fixture in test_ingestion_listener.py
netsettler Jan 31, 2023
1ef8706
Tentatively work past a potential indexing problem in test_create_map…
netsettler Jan 31, 2023
738549d
Account for what seems to be a timing error or need for forced indexi…
netsettler Jan 31, 2023
895cf22
Back-port from fourfront various fixes to src/encoded/tests/test_inde…
netsettler Jan 31, 2023
287154f
Merge branch 'master' into kmp_pytest_7.2
netsettler Jan 31, 2023
456f86b
Merge branch 'master' into kmp_pytest_7.2
netsettler Feb 13, 2023
add7b4e
Merge branch 'master' into kmp_pytest_7.2
netsettler Feb 16, 2023
2c700fb
Change some #'s to @#'s in Makefile to make PyCharm happy.
netsettler Feb 28, 2023
784e247
Make scripts/psql-start call prepare-local-dev if test.ini is missing.
netsettler Feb 28, 2023
b686854
PEP8 in src/encoded/server_defaults.py
netsettler Feb 28, 2023
bd37510
Add test-full, test-unit-full, and test-npm-full. Factor markers out …
netsettler Feb 28, 2023
626c9d0
Lock with poetry 1.1.15
netsettler Feb 28, 2023
c4ea17b
Support poetry 1.3.2
netsettler Feb 28, 2023
a466cb0
Don't load moto[server]==1.3.7 before poetry, just moto==4.0.3 in poe…
netsettler Feb 28, 2023
00f6d5c
Hopefully loadable lock.
netsettler Mar 13, 2023
dd5566f
Add path = "." to poetry.toml
netsettler Mar 13, 2023
d6de7fd
Better lock.
netsettler Mar 13, 2023
4b3686a
poetry 1.3.2, setuptools 67.6.0, wheel 0.38.4, pytest 7.2
netsettler Mar 13, 2023
d18ea7b
PEP8
netsettler Mar 13, 2023
e700146
Update docker for right version of poetry.
netsettler Mar 13, 2023
02ec0ae
Merge branch 'master' into kmp_pytest_7.2
netsettler Mar 23, 2023
010dc78
Merge branch 'master' into kmp_pytest_7.2
netsettler Mar 25, 2023
0ff7132
Some changes to prepare for an unrelated branch marge.
netsettler Mar 25, 2023
ca5c547
Merge branch 'kmp_misc_20230227_poetry-1-3-2' into kmp_pytest_7.2
netsettler Mar 25, 2023
78dae2a
Add a pytest marker.
netsettler Mar 25, 2023
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
Prev Previous commit
Next Next commit
Change some #'s to @#'s in Makefile to make PyCharm happy.
  • Loading branch information
netsettler committed Feb 28, 2023

Verified

This commit was signed with the committer’s verified signature.
niwis Nils Wistoff
commit 2c700fbfc9d803a1e8ee7e6e876bc14dc6e7a54b
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@ configure: # does any pre-requisite installs
@#pip install --upgrade pip==21.0.1
pip install --upgrade pip
@#pip install poetry==1.1.9 # this version is known to work. -kmp 11-Mar-2021
# Pin to version 1.1.15 for now to avoid this error:
# Because encoded depends on wheel (>=0.29.0) which doesn't match any versions, version solving failed.
@# Pin to version 1.1.15 for now to avoid this error:
@# Because encoded depends on wheel (>=0.29.0) which doesn't match any versions, version solving failed.
pip install poetry==1.1.15
pip install setuptools==57.5.0 # this version allows 2to3, any later will break -wrr 20-Sept-2021
poetry config virtualenvs.create false --local # do not create a virtualenv - the user should have already done this -wrr 20-Sept-2021