Merge branch 'master' into dj-add-user-management-commands

Author: cotsog

user/common-build-problems.md

@@ -622,3 +622,7 @@ jobs:
 
 
 This creates only one job,  _Peanut Butter and Bread_ under the stage named _Breakfast_ as you have defined. It is important to note that in YAML, the `-` symbol is used to create a list of items and the earlier example creates a list of 2 items, while you actually wanted 1. You can read more on [How to define Build Stages](/user/build-stages/#how-to-define-build-stages) and YAML lists syntax in the official [documentation](https://yaml.org/spec/1.2/spec.html#id2759963).
+
+## **Node**: Script execution before dependency installation causes build failures
+
+When adding custom setup instructions to a NodeJS build, add them in the `before_script` phase and not before _dependencies are installed_. The `before_script` phase is the safest place to add custom setup scripts. Symptoms of this problem include previously succeeding builds suddenly failing due to the addition of a new dependency. 

user/deployment/pypi.md

@@ -9,40 +9,43 @@ Travis CI can automatically release your Python package to [PyPI](https://pypi.p
 
 
 
-For a minimal configuration, add the following to your `.travis.yml`:
+For a minimal configuration, generate [PyPI API token](https://pypi.org/help/#apitoken) and add the following to your `.travis.yml`:
 
 ```yaml
 deploy:
   provider: pypi
-  user: "Your username"
-  password: "Your password"
+  user: "__token__"
+  password: "Your PyPI API token, including the pypi- prefix"
 ```
 {: data-file=".travis.yml"}
 
-However, this would expose your PyPI password to the world.
+However, this would expose your PyPI API token to the world.
 We recommend you [encrypt](/user/encryption-keys/) your password and add it to your .travis.yml by running:
 
 ```bash
-travis encrypt your-password-here --add deploy.password
+travis encrypt your-api-token --add deploy.password
 ```
 
 If you are using travis-ci.com and not travis-ci.org, you need to add the `--com` argument to switch the Travis API endpoint:
 
 ```bash
-travis encrypt your-password-here --add deploy.password --com
+travis encrypt your-api-token --add deploy.password --com
 ```
 
-> Note that if your PyPI password contains [special characters](/user/encryption-keys#note-on-escaping-certain-symbols) you need to escape them before encrypting your password. Some people have [reported difficulties](https://github.com/travis-ci/dpl/issues/377) connecting to PyPI with passwords containing anything except alphanumeric characters.
-
 ```yaml
 deploy:
   provider: pypi
-  user: "Your username"
+  user: "__token__"
   password:
-    secure: "Your encrypted password"
+    secure: "Your encrypted token"
 ```
 {: data-file=".travis.yml"}
 
+It is also possible, but not recommended, to use PyPI user and password, instead of token.
+
+> Note that if your PyPI password contains [special characters](/user/encryption-keys#note-on-escaping-certain-symbols) you need to escape them before encrypting your password. Some people have [reported difficulties](https://github.com/travis-ci/dpl/issues/377) connecting to PyPI with passwords containing anything except alphanumeric characters.
+
+
 ## Deploying tags
 
 Most likely, you would only want to deploy to PyPI when a new version of your

user/languages/julia.md

@@ -86,6 +86,10 @@ Note that the `coverage=true` argument only tells `Pkg.test` to emit coverage in
 about the tests it ran; it does not submit this information to any services.
 To submit coverage information, see the coverage section above.
 
+There are two scripts that describe the defualt behavior for using Julia with Travis CI:
+ [julia.rb](https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/script/julia.rb)
+ and [julia_spec.rb](https://github.com/travis-ci/travis-build/blob/master/spec/build/script/julia_spec.rb).
+
 ## Dependency Management
 
 If your Julia package has a `deps/build.jl` file, then `Pkg.build("$name")`

user/tutorial.md

@@ -85,8 +85,8 @@ os: osx
 ```
 {: data-file=".travis.yml"}
 
-> You do *not* necessarily need to use macOS, if you develop on a Mac.
-> macOS is required only, if you need Swift, Objective-C or other
+> You do *not* necessarily need to use macOS if you develop on a Mac.
+> macOS is required only if you need Swift, Objective-C, or other
 > macOS-specific software.
 
 Travis CI supports many [programming languages](/user/languages/).