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.

Sign up for GitHub

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

Jump to bottom

Updated the build to match the website changes: #2034

Merged
merged 3 commits into from Jul 27, 2017
Merged

Updated the build to match the website changes: #2034

merged 3 commits into from Jul 27, 2017

Conversation

tpoterba
Copy link
Contributor

  • fixed structure of docs + links (hail/* -> docs/stable/*)
  • Added Hail version + supported spark versions + git hash as gradle variables
  • Used these versions in Sphinx.
  • Changed path of distribution links in getting started to point at current hash.

@tpoterba
Updated the build to match the website changes:
d7998fd 
 - fixed structure of docs + links (hail/* -> docs/stable/*)
 - Added Hail version + supported spark versions + git hash as gradle variables
 - Used these versions in Sphinx.
 - Changed path of distribution links in getting started to point at current hash.
jigold
jigold requested changes Jul 27, 2017
View reviewed changes
Copy link
Collaborator

@jigold jigold 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!

python/hail/docs/conf.py Outdated
version = u'0.1'
version = os.environ['HAIL_VERSION']
release = os.environ['HAIL_RELEASE']
# version = u'0.1'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Delete if no longer needed.

danking
danking suggested changes Jul 27, 2017
View reviewed changes
build.gradle Outdated
@@ -355,7 +366,7 @@ task cleanHailDocs(type: Exec) {
}

task setupDocsDirs(type: Exec, dependsOn: cleanHailDocs) {
commandLine 'mkdir', '-p', 'build/tmp/docs/', 'build/www/', 'build/tmp/python/'
commandLine 'mkdir', '-p', 'build/tmp/', 'build/www/', 'build/tmp/python/', 'build/tmp/docs', 'build/www/docs'
Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIK, you shouldn't need build/tmp/ if you're using mkdir -p build/tmp/docs

build.gradle
String hailVersion = "0.1"
String[] supportedSparkVersions = ["2.0.2", "2.1.0"]
String gitHash = exec {commandLine 'git', 'rev-parse', '--short', 'HEAD'}

String sparkVersion = System.getProperty("spark.version","2.0.2")

if (!(sparkVersion ==~ /^2\..*/))
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we start using supportedSparkVersions instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, because the cdh deployments have weird names and we don't want to have to keep track of those explicitly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the supportedSparkVersions are the deployed ones

Copy link
Contributor Author

Choose a reason for hiding this comment

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

maybe we should rename that 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

agreed.

python/hail/docs/conf.py Outdated
# The full version, including alpha/beta/rc tags.
release = u'0.1'
# release = u'0.1'
Copy link
Contributor

Choose a reason for hiding this comment

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

delete

generate-dist-links.sh

echo "Hail uploads distributions to Google Storage as part of our continuous integration suite." >> $TARGET

echo "You can download a pre-built distribution from the below links. Make sure you download the distribution that matches your Spark version!" >> $TARGET
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like you might be short one newline compared to the current text. Is that correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it looks better as one paragraph, the line break is a bit disruptive. This was intentional

@tpoterba tpoterba merged commit 0320a61 into master Jul 27, 2017
danking pushed a commit to danking/hail that referenced this pull request Aug 7, 2017
@tpoterba @danking
Updated the build to match the website changes: (hail-is#2034)
ef689b0 
* Updated the build to match the website changes:

 - fixed structure of docs + links (hail/* -> docs/stable/*)
 - Added Hail version + supported spark versions + git hash as gradle variables
 - Used these versions in Sphinx.
 - Changed path of distribution links in getting started to point at current hash.

* Fix sphinx version comments

* Fix up build
jbloom22 pushed a commit to jbloom22/hail that referenced this pull request Aug 8, 2017
@tpoterba @jbloom22
Updated the build to match the website changes: (hail-is#2034)
c97a914 
* Updated the build to match the website changes:

 - fixed structure of docs + links (hail/* -> docs/stable/*)
 - Added Hail version + supported spark versions + git hash as gradle variables
 - Used these versions in Sphinx.
 - Changed path of distribution links in getting started to point at current hash.

* Fix sphinx version comments

* Fix up build
jbloom22 pushed a commit to jbloom22/hail that referenced this pull request Oct 31, 2017
@tpoterba @jbloom22
Updated the build to match the website changes: (hail-is#2034)
3e22e3e 
* Updated the build to match the website changes:

 - fixed structure of docs + links (hail/* -> docs/stable/*)
 - Added Hail version + supported spark versions + git hash as gradle variables
 - Used these versions in Sphinx.
 - Changed path of distribution links in getting started to point at current hash.

* Fix sphinx version comments

* Fix up build
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danking danking danking approved these changes

@jigold jigold jigold approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tpoterba @danking @jigold