Skip to content

Commit 0506aa1

Browse files
mLupinemLupine
committed
Merge branch 'master' into poetry_group_support
* master: Release v6.0.1 (serverless#793) ci: Temporarily disable test run on integrate (serverless#800) ci: Temporarily minimize testing matrix (serverless#799) ci: Fix test skips (serverless#797) ci: Temp skip of cache-related tests (serverless#796) ci: Remove node12 from testing matrix (serverless#795) fix: Not crash when runtime is not `python` (serverless#773) fix: Remove outdated Pipenv requirements flag (serverless#780) fix: Fix integration test matrix configuration (serverless#755) fix: Add legacy `pipenv` backward compatability (serverless#742) Add support for specifying custom dependency groups in Poetry (serverless#746) docs: Add contributing and code of conduct # Conflicts: # test.js
2 parents e719337 + 84ee8c5 commit 0506aa1

File tree

19 files changed

+366
-338
lines changed

19 files changed

+366
-338
lines changed

‎.github/workflows/integrate.yml

-154
Original file line numberDiff line numberDiff line change
@@ -10,163 +10,9 @@ env:
1010
FORCE_COLOR: 1
1111

1212
jobs:
13-
windowsNode14:
14-
name: '[Windows] Node.js v14: Unit tests'
15-
runs-on: windows-latest
16-
strategy:
17-
matrix:
18-
sls-version: [2, 3]
19-
steps:
20-
- name: Checkout repository
21-
uses: actions/checkout@v2
22-
23-
- name: Retrieve dependencies from cache
24-
id: cacheNpm
25-
uses: actions/cache@v2
26-
with:
27-
path: |
28-
~/.npm
29-
node_modules
30-
key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
31-
restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
32-
33-
- name: Set up Python 3.7
34-
uses: actions/setup-python@v2
35-
with:
36-
python-version: 3.7
37-
38-
- name: Install Node.js and npm
39-
uses: actions/setup-node@v1
40-
with:
41-
node-version: 14.x
42-
43-
- name: Check python version
44-
run: |
45-
python --version
46-
47-
- name: Install setuptools
48-
run: python -m pip install --force setuptools wheel
49-
50-
- name: Install pipenv / poetry
51-
run: python -m pip install pipenv poetry
52-
53-
- name: Install serverless
54-
run: npm install -g serverless@${{ matrix.sls-version }}
55-
56-
- name: Install dependencies
57-
if: steps.cacheNpm.outputs.cache-hit != 'true'
58-
run: |
59-
npm update --no-save
60-
npm update --save-dev --no-save
61-
- name: Unit tests
62-
run: npm test
63-
64-
linuxNode14:
65-
name: '[Linux] Node.js 14: Unit tests'
66-
runs-on: ubuntu-latest
67-
strategy:
68-
matrix:
69-
sls-version: [2, 3]
70-
steps:
71-
- name: Checkout repository
72-
uses: actions/checkout@v2
73-
74-
- name: Retrieve dependencies from cache
75-
id: cacheNpm
76-
uses: actions/cache@v2
77-
with:
78-
path: |
79-
~/.npm
80-
node_modules
81-
key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
82-
restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
83-
84-
- name: Set up Python 3.7
85-
uses: actions/setup-python@v2
86-
with:
87-
python-version: 3.7
88-
89-
- name: Install Node.js and npm
90-
uses: actions/setup-node@v1
91-
with:
92-
node-version: 14.x
93-
94-
- name: Check python version
95-
run: |
96-
python --version
97-
98-
- name: Install setuptools
99-
run: python -m pip install --force setuptools wheel
100-
101-
- name: Install pipenv / poetry
102-
run: python -m pip install pipenv poetry
103-
104-
- name: Install serverless
105-
run: npm install -g serverless@${{ matrix.sls-version }}
106-
107-
- name: Install dependencies
108-
if: steps.cacheNpm.outputs.cache-hit != 'true'
109-
run: |
110-
npm update --no-save
111-
npm update --save-dev --no-save
112-
- name: Unit tests
113-
run: npm test
114-
115-
linuxNode12:
116-
name: '[Linux] Node.js v12: Unit tests'
117-
runs-on: ubuntu-latest
118-
steps:
119-
- name: Checkout repository
120-
uses: actions/checkout@v2
121-
122-
- name: Retrieve dependencies from cache
123-
id: cacheNpm
124-
uses: actions/cache@v2
125-
with:
126-
path: |
127-
~/.npm
128-
node_modules
129-
key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
130-
restore-keys: npm-v12-${{ runner.os }}-${{ github.ref }}-
131-
132-
- name: Set up Python 3.7
133-
uses: actions/setup-python@v2
134-
with:
135-
python-version: 3.7
136-
137-
- name: Install Node.js and npm
138-
uses: actions/setup-node@v1
139-
with:
140-
node-version: 12.x
141-
142-
- name: Check python version
143-
run: |
144-
python --version
145-
146-
- name: Install setuptools
147-
run: python -m pip install --force setuptools wheel
148-
149-
- name: Install pipenv / poetry
150-
run: python -m pip install pipenv poetry
151-
152-
- name: Install serverless
153-
run: npm install -g serverless@${{ matrix.sls-version }}
154-
155-
- name: Install dependencies
156-
if: steps.cacheNpm.outputs.cache-hit != 'true'
157-
run: |
158-
npm update --no-save
159-
npm update --save-dev --no-save
160-
- name: Unit tests
161-
run: npm test
162-
16313
tagIfNewVersion:
16414
name: Tag if new version
16515
runs-on: ubuntu-latest
166-
strategy:
167-
matrix:
168-
sls-version: [2, 3]
169-
needs: [windowsNode14, linuxNode14, linuxNode12]
17016
steps:
17117
- name: Checkout repository
17218
uses: actions/checkout@v2

‎.github/workflows/validate.yml

-106
Original file line numberDiff line numberDiff line change
@@ -87,109 +87,3 @@ jobs:
8787
fi
8888
- name: Unit tests
8989
run: npm test
90-
91-
windowsNode14:
92-
name: '[Windows] Node.js v14: Unit tests'
93-
runs-on: windows-latest
94-
strategy:
95-
matrix:
96-
sls-version: [2, 3]
97-
steps:
98-
- name: Checkout repository
99-
uses: actions/checkout@v2
100-
101-
- name: Retrieve dependencies from cache
102-
id: cacheNpm
103-
uses: actions/cache@v2
104-
with:
105-
path: |
106-
~/.npm
107-
node_modules
108-
key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
109-
restore-keys: |
110-
npm-v14-${{ runner.os }}-${{ github.ref }}-
111-
npm-v14-${{ runner.os }}-refs/heads/master-
112-
113-
- name: Set up Python 3.7
114-
uses: actions/setup-python@v2
115-
with:
116-
python-version: 3.7
117-
118-
- name: Install Node.js and npm
119-
uses: actions/setup-node@v1
120-
with:
121-
node-version: 14.x
122-
123-
- name: Check python version
124-
run: |
125-
python --version
126-
127-
- name: Install setuptools
128-
run: python -m pip install --force setuptools wheel
129-
130-
- name: Install pipenv / poetry
131-
run: python -m pip install pipenv poetry
132-
133-
- name: Install serverless
134-
run: npm install -g serverless@${{ matrix.sls-version }}
135-
136-
- name: Install dependencies
137-
if: steps.cacheNpm.outputs.cache-hit != 'true'
138-
run: |
139-
npm update --no-save
140-
npm update --save-dev --no-save
141-
- name: Unit tests
142-
run: npm test
143-
144-
linuxNode12:
145-
name: '[Linux] Node.js v12: Unit tests'
146-
runs-on: ubuntu-latest
147-
strategy:
148-
matrix:
149-
sls-version: [2, 3]
150-
steps:
151-
- name: Checkout repository
152-
uses: actions/checkout@v2
153-
154-
- name: Retrieve dependencies from cache
155-
id: cacheNpm
156-
uses: actions/cache@v2
157-
with:
158-
path: |
159-
~/.npm
160-
node_modules
161-
key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
162-
restore-keys: |
163-
npm-v12-${{ runner.os }}-${{ github.ref }}-
164-
npm-v12-${{ runner.os }}-refs/heads/master-
165-
166-
- name: Set up Python 3.7
167-
uses: actions/setup-python@v2
168-
with:
169-
python-version: 3.7
170-
171-
- name: Install Node.js and npm
172-
uses: actions/setup-node@v1
173-
with:
174-
node-version: 12.x
175-
176-
- name: Check python version
177-
run: |
178-
python --version
179-
180-
- name: Install setuptools
181-
run: python -m pip install --force setuptools wheel
182-
183-
- name: Install pipenv / poetry
184-
run: python -m pip install pipenv poetry
185-
186-
- name: Install serverless
187-
run: npm install -g serverless@${{ matrix.sls-version }}
188-
189-
- name: Install dependencies
190-
if: steps.cacheNpm.outputs.cache-hit != 'true'
191-
run: |
192-
npm update --no-save
193-
npm update --save-dev --no-save
194-
- name: Unit tests
195-
run: npm test

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,6 @@ unzip_requirements.py
7676
# Project ignores
7777
puck/
7878
serverless.yml.bak
79+
80+
# Generated packaging
81+
*.tgz

‎.python-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.7

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [6.0.1](https://github.com/UnitedIncome/serverless-python-requirements/compare/v6.0.0...v6.0.1) (2023-10-22)
6+
7+
### Bug Fixes
8+
9+
- Add legacy `pipenv` backward compatability ([#742](https://github.com/UnitedIncome/serverless-python-requirements/issues/742)) ([22a1f83](https://github.com/UnitedIncome/serverless-python-requirements/commit/22a1f832ac8051f0963328743f9e768f8e66649e)) ([Randy Westergren](https://github.com/rwestergren))
10+
- Not crash when runtime is not `python` ([#773](https://github.com/UnitedIncome/serverless-python-requirements/issues/773)) ([c1f5ca1](https://github.com/UnitedIncome/serverless-python-requirements/commit/c1f5ca114de815ca19ad213a79e250b5b81f29b3)) ([Jim Kirkbride](https://github.com/jameskbride))
11+
- Remove outdated Pipenv requirements flag ([#780](https://github.com/UnitedIncome/serverless-python-requirements/issues/780)) ([ad40278](https://github.com/UnitedIncome/serverless-python-requirements/commit/ad40278629c63f4d0971637214b4d9bc20dbd288)) ([Jeff Gordon](https://github.com/jfgordon2))
12+
13+
### Maintenance Improvements
14+
15+
- Fix integration test matrix configuration ([#755](https://github.com/UnitedIncome/serverless-python-requirements/issues/755)) ([e8b2e51](https://github.com/UnitedIncome/serverless-python-requirements/commit/e8b2e51c265792046bacc3946f22f7bd842c60e6)) ([Randy Westergren](https://github.com/rwestergren))
16+
517
## [6.0.0](https://github.com/UnitedIncome/serverless-python-requirements/compare/v5.4.0...v6.0.0) (2022-10-23)
618

719
### ⚠ BREAKING CHANGES

‎CODE_OF_CONDUCT.md

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
- The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
- Trolling, insulting/derogatory comments, and personal or political attacks
28+
- Public or private harassment
29+
- Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
- Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting our team at **[email protected]**. As an alternative
59+
feel free to reach out to any of us personally. All
60+
complaints will be reviewed and investigated and will result in a response that
61+
is deemed necessary and appropriate to the circumstances. The project team is
62+
obligated to maintain confidentiality with regard to the reporter of an incident.
63+
Further details of specific enforcement policies may be posted separately.
64+
65+
Project maintainers who do not follow or enforce the Code of Conduct in good
66+
faith may face temporary or permanent repercussions as determined by other
67+
members of the project's leadership.
68+
69+
## Attribution
70+
71+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
72+
available at [http://contributor-covenant.org/version/1/4][version]
73+
74+
[homepage]: http://contributor-covenant.org
75+
[version]: http://contributor-covenant.org/version/1/4/

0 commit comments

Comments
 (0)