Skip to content

Commit d04ee72

Browse files
committed
Merge branch 'main' into feat-backend-gcs
2 parents 09485a0 + 1076dc6 commit d04ee72

21 files changed

+593
-115
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series of
86+
actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or permanent
93+
ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within the
113+
community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.1, available at
119+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
120+
121+
Community Impact Guidelines were inspired by
122+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
123+
124+
For answers to common questions about this code of conduct, see the FAQ at
125+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
126+
[https://www.contributor-covenant.org/translations][translations].
127+
128+
[homepage]: https://www.contributor-covenant.org
129+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130+
[Mozilla CoC]: https://github.com/mozilla/diversity
131+
[FAQ]: https://www.contributor-covenant.org/faq
132+
[translations]: https://www.contributor-covenant.org/translations

.github/workflows/ci.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
tests:
1717
name: "Tests"
1818
runs-on: ${{ matrix.os }}
19+
if: ${{ !github.event.pull_request.head.repo.fork }}
1920
strategy:
2021
fail-fast: false
2122
matrix:
@@ -68,6 +69,7 @@ jobs:
6869
test-rsconnect:
6970
name: "Test RSConnect"
7071
runs-on: ubuntu-latest
72+
if: ${{ !github.event.pull_request.head.repo.fork }}
7173
steps:
7274
- uses: actions/checkout@v2
7375
- uses: actions/setup-python@v2
@@ -77,7 +79,7 @@ jobs:
7779
run: |
7880
python -m pip install --upgrade pip
7981
python -m pip install -r requirements/dev.txt
80-
python -m pip install -e .
82+
python -m pip install -e .[test]
8183
- name: run RStudio Connect
8284
run: |
8385
docker-compose up --build -d
@@ -91,6 +93,27 @@ jobs:
9193
run: |
9294
pytest pins -m 'fs_rsc and not skip_on_github'
9395
96+
97+
test-fork:
98+
name: "Test a fork PR (no secrets)"
99+
runs-on: ubuntu-latest
100+
if: ${{ github.event.pull_request.head.repo.fork }}
101+
steps:
102+
- uses: actions/checkout@v2
103+
- uses: actions/setup-python@v2
104+
with:
105+
python-version: "3.10"
106+
- name: Install dependencies
107+
run: |
108+
python -m pip install --upgrade pip
109+
110+
python -m pip install -e .[test]
111+
- name: Run tests
112+
run: |
113+
# TODO: better way to disable all cloud backend tests?
114+
pytest pins -m 'not fs_rsc and not fs_s3 and not skip_on_github'
115+
116+
94117
check-cross-compatibility:
95118
name: "Check cross lib compatibility"
96119
runs-on: ubuntu-latest

.github/workflows/code-checks.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Code Checks
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: ['main', 'dev-*']
7+
pull_request:
8+
release:
9+
types: [published]
10+
11+
jobs:
12+
pre-commit:
13+
name: "Run pre-commit"
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: actions/setup-python@v2
18+
- uses: pre-commit/[email protected]

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,7 @@ dmypy.json
133133

134134
# Pyre type checker
135135
.pyre/
136+
137+
# RStudio
138+
.Rproj.user
139+
*.Rproj

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ repos:
1313
args: ["--unsafe"]
1414
- id: check-added-large-files
1515
- repo: https://github.com/psf/black
16-
rev: 19.10b0
16+
rev: 22.3.0
1717
hooks:
1818
- id: black

CONTRIBUTING.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# pins-python
2+
3+
## Development
4+
5+
### Install pins with dev dependencies
6+
7+
```shell
8+
python -m pip install -e .[dev]
9+
```
10+
11+
### Install pre-commit hooks
12+
13+
This project uses [pre-commit](https://pre-commit.com/) to check and format each commit.
14+
15+
You can set it up by running the following code in this repo:
16+
17+
```
18+
python -m pip install pre-commit
19+
pre-commit install
20+
```
21+
22+
### Setting version number
23+
24+
This project uses [setuptools_scm](https://github.com/pypa/setuptools_scm) to
25+
automatically track and change version numbers within the `pins` package.
26+
It works by checking the last tagged commit.
27+
28+
In order to set the version number, create a tag like the following.
29+
30+
```shell
31+
git tag v0.0.1
32+
```
33+
34+
In order to see the version number being used for the current commit, run:
35+
36+
```
37+
python -m setuptools_scm
38+
```
39+
40+
## Test
41+
42+
Tests can be run using pytest:
43+
44+
```shell
45+
pytest pins
46+
47+
# run all tests except those for Rstudio Connect
48+
pytest pins -m 'not fs_rsc'
49+
50+
# run only local filesystem backend tests
51+
pytest pins -m 'fs_file'
52+
```
53+
54+
There are two important details to note for testing:
55+
56+
* **Backends**. pins can write to backends like s3, azure, and RStudio Connect, so you
57+
will need to set credentials to test against them.
58+
* **Pytest Marks**. You can disable tests over a specific backend through pytest's
59+
`-m` flag. For example...
60+
- Skip S3: `pytest pins -m 'not fs_s3'`
61+
- Test only s3: `pytest pins -m 'fs_s3'`
62+
- List all marks: `pytest pins --markers`
63+
64+
### Configuring backends
65+
66+
* Copy `.env.dev` to be `.env`
67+
* Modify `.env` to file in environment variables (e.g. AWS_ACCESS_KEY_ID)
68+
* Be careful not to put any sensitive information in `.env.dev`!
69+
70+
### Setting up RStudio Connect tests
71+
72+
```
73+
# Be sure to set RSC_LICENSE in .env
74+
make dev
75+
```

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ dev-stop:
2020
$(RSC_API_KEYS): dev-start
2121
python script/setup-rsconnect/dump_api_keys.py $@
2222

23+
README.md: README.Rmd
24+
jupytext --from Rmd --to ipynb --output - $^ \
25+
| jupyter nbconvert \
26+
--stdin --to markdown \
27+
--execute \
28+
--ExecutePreprocessor.kernel_name='venv-pins-python' \
29+
--TagRemovePreprocessor.remove_all_outputs_tags='hide-cell' \
30+
--TagRemovePreprocessor.remove_input_tags='hide-cell' \
31+
--output $@
32+
2333
test:
2434
pytest
2535

0 commit comments

Comments
 (0)