You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/03/09 21:15:41 UTC
[GitHub] [airflow] ashb opened a new pull request #14688: Prepare to rename master branch for main.
ashb opened a new pull request #14688:
URL: https://github.com/apache/airflow/pull/14688
Part of #12982
There are many more references to "master" (even in our own repo) than
this, but this commit is the first step: to that process.
It makes CI run on the main branch (once it exists), re-words a few
cases where we can to easily not refer to master anymore.
This doesn't yet re-name the `constraints-master` or `master-*` images -
that will be done in a future PR.
(We don't be able to entirely eliminate "master" from our repo as we
refer to a lot of other GitHub repos that we can't change.)
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb merged pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
ashb merged pull request #14688:
URL: https://github.com/apache/airflow/pull/14688
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#issuecomment-795266232
[The Workflow run](https://github.com/apache/airflow/actions/runs/638990167) is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r594497889
##########
File path: docs/conf.py
##########
@@ -76,10 +76,10 @@
except StopIteration:
raise Exception(f"Could not find provider.yaml file for package: {PACKAGE_NAME}")
PACKAGE_DIR = CURRENT_PROVIDER['package-dir']
- PACKAGE_VERSION = 'master'
+ PACKAGE_VERSION = 'devel'
Review comment:
Can change it if you'd like
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r593135413
##########
File path: docs/conf.py
##########
@@ -76,10 +76,10 @@
except StopIteration:
raise Exception(f"Could not find provider.yaml file for package: {PACKAGE_NAME}")
PACKAGE_DIR = CURRENT_PROVIDER['package-dir']
- PACKAGE_VERSION = 'master'
+ PACKAGE_VERSION = 'devel'
Review comment:
Wait are we naming it `devel` or `main` ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r594497705
##########
File path: docs/conf.py
##########
@@ -76,10 +76,10 @@
except StopIteration:
raise Exception(f"Could not find provider.yaml file for package: {PACKAGE_NAME}")
PACKAGE_DIR = CURRENT_PROVIDER['package-dir']
- PACKAGE_VERSION = 'master'
+ PACKAGE_VERSION = 'devel'
Review comment:
Branch was going to be main, I was thinking that "main" in the docs isn't clear enough though.
It appears we don't actually show this anywhere though, so it's probably moot?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#issuecomment-795367813
[The Workflow run](https://github.com/apache/airflow/actions/runs/639169547) is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r594500725
##########
File path: docs/conf.py
##########
@@ -76,10 +76,10 @@
except StopIteration:
raise Exception(f"Could not find provider.yaml file for package: {PACKAGE_NAME}")
PACKAGE_DIR = CURRENT_PROVIDER['package-dir']
- PACKAGE_VERSION = 'master'
+ PACKAGE_VERSION = 'devel'
Review comment:
Yeah since we don't use RTD, it does matter I guess
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#issuecomment-794467386
[The Workflow run](https://github.com/apache/airflow/actions/runs/637179655) is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] jedcunningham commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
jedcunningham commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r591935257
##########
File path: Dockerfile
##########
@@ -203,8 +203,8 @@ ENV AIRFLOW_PRE_CACHED_PIP_PACKAGES=${AIRFLOW_PRE_CACHED_PIP_PACKAGES}
ARG INSTALL_PROVIDERS_FROM_SOURCES="false"
ENV INSTALL_PROVIDERS_FROM_SOURCES=${INSTALL_PROVIDERS_FROM_SOURCES}
-# Only copy install_airflow_from_latest_master.sh to not invalidate cache on other script changes
-COPY scripts/docker/install_airflow_from_latest_master.sh /scripts/docker/install_airflow_from_latest_master.sh
+# Only copy install_airflow_frombranch_tip.sh to not invalidate cache on other script changes
Review comment:
nit: missing underscore, should be `install_airflow_from_branch_tip.sh`
##########
File path: Dockerfile.ci
##########
@@ -292,8 +292,8 @@ ENV PIP_PROGRESS_BAR=${PIP_PROGRESS_BAR}
RUN pip install --no-cache-dir --upgrade "pip==${AIRFLOW_PIP_VERSION}"
-# Only copy install_airflow_from_latest_master.sh to not invalidate cache on other script changes
-COPY scripts/docker/install_airflow_from_latest_master.sh /scripts/docker/install_airflow_from_latest_master.sh
+# Only copy install_airflow_from_latest_main.sh to not invalidate cache on other script changes
Review comment:
nit: should be `install_airflow_from_branch_tip.sh`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#issuecomment-799569836
The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r592736877
##########
File path: Dockerfile.ci
##########
@@ -292,8 +292,8 @@ ENV PIP_PROGRESS_BAR=${PIP_PROGRESS_BAR}
RUN pip install --no-cache-dir --upgrade "pip==${AIRFLOW_PIP_VERSION}"
-# Only copy install_airflow_from_latest_master.sh to not invalidate cache on other script changes
-COPY scripts/docker/install_airflow_from_latest_master.sh /scripts/docker/install_airflow_from_latest_master.sh
+# Only copy install_airflow_from_latest_main.sh to not invalidate cache on other script changes
Review comment:
Fixed, thanks
##########
File path: Dockerfile
##########
@@ -203,8 +203,8 @@ ENV AIRFLOW_PRE_CACHED_PIP_PACKAGES=${AIRFLOW_PRE_CACHED_PIP_PACKAGES}
ARG INSTALL_PROVIDERS_FROM_SOURCES="false"
ENV INSTALL_PROVIDERS_FROM_SOURCES=${INSTALL_PROVIDERS_FROM_SOURCES}
-# Only copy install_airflow_from_latest_master.sh to not invalidate cache on other script changes
-COPY scripts/docker/install_airflow_from_latest_master.sh /scripts/docker/install_airflow_from_latest_master.sh
+# Only copy install_airflow_frombranch_tip.sh to not invalidate cache on other script changes
Review comment:
Fixed, thanks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#discussion_r593136334
##########
File path: docs/conf.py
##########
@@ -76,10 +76,10 @@
except StopIteration:
raise Exception(f"Could not find provider.yaml file for package: {PACKAGE_NAME}")
PACKAGE_DIR = CURRENT_PROVIDER['package-dir']
- PACKAGE_VERSION = 'master'
+ PACKAGE_VERSION = 'devel'
Review comment:
It would good to have the same name in the docs as the branch name
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #14688: Prepare to rename master branch for main.
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #14688:
URL: https://github.com/apache/airflow/pull/14688#issuecomment-794542516
Need to work out how to make this pass with scripts from master but Dockerfile from this branch.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org