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

Add opendrr psra canada #211

Merged
merged 9 commits into from
Jun 20, 2022
Merged

Add opendrr psra canada #211

merged 9 commits into from
Jun 20, 2022

Conversation

jvanulde
Copy link
Contributor

No description provided.

Added PSRA Canada Agg Loss layers to pygeoapi
Added parameter to config to select version desired. Removed version from collection name.
@jvanulde jvanulde added this to the Sprint 60 milestone Jun 13, 2022
@jvanulde jvanulde requested a review from drotheram June 13, 2022 19:24
@jvanulde
Copy link
Contributor Author

@drotheram will this close or address #193?

@drotheram
Copy link
Contributor

Yes it should

@anthonyfok do you know the command to auto-fix these linting errors?

@jvanulde
Copy link
Contributor Author

@drotheram I patched the OPENAPI linter errors. Most of the errors had to do with a 'long' type for a variable. @wkhchow Did we change a variable type to 'long' recently? This type is not supported in OPENAPI so I had to manually change it to 'number'.

@wkhchow
Copy link
Contributor

wkhchow commented Jun 15, 2022

That's odd. Only recent var change was the varchar to float.
OpenDRR/model-factory#118

requirements.txt Outdated
@@ -1,10 +1,10 @@
elasticsearch==7.16.1
elasticsearch>=7.16.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, this could be a breaking change

Copy link
Member

@anthonyfok anthonyfok Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like replacing >= with the "compatible release operator" ~= would do the trick. For example, as of today:

  • pip3 install -U 'elasticsearch~=7.16.1' would install elasticsearch-7.16.3 for me, whereas
  • pip3 install -U 'elasticsearch>=7.16.1' would install/upgrade to elasticsearch-8.2.3
  • Running pip3 install -U 'elasticsearch~=7.16.1' again would downgrade to elasticsearch-7.16.3

And, finally, pip3 install -U 'elasticsearch~=7.16' would get us elasticsearch-7.17.4

References:

Copy link
Contributor

@drotheram drotheram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good with the exception of requirements.txt ES version

@drotheram drotheram merged commit d7e0eeb into master Jun 20, 2022
@drotheram drotheram deleted the add-opendrr-psra-canada branch June 20, 2022 18:21
@anthonyfok anthonyfok linked an issue Apr 2, 2024 that may be closed by this pull request
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add P/T PSRA data to ES and pygeoapi
4 participants