Skip to content

Commit f907029

Browse files
konradpabjankonradpabjan
authored
Merge pull request #46 from brcrista/brcrista/old-references
Update terminology in setup-python
2 parents 3d8ac1d + d8bca2d commit f907029

File tree

7 files changed

+170
-26
lines changed

7 files changed

+170
-26
lines changed

‎.github/workflows/workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Main workflow
2-
on: [push]
2+
on: [push, pull_request]
33
jobs:
44
run:
55
name: Run

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
- uses: actions/checkout@v1
2020
- uses: actions/setup-python@v1
2121
with:
22-
python-version: '3.x' # Version range or exact version of a Python version to use, using semvers version range syntax.
22+
python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
2323
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
2424
- run: python my_script.py
2525
```

‎action.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
---
12
name: 'Setup Python'
2-
description: 'Set up a specific version of Python and add the command-line tools to the PATH'
3+
description: 'Set up a specific version of Python and add the command-line tools to the PATH.'
34
author: 'GitHub'
45
inputs:
56
python-version:
6-
description: 'Version range or exact version of a Python version to use, using semvers version range syntax.'
7+
description: "Version range or exact version of a Python version to use, using SemVer's version range syntax."
78
default: '3.x'
89
architecture:
910
description: 'The target architecture (x86, x64) of the Python interpreter.'
@@ -13,4 +14,4 @@ runs:
1314
main: 'dist/index.js'
1415
branding:
1516
icon: 'code'
16-
color: 'yellow'
17+
color: 'yellow'

‎dist/index.js‎

Lines changed: 153 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports =
3434
/******/ // the startup function
3535
/******/ function startup() {
3636
/******/ // Load entry module and return exports
37-
/******/ return __webpack_require__(429);
37+
/******/ return __webpack_require__(264);
3838
/******/ };
3939
/******/
4040
/******/ // run startup
@@ -71,22 +71,98 @@ module.exports = require("https");
7171

7272
/***/ }),
7373

74+
/***/ 264:
75+
/***/ (function(module, __unusedexports, __webpack_require__) {
76+
77+
module.exports =
78+
/******/ (function(modules, runtime) { // webpackBootstrap
79+
/******/ "use strict";
80+
/******/ // The module cache
81+
/******/ var installedModules = {};
82+
/******/
83+
/******/ // The require function
84+
/******/ function __webpack_require__(moduleId) {
85+
/******/
86+
/******/ // Check if module is in cache
87+
/******/ if(installedModules[moduleId]) {
88+
/******/ return installedModules[moduleId].exports;
89+
/******/ }
90+
/******/ // Create a new module (and put it into the cache)
91+
/******/ var module = installedModules[moduleId] = {
92+
/******/ i: moduleId,
93+
/******/ l: false,
94+
/******/ exports: {}
95+
/******/ };
96+
/******/
97+
/******/ // Execute the module function
98+
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
99+
/******/
100+
/******/ // Flag the module as loaded
101+
/******/ module.l = true;
102+
/******/
103+
/******/ // Return the exports of the module
104+
/******/ return module.exports;
105+
/******/ }
106+
/******/
107+
/******/
108+
/******/ __webpack_require__.ab = __dirname + "/";
109+
/******/
110+
/******/ // the startup function
111+
/******/ function startup() {
112+
/******/ // Load entry module and return exports
113+
/******/ return __webpack_require__(429);
114+
/******/ };
115+
/******/
116+
/******/ // run startup
117+
/******/ return startup();
118+
/******/ })
119+
/************************************************************************/
120+
/******/ ({
121+
122+
/***/ 16:
123+
/***/ (function(module) {
124+
125+
module.exports = __webpack_require__(16);
126+
127+
/***/ }),
128+
129+
/***/ 87:
130+
/***/ (function(module) {
131+
132+
module.exports = __webpack_require__(87);
133+
134+
/***/ }),
135+
136+
/***/ 129:
137+
/***/ (function(module) {
138+
139+
module.exports = __webpack_require__(129);
140+
141+
/***/ }),
142+
143+
/***/ 211:
144+
/***/ (function(module) {
145+
146+
module.exports = __webpack_require__(211);
147+
148+
/***/ }),
149+
74150
/***/ 357:
75151
/***/ (function(module) {
76152

77-
module.exports = require("assert");
153+
module.exports = __webpack_require__(357);
78154

79155
/***/ }),
80156

81157
/***/ 417:
82158
/***/ (function(module) {
83159

84-
module.exports = require("crypto");
160+
module.exports = __webpack_require__(417);
85161

86162
/***/ }),
87163

88164
/***/ 429:
89-
/***/ (function(module, __unusedexports, __webpack_require__) {
165+
/***/ (function(module, __unusedexports, __nested_webpack_require_2019__) {
90166

91167
module.exports =
92168
/******/ (function(modules, runtime) { // webpackBootstrap
@@ -136,28 +212,28 @@ module.exports =
136212
/***/ 16:
137213
/***/ (function(module) {
138214

139-
module.exports = __webpack_require__(16);
215+
module.exports = __nested_webpack_require_2019__(16);
140216

141217
/***/ }),
142218

143219
/***/ 87:
144220
/***/ (function(module) {
145221

146-
module.exports = __webpack_require__(87);
222+
module.exports = __nested_webpack_require_2019__(87);
147223

148224
/***/ }),
149225

150226
/***/ 129:
151227
/***/ (function(module) {
152228

153-
module.exports = __webpack_require__(129);
229+
module.exports = __nested_webpack_require_2019__(129);
154230

155231
/***/ }),
156232

157233
/***/ 211:
158234
/***/ (function(module) {
159235

160-
module.exports = __webpack_require__(211);
236+
module.exports = __nested_webpack_require_2019__(211);
161237

162238
/***/ }),
163239

@@ -5404,14 +5480,67 @@ module.exports = __nested_webpack_require_1759__(835);
54045480
/***/ 357:
54055481
/***/ (function(module) {
54065482

5407-
module.exports = __webpack_require__(357);
5483+
module.exports = __nested_webpack_require_2019__(357);
54085484

54095485
/***/ }),
54105486

54115487
/***/ 417:
54125488
/***/ (function(module) {
54135489

5414-
module.exports = __webpack_require__(417);
5490+
module.exports = __nested_webpack_require_2019__(417);
5491+
5492+
/***/ }),
5493+
5494+
/***/ 605:
5495+
/***/ (function(module) {
5496+
5497+
module.exports = __nested_webpack_require_2019__(605);
5498+
5499+
/***/ }),
5500+
5501+
/***/ 614:
5502+
/***/ (function(module) {
5503+
5504+
module.exports = __nested_webpack_require_2019__(614);
5505+
5506+
/***/ }),
5507+
5508+
/***/ 622:
5509+
/***/ (function(module) {
5510+
5511+
module.exports = __nested_webpack_require_2019__(622);
5512+
5513+
/***/ }),
5514+
5515+
/***/ 631:
5516+
/***/ (function(module) {
5517+
5518+
module.exports = __nested_webpack_require_2019__(631);
5519+
5520+
/***/ }),
5521+
5522+
/***/ 669:
5523+
/***/ (function(module) {
5524+
5525+
module.exports = __nested_webpack_require_2019__(669);
5526+
5527+
/***/ }),
5528+
5529+
/***/ 747:
5530+
/***/ (function(module) {
5531+
5532+
module.exports = __nested_webpack_require_2019__(747);
5533+
5534+
/***/ }),
5535+
5536+
/***/ 835:
5537+
/***/ (function(module) {
5538+
5539+
module.exports = __nested_webpack_require_2019__(835);
5540+
5541+
/***/ })
5542+
5543+
/******/ });
54155544

54165545
/***/ }),
54175546

@@ -5468,6 +5597,20 @@ module.exports = __webpack_require__(835);
54685597

54695598
/***/ }),
54705599

5600+
/***/ 357:
5601+
/***/ (function(module) {
5602+
5603+
module.exports = require("assert");
5604+
5605+
/***/ }),
5606+
5607+
/***/ 417:
5608+
/***/ (function(module) {
5609+
5610+
module.exports = require("crypto");
5611+
5612+
/***/ }),
5613+
54715614
/***/ 605:
54725615
/***/ (function(module) {
54735616

‎docs/contributors.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22

33
### Checkin
44

5-
- Do checkin source (src)
6-
- Do checkin a single index.js file after running `ncc`
7-
- Do not checkin node_modules
5+
- Do check in source (`src/`)
6+
- Do check in a single `index.js` file after running `ncc`
7+
- Do not check in `node_modules/`
88

99
### NCC
1010

11-
In order to avoid uploading `node_modules` to the repository, we use [zeit/ncc](https://github.com/zeit/ncc) to create a single `index.js` file that gets saved in `dist/`.
11+
In order to avoid uploading `node_modules/` to the repository, we use [zeit/ncc](https://github.com/zeit/ncc) to create a single `index.js` file that gets saved in `dist/`.
1212

1313
### Developing
1414

15-
If you're developing locally you can run
15+
If you're developing locally, you can run
1616
```
1717
npm install
1818
tsc
1919
ncc build
2020
```
21-
Any files generated using `tsc` will be added to `lib/*`, however those files also are not uploaded to the repository and are exluded using `.gitignore`.
21+
Any files generated using `tsc` will be added to `lib/`, however those files also are not uploaded to the repository and are exluded using `.gitignore`.
2222

2323
During the commit step, Husky will take care of formatting all files with [Prettier](https://github.com/prettier/prettier)
2424

2525
### Testing
2626

27-
We ask that you include a link to a succesfull run that utilizes the changes you are working on. For example, if your changes are in the branch `newAwesomeFeature`, then show an example run that uses `setup-python@newAwesomeFeature` or `my-fork@newAwesomeFeature`. This will help speed up testing and help us confirm that there are no breaking changes or bugs.
27+
We ask that you include a link to a successful run that utilizes the changes you are working on. For example, if your changes are in the branch `newAwesomeFeature`, then show an example run that uses `setup-python@newAwesomeFeature` or `my-fork@newAwesomeFeature`. This will help speed up testing and help us confirm that there are no breaking changes or bugs.
2828

2929
### Releases
3030

‎src/find-python.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function usePyPy(majorVersion: 2 | 3, architecture: string): void {
5757

5858
if (!installDir && IS_WINDOWS) {
5959
// PyPy only precompiles binaries for x86, but the architecture parameter defaults to x64.
60-
// On Hosted VS2017, we only install an x86 version.
60+
// On our Windows virtual environments, we only install an x86 version.
6161
// Fall back to x86.
6262
installDir = findPyPy('x86');
6363
}
@@ -120,7 +120,7 @@ async function useCpythonVersion(
120120

121121
if (IS_WINDOWS) {
122122
// Add --user directory
123-
// `installDir` from tool cache should look like $AGENT_TOOLSDIRECTORY/Python/<semantic version>/x64/
123+
// `installDir` from tool cache should look like $RUNNER_TOOL_CACHE/Python/<semantic version>/x64/
124124
// So if `findLocalTool` succeeded above, we must have a conformant `installDir`
125125
const version = path.basename(path.dirname(installDir));
126126
const major = semver.major(version);

‎yaml-lint-config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extends: default
22

33
rules:
4-
# 80 chars should be enough, but don't fail if a line is longer
4+
# 120 chars should be enough, but don't fail if a line is longer
55
line-length:
6-
max: 80
6+
max: 120
77
level: warning

0 commit comments

Comments
 (0)