Merge Develop -> Main for release 0.0.22#167
Merged
MrCreosote merged 31 commits intomainfrom Aug 16, 2022
Merged
Conversation
Create dependabot.yml
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.4 to 6.0. - [Release notes](https://github.com/yaml/pyyaml/releases) - [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES) - [Commits](yaml/pyyaml@5.4...6.0) --- updated-dependencies: - dependency-name: pyyaml dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Update Github Actions
Switch from gevent to default for gunicorn. We seem to be hitting errors with gevent.
trigger build.. It didn't build on this first commit.
Bump pyyaml from 5.4 to 6.0
Bumps [requests](https://github.com/psf/requests) from 2.20.0 to 2.28.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.20.0...v2.28.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bump requests from 2.20.0 to 2.28.0
Update start_server.sh
Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 19.9.0 to 20.1.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](benoitc/gunicorn@19.9.0...20.1.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bump gunicorn from 19.9.0 to 20.1.0
Bumps [flask](https://github.com/pallets/flask) from 1.0.2 to 2.1.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](pallets/flask@1.0.2...2.1.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
The tests were starting before the RE API was up. I hypothesize this explains the 1 pass / 1 fail pattern - the first test would fail because the server wasn't up, and the step that takes the server down wouldn't run. The next set of tests would pass, and take the server down, and so on and so forth.
Fix integration test failures
Update to python 3.10
... or alternately, sthu dependabot
Update dependencies
New field added to the NCBI taxa loader Still TODO add link to documenation explaining the reason for the change once it's merged into the importer repo Also updated jsonschema
Changed variable name col to coll in the test_fulltext_search_flags.py test to avoid ambiguity with "column". Added a link to the explanation of why there's a strain flag and a species_and_below flag in the queries.
Describe what it actually does Also remove what looks like refactoring cruft
Add species_or_below flag to sciname queries
Update collection specs for species_or_below field
Add release date prior to merge to master
Member
Author
|
Hmm, from the history it looks like the commits for 0.0.21 were copied from develop to main rather than merged, and so they're showing up here |
2 tasks
Sync main branch into develop to fix conflicts
ialarmedalien
approved these changes
Aug 16, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
For changes to the codebase: