You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2020/12/12 17:46:03 UTC
[airflow] branch v2-0-test updated (c77bc2c -> e491f62)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a change to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.
discard c77bc2c Update default versions v2-0-test in the 2.0 branch (#12962)
add db02773 Changes release image preparation to use PyPI packages (#12990)
add 16d0ae7 Update sqlalchemy_jsonfield to avoid pkgresources use (#13032)
new e491f62 Update default versions v2-0-test in the 2.0 branch (#12962)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c77bc2c)
\
N -- N -- N refs/heads/v2-0-test (e491f62)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
BREEZE.rst | 6 +-
Dockerfile | 44 ++++--
Dockerfile.ci | 1 +
IMAGES.rst | 4 +-
breeze-complete | 8 -
dev/README_RELEASE_AIRFLOW.md | 122 +++++++++++++--
docs/apache-airflow/production-deployment.rst | 204 ++++++++++++--------------
docs/spelling_wordlist.txt | 1 +
scripts/ci/images/ci_build_dockerhub.sh | 95 ++++++++----
scripts/ci/libraries/_build_images.sh | 68 +++++----
scripts/ci/libraries/_initialization.sh | 18 ++-
scripts/in_container/_in_container_utils.sh | 7 +-
setup.cfg | 2 +-
13 files changed, 365 insertions(+), 215 deletions(-)
[airflow] 01/01: Update default versions v2-0-test in the 2.0
branch (#12962)
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e491f623e88739b4ae1f1564c4fd869ebf3cbee8
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Wed Dec 9 20:25:02 2020 +0100
Update default versions v2-0-test in the 2.0 branch (#12962)
---
Dockerfile | 2 +-
scripts/ci/libraries/_initialization.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index af7c07c..832769f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -160,7 +160,7 @@ ARG AIRFLOW_EXTRAS
ARG ADDITIONAL_AIRFLOW_EXTRAS=""
ENV AIRFLOW_EXTRAS=${AIRFLOW_EXTRAS}${ADDITIONAL_AIRFLOW_EXTRAS:+,}${ADDITIONAL_AIRFLOW_EXTRAS}
-ARG AIRFLOW_CONSTRAINTS_REFERENCE="constraints-master"
+ARG AIRFLOW_CONSTRAINTS_REFERENCE="constraints-2-0"
ARG AIRFLOW_CONSTRAINTS_LOCATION="https://raw.githubusercontent.com/apache/airflow/${AIRFLOW_CONSTRAINTS_REFERENCE}/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt"
ENV AIRFLOW_CONSTRAINTS_LOCATION=${AIRFLOW_CONSTRAINTS_LOCATION}
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index a30e186..f3d9474 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -199,8 +199,8 @@ function initialization::initialize_base_variables() {
# Determine current branch
function initialization::initialize_branch_variables() {
# Default branch used - this will be different in different branches
- export DEFAULT_BRANCH=${DEFAULT_BRANCH="master"}
- export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-master"}
+ export DEFAULT_BRANCH=${DEFAULT_BRANCH="v2-0-test"}
+ export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-2-0"}
readonly DEFAULT_BRANCH
readonly DEFAULT_CONSTRAINTS_BRANCH