Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

adjusted env var in setup.py to work with hammer deploys #1

Open
wants to merge 1 commit into
base: v1-10-stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[OPTORO INTERNAL] AIRFLOW 1.10.2, 2018-12-03
Added os.environ["SLUGIFY_USES_TEXT_UNIDECODE"] = "yes" to setup.py to get around not being able to specify it while building with mc-hammer.

AIRFLOW 1.10.1, 2018-11-13

New features:
Expand Down
2 changes: 1 addition & 1 deletion airflow/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
# under the License.
#

version = '1.10.1'
version = '1.10.2'
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@

# See LEGAL-362
def verify_gpl_dependency():
# The Read the Docs build environment [1] does a pip install of Airflow which cannot
# be overridden with custom environment variables, so we detect the READTHEDOCS env
# var they provide to set the env var that avoids the GPL dependency on install when
# building the docs site.
# [1]: http://docs.readthedocs.io/en/latest/builds.html#build-environment
if os.getenv("READTHEDOCS") == "True":
os.environ["SLUGIFY_USES_TEXT_UNIDECODE"] = "yes"
"""
Deploying Airflow with mc-hammer doesn't allow the setting
of arbitrary env vars before Airflow is installed. By making
SLUGIFY_USES_TEXT_UNIDECODE the default, we're hoping to get
around this.
"""
os.environ["SLUGIFY_USES_TEXT_UNIDECODE"] = "yes"

if (not os.getenv("AIRFLOW_GPL_UNIDECODE")
and not os.getenv("SLUGIFY_USES_TEXT_UNIDECODE") == "yes"):
Expand Down