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

Document process for bringing changes over from master #1478

Merged
merged 1 commit into from Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
132 changes: 72 additions & 60 deletions docker/constraints.txt
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --strip-extras docker/constraints.in
# pip-compile --strip-extras constraints.in
#
affine==2.4.0
# via
# -r docker/constraints.in
# -r constraints.in
# odc-geo
# rasterio
alabaster==0.7.13
Expand All @@ -19,30 +19,31 @@ async-timeout==4.0.2
# via redis
attrs==22.2.0
# via
# -r docker/constraints.in
# -r constraints.in
# fiona
# hypothesis
# jsonschema
# pytest
# rasterio
# referencing
babel==2.11.0
# via sphinx
bleach==6.0.0
# via readme-renderer
boto3==1.26.70
# via
# -r docker/constraints.in
# -r constraints.in
# moto
botocore==1.29.70
# via
# boto3
# moto
# s3transfer
bottleneck==1.3.6
# via -r docker/constraints.in
# via -r constraints.in
cachetools==5.3.0
# via
# -r docker/constraints.in
# -r constraints.in
# odc-geo
certifi==2022.12.7
# via
Expand All @@ -62,10 +63,10 @@ cftime==1.6.2
charset-normalizer==3.0.1
# via requests
ciso8601==2.3.0
# via -r docker/constraints.in
# via -r constraints.in
click==8.1.3
# via
# -r docker/constraints.in
# -r constraints.in
# click-plugins
# cligj
# dask
Expand All @@ -83,13 +84,13 @@ cligj==0.7.2
# rasterio
cloudpickle==2.2.1
# via
# -r docker/constraints.in
# -r constraints.in
# dask
# distributed
commonmark==0.9.1
# via recommonmark
compliance-checker==4.3.4
# via -r docker/constraints.in
# via -r constraints.in
contourpy==1.0.7
# via matplotlib
coverage==7.1.0
Expand All @@ -102,48 +103,47 @@ cycler==0.11.0
# via matplotlib
dask==2023.2.0
# via
# -r docker/constraints.in
# -r constraints.in
# distributed
decorator==5.1.1
# via validators
deprecat==2.1.1
# via -r constraints.in
distributed==2023.2.0
# via -r docker/constraints.in
# via -r constraints.in
docutils==0.18.1
# via
# readme-renderer
# recommonmark
# sphinx
# sphinx-click
# sphinx-rtd-theme
exceptiongroup==1.1.2
# via
# hypothesis
# pytest
fiona==1.9.1
# via -r docker/constraints.in
# via -r constraints.in
fonttools==4.38.0
# via matplotlib
fsspec==2023.1.0
# via dask
geoalchemy2==0.13.1
# via -r docker/constraints.in
# via -r constraints.in
greenlet==2.0.2
# via sqlalchemy
heapdict==1.0.1
# via zict
hypothesis==6.68.1
# via -r docker/constraints.in
# via -r constraints.in
idna==3.4
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.0.0
# via
# keyring
# sphinx
# twine
importlib-resources==5.10.2
# via
# jsonschema
# keyring
iniconfig==2.0.0
# via pytest
isodate==0.6.1
Expand All @@ -167,14 +167,16 @@ jmespath==1.0.1
# via
# boto3
# botocore
jsonschema==4.17.3
# via -r docker/constraints.in
jsonschema==4.18.4
# via -r constraints.in
jsonschema-specifications==2023.7.1
# via jsonschema
keyring==23.13.1
# via twine
kiwisolver==1.4.4
# via matplotlib
lark==1.1.5
# via -r docker/constraints.in
# via -r constraints.in
lazy-object-proxy==1.4.3
# via astroid
locket==1.0.0
Expand All @@ -190,26 +192,26 @@ markupsafe==2.1.2
# jinja2
# werkzeug
matplotlib==3.7.0
# via -r docker/constraints.in
# via -r constraints.in
mccabe==0.6.1
# via pylint
mdurl==0.1.2
# via markdown-it-py
more-itertools==9.0.0
# via jaraco-classes
moto==4.1.2
# via -r docker/constraints.in
# via -r constraints.in
msgpack==1.0.4
# via distributed
munch==2.5.0
# via fiona
netcdf4==1.6.2
# via
# -r docker/constraints.in
# -r constraints.in
# compliance-checker
numpy==1.24.2
# via
# -r docker/constraints.in
# -r constraints.in
# bottleneck
# cf-units
# cftime
Expand All @@ -223,7 +225,7 @@ numpy==1.24.2
# snuggs
# xarray
odc-geo==0.3.3
# via -r docker/constraints.in
# via -r constraints.in
owslib==0.27.2
# via compliance-checker
packaging==23.0
Expand All @@ -246,16 +248,14 @@ pillow==9.4.0
# via matplotlib
pkginfo==1.9.6
# via twine
pkgutil-resolve-name==1.3.10
# via jsonschema
pluggy==1.0.0
# via pytest
psutil==5.9.4
# via distributed
psycopg2==2.9.5
# via -r docker/constraints.in
# via -r constraints.in
pycodestyle==2.5.0
# via -r docker/constraints.in
# via -r constraints.in
pycparser==2.21
# via cffi
pygeoif==1.0.0
Expand All @@ -266,32 +266,30 @@ pygments==2.14.0
# rich
# sphinx
pylint==2.4.4
# via -r docker/constraints.in
# via -r constraints.in
pyparsing==3.0.9
# via
# matplotlib
# snuggs
pyproj==3.4.1
# via
# -r docker/constraints.in
# -r constraints.in
# compliance-checker
# odc-geo
pyrsistent==0.19.3
# via jsonschema
pytest==7.2.1
# via
# -r docker/constraints.in
# -r constraints.in
# pytest-cov
# pytest-timeout
pytest-cov==4.0.0
# via -r docker/constraints.in
# via -r constraints.in
pytest-httpserver==1.0.6
# via -r docker/constraints.in
# via -r constraints.in
pytest-timeout==2.1.0
# via -r docker/constraints.in
# via -r constraints.in
python-dateutil==2.8.2
# via
# -r docker/constraints.in
# -r constraints.in
# botocore
# matplotlib
# moto
Expand All @@ -307,18 +305,22 @@ pytzdata==2020.1
# via pendulum
pyyaml==6.0
# via
# -r docker/constraints.in
# -r constraints.in
# dask
# distributed
# owslib
rasterio==1.3.6
# via -r docker/constraints.in
# via -r constraints.in
readme-renderer==37.3
# via twine
recommonmark==0.7.1
# via -r docker/constraints.in
# via -r constraints.in
redis==4.5.1
# via -r docker/constraints.in
# via -r constraints.in
referencing==0.30.0
# via
# jsonschema
# jsonschema-specifications
regex==2022.10.31
# via compliance-checker
requests==2.28.2
Expand All @@ -338,17 +340,23 @@ rfc3986==2.0.0
# via twine
rich==13.3.1
# via twine
rpds-py==0.9.2
# via
# jsonschema
# referencing
ruamel-yaml==0.17.21
# via -r docker/constraints.in
# via -r constraints.in
ruamel-yaml-clib==0.2.7
# via ruamel-yaml
s3transfer==0.6.0
# via boto3
secretstorage==3.3.3
# via keyring
setuptools-scm==7.1.0
# via -r docker/constraints.in
# via -r constraints.in
shapely==2.0.1
# via
# -r docker/constraints.in
# -r constraints.in
# odc-geo
six==1.16.0
# via
Expand All @@ -367,17 +375,17 @@ sortedcontainers==2.4.0
# hypothesis
sphinx==5.3.0
# via
# -r docker/constraints.in
# -r constraints.in
# recommonmark
# sphinx-autodoc-typehints
# sphinx-click
# sphinx-rtd-theme
sphinx-autodoc-typehints==1.22
# via -r docker/constraints.in
# via -r constraints.in
sphinx-click==4.4.0
# via -r docker/constraints.in
# via -r constraints.in
sphinx-rtd-theme==1.2.0
# via -r docker/constraints.in
# via -r constraints.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
sphinxcontrib-devhelp==1.0.2
Expand All @@ -394,30 +402,34 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sqlalchemy==2.0.8
# via
# -r docker/constraints.in
# -r constraints.in
# geoalchemy2
tblib==1.7.0
# via distributed
toml==0.10.2
# via
# -r docker/constraints.in
# -r constraints.in
# responses
tomli==2.0.1
# via
# coverage
# pytest
# setuptools-scm
toolz==0.12.0
# via
# -r docker/constraints.in
# -r constraints.in
# dask
# distributed
# partd
tornado==6.2
# via distributed
twine==4.0.2
# via -r docker/constraints.in
# via -r constraints.in
types-toml==0.10.8.3
# via responses
typing-extensions==4.4.0
# via
# pygeoif
# rich
# setuptools-scm
# sqlalchemy
urllib3==1.26.14
Expand All @@ -436,13 +448,13 @@ werkzeug==2.2.2
# moto
# pytest-httpserver
wheel==0.38.4
# via -r docker/constraints.in
# via -r constraints.in
wrapt==1.11.2
# via
# astroid
# deprecat
xarray==2023.2.0
# via -r docker/constraints.in
# via -r constraints.in
xmltodict==0.13.0
# via moto
zict==2.2.0
Expand Down
9 changes: 9 additions & 0 deletions docs/about/develop-1.9.rst
@@ -0,0 +1,9 @@
Process for porting 1.8 updates into 1.9

For admins only:

1. cherry-pick the merged PR commits from develop into develop-1.9
2. Regenerate constraints.txt if constraints.in has been touched and commit.
3. force-push to develop-1.9 (before 1.9.0 release only)

After 1.9.0 release, go through a full PR process.