Skip to content

Sync aspects of old site with new site #65

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

Merged
merged 1 commit into from
Sep 20, 2018
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.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pytorch.org
29 changes: 29 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2018, Facebook Inc
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,9 @@ include-yarn-deps:

build: install include-yarn-deps
$(JEKYLL) build --config _config.yml
rm _site/Gemfile
rm _site/Gemfile.lock
rm _site/Makefile
rm _site/package.json
rm -f _site/yarn-error.log
rm _site/yarn.lock
rm -rf _site/scripts

serve: install include-yarn-deps
JEKYLL_ENV=development $(JEKYLL) serve --config _config.yml

build_deploy: include-yarn-deps
JEKYLL_ENV=production $(JEKYLL) build
rm _site/Gemfile
rm _site/Gemfile.lock
rm _site/Makefile
rm _site/package.json
rm -f _site/yarn-error.log
rm _site/yarn.lock
rm -rf _site/scripts
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# shiftlab/pytorch
# pytorch.org site

[https://shiftlab.github.io/pytorch](https://shiftlab.github.io/pytorch)
[https://pytorch.org](https://pytorch.org)

A static website built in [Jekyll](https://jekyllrb.com/) and [Bootstrap](https://getbootstrap.com/) for [PyTorch](https://pytorch.org/), and its tutorials and documentation.

##Prerequisites
## Prerequisites

Install the following packages before attempting to setup the project:

Expand Down Expand Up @@ -67,8 +67,8 @@ This will build the static site at `./_site`. This directory is not tracked in g

## Deployments

The website is hosted on [Github Pages](https://pages.github.com/) at [https://shiftlab.github.io/pytorch](https://shiftlab.github.io/pytorch).
The website is hosted on [Github Pages](https://pages.github.com/) at [https://pytorch.org](https://pytorch.org).

To deploy changes, merge your latest code into the `master` branch. A build will be automatically built and commited to the `gh-pages` branch via a CircleCI job.
To deploy changes, merge your latest code into the `sites` branch. A build will be automatically built and committed to the `master` branch via a CircleCI job.

To view the status of the build visit [https://circleci.com/gh/shiftlab/pytorch](https://circleci.com/gh/shiftlab/pytorch).
To view the status of the build visit [https://circleci.com/gh/pytorch/pytorch.github.io](https://circleci.com/gh/pytorch/pytorch.github.io).
15 changes: 10 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
# Site settings
title: "PyTorch Website"
author: "Facebook"
description: "Static website for pytorch.org"
url: "https://pytorch.org"
default_author: The PyTorch Team
description: "Scientific Computing..."
latest_version: 1.0
timezone: America/Los_Angeles
url: "https://pytorch.org"
baseurl: ""
plugins:
- jekyll-paginate-v2
- jekyll-redirect-from
- jekyll-autoprefixer
- jekyll-feed
sass:
load_paths:
- _sass
- node_modules
exclude: [vendor, node_modules]
exclude: [vendor, node_modules, README.md, Gemfile, Gemdile.lock, yarn.lock, yarn-error.log, package.json, Makefile, scripts]
include: [_static, _images, _modules, _sources, _tensor_str.html, _utils.html]
github: [metadata]
baseurl: ""
external_urls:
github: https://github.com/pytorch/pytorch
github_issues: https://github.com/pytorch/pytorch/issues
contributing: https://github.com/pytorch/pytorch/blob/master/CONTRIBUTING.md
docs: https://pytorch.org/docs
twitter: https://twitter.com/pytorch
facebook: https://www.facebook.com/pytorch
slack: https://pytorch.slack.com
Expand Down Expand Up @@ -62,3 +65,5 @@ pagination:
trail:
before: 2
after: 2

# google_site_verification: eOAFtDphTbbm4OPKva2d3Z0Z_2bBxWMGdkD0IRQ6VeA
2 changes: 1 addition & 1 deletion _includes/main_menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</li>

<li>
<a href="{{ site.external_urls.docs }}">Docs</a>
<a href="{{ site.baseurl }}/docs">Docs</a>
</li>

<li class="{% if current[1] == 'resources' %}active{% endif %}">
Expand Down
16 changes: 16 additions & 0 deletions _layouts/redirect.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE HTML>
<html lang="en-US">
<head>
<meta charset="UTF-8">
<meta http-equiv="refresh" content="1; url={{ page.redirect_url }}">
<script type="text/javascript">
window.location.href = "{{ page.redirect_url }}"
</script>
<title>Page Redirection</title>
</head>
<body>
If you are not redirected automatically, follow this <a href='{{ page.redirect_url }}'>link to the latest documentation</a>.
<br />
If you want to view documentation for a particular version, follow this <a href='versions.html'>link</a>.
</body>
</html>
4 changes: 4 additions & 0 deletions docs/0.1.12/.buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: e3c0334253ce75f93e455219de7c5075
tags: 645f666f9bcd5a90fca523b33c5a78b7
Loading