-
Notifications
You must be signed in to change notification settings - Fork 2
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
Move fourfront from pytest 2.9 to 3.10 #1435
Draft
netsettler
wants to merge
36
commits into
master
Choose a base branch
from
kmp_pytest_3.10
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tilities level. (Many are unused but may back other code we want to port.) Rename src/encoded/utils.py to src/encoded/util.py so these filenames will align again. Adjust files that import the renamed file. Also adjust test_indexing.py to use meta = MetaData(...); meta.reflect() instead of meta = MetaData(..., reflect=True).
…kibana-start-test and use poetry 1.1.4 in Makefile.
…ile.ZipFile) from cgap-portal version of scr/encoded/xlreader.py
… beause they'd be complicated to fix right now.
…src/encoded/tests/test_access_key.py
…on't special-case GET and HEAD methods.
…iverges. Add a TEST_PREFIX variable for symmetry. Compute the letter pairs needed for accession ids by looking at the schema files.
…CCEPT, which is more like what browsers would do and is needed for some ported changes from cgap-portal. Light PEP8. Remove pytest_plugins setting, which is deprecated; this info is now in pytest.ini. Change pytest.ini to have markers in line with cgap-portal, to use testpaths rather than a --pyargs setting, and to use -p to handle plugins.
…/renderers.py. Some PEP8.
…nge the way commits work to be more incremental.
netsettler
changed the title
Upgrade to pytest 3.10
Move fourfront from pytest 2.9 to 3.10
Feb 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR has been superseded by fourfront PR #1437.
Substantive changes and bug fixes:
In
src/encoded/authentication.py
GET
andHEAD
methods.pyproject.toml
pytest
to version 3.10 and related libraries in some ways.awscli
,boto3
,botocore
,netaddr
,boto3-stubs
.In
src/encoded/schema_formats.py
andsrc/encoded/server_defaults.py
:ACCESSION_PREFIX
variable to minimize number of places code diverges.TEST_PREFIX
variable for symmetry. Compute the letter pairs needed for accession ids by looking at the schema files.src/encoded/loadxl.py
post_only=
argument forload_all
andload_all_gen
.src/encoded/renderers.py
src/encoded/tests/conftest.py
htmltestapp
andanonhtmltestapp
to passHTTP_ACCEPT
, which is more like what browsers would do, and which is needed for changes ported from CGAP.pytest_plugins
setting, which is deprecated. This info is now inpytest.ini
.pytest.ini
testpaths
rather than a--pyargs
argument being added.-p
to handle plugins, in lieu of settingpytest_plugins
.src/encoded/tests/test_indexing.py
meta = MetaData(...); meta.reflect()
to instead bemeta = MetaData(..., reflect=True)
.Makefile
:scripts/kibana-start
andscripts/psql-start
scripts to support targetskibana-start-test
andpsql-test
, respectively.poetry 1.1.4
conftest.py
tempfile.tempdir
to'/tmp'
.src/encoded/commands/purge_item_type.py
Simple changes and small bug fixes (mostly found by better warnings):
Port new file
src/encoded/tests/test_renderers.py
from CGAP.src/encoded/types/page.py
src/encoded/tests/test_types_biosample.py
biosample_relation
as a fixture. It's just a function.Add support for rewriting
"~1.2.3"
insetup_eb.py
. Add test cases intest_setup_eb.py
.src/encoded/commands/spreadsheet_to_json.py
argparse
.src/encoded/xlreader.py
zipfile.ZipFile
).Relock
poetry.lock
.Rename
src/encoded/utils.py
back tosrc/encoded/util.py
for alignment with cgap-portal, and with history. Bad idea to have renamed it in the first place.Port various utilities that might not be used, just in case they're needed for other ports. We can clean this up later.
Update callers to import from
util
:src/encoded/types/file.py
src/encoded/tests/test_search.py
src/encoded/tests/test_types_init_collections.py
src/encoded/tests/test_types_protocol.py
src/encoded/tests/test_util.py
(wastest_utils.py
, but renamed as well)src/encoded/tests/test_validation_errors.py
src/encoded/tests/test_aggregation.py
src/encoded/tests/test_batch_download.py
Cosmetic changes:
Change
.encrypt
to.hash
insrc/encoded/tests/test_access_key.py
src/encoded/types/access_key.py
src/encoded/tests/test_edw_hash.py
Use
dcicutils.misc_utils.TestApp
instead ofwebtest.TestApp
in:src/encoded/commands/import_data.py
src/encoded/commands/load_access_keys.py
.ebextensions/13_run_npm.config
.gitignore
src/encoded/commands/configure_kibana_index.py
{'use_ssl': True}
.src/encoded/dev_servers.py
Also misc PEP8 in various files, including:
src/encoded/root.py