Skip to content

Commit 9061d66

Browse files
committed
revert magic quotes
1 parent 2188970 commit 9061d66

40 files changed

+71
-71
lines changed

docs/maintainer/adding_pkgs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ metadata are satisfied.
635635
`pip check` can sometimes fail due to metadata discrepancies between
636636
PyPI and conda-forge (e.g. same package with different names). In these
637637
cases, the reviewer must evaluate whether the error was a false negative.
638-
Tip: use `pip list` to show what `pip check` sees.
638+
Tip: use `pip list` to show what `pip check` "sees".
639639

640640
:::
641641

docs/maintainer/infrastructure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ certain very old packages that require VC9 will fail.
230230
231231
TravisCI is used to build packages for IBM Power 8+ and ARM. After merging a staged-recipes pull request, it might be necessary to
232232
force sync your repositories in TravisCI to see the reload and cancel buttons. To do this please visit [https://app.travis-ci.com/account/repositories](https://app.travis-ci.com/account/repositories)
233-
and click the Sync accounts button.
233+
and click the "Sync accounts" button.
234234
235235
<a id="enabling-travis"></a>
236236
@@ -297,7 +297,7 @@ To skip a CI build for a given commit, put `[ci skip] ***NO_CI***` in the commit
297297
### Third-party Use of Our CI Services
298298

299299
Due to its stature in the open-source community, conda-forge has enhanced access to certain CI services. This access is a community
300-
resource entrusted to conda-forge for use in building packages. We thus cannot support third-party or off-label CI jobs in our
300+
resource entrusted to conda-forge for use in building packages. We thus cannot support third-party or "off-label" CI jobs in our
301301
feedstocks on any of our CI services. If we find such use, we will politely ask the maintainers to rectify the situation. We may
302302
take more serious actions, including archiving feedstocks or removing maintainers from the organization, if the situation cannot be rectified.
303303

docs/maintainer/knowledge_base.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Some optional, but useful CMake options:
5858
- `${CMAKE_ARGS}` Add variables defined by conda-forge internally. This is required to enable various conda-forge enhancements, like [CUDA builds](#cuda).
5959

6060
Here are some basic commands for you to get started. These are dependent on your source
61-
code layout and aren't intended to be used as is.
61+
code layout and aren't intended to be used "as is".
6262

6363
**CMake lines for build.sh (macOS/Linux):**
6464

@@ -159,12 +159,12 @@ versions are:
159159
While you can obtain these tools by installing the right version of the full
160160
[Visual Studio](https://visualstudio.microsoft.com/) development
161161
environment, you can save a lot of time and bandwidth by installing standalone
162-
build tools packages. You can get them from [Visual Studio
162+
"build tools" packages. You can get them from [Visual Studio
163163
Subscriptions](https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2019-and-other-products).
164164
To download build tools, you'll need a Microsoft account. Once on the
165165
Visual Studio Subscriptions page, you may also need to join the Dev Essentials
166-
program. Once that's done, you can click the Download tab and search for
167-
Build Tools for Visual Studio 2022.
166+
program. Once that's done, you can click the "Download" tab and search for
167+
"Build Tools for Visual Studio 2022".
168168

169169
If you need more information. Please refer [the Python wiki page on Windows compilers](https://wiki.python.org/moin/WindowsCompilers).
170170

@@ -526,7 +526,7 @@ In practical terms, for conda-forge, this results into two extra metadata bits t
526526
package is being built, like `cython` and `numpy`.
527527

528528
In the terms of the [PEP720](https://peps.python.org/pep-0720/), the conda-forge setup
529-
implements the faking the target environment approach. More specifically, this will result in the
529+
implements the "faking the target environment" approach. More specifically, this will result in the
530530
following changes before the builds scripts run:
531531

532532
- A modified `crossenv` installation in `$BUILD_PREFIX/venv`, mimicking the architecture of
@@ -2134,7 +2134,7 @@ higher than the package uploaded with the `dev` label.
21342134
To reset your feedstock token and fix issues with uploads, follow these steps:
21352135

21362136
1. Go to the `conda-forge/admin-requests` repo and copy [examples/example-broken.yml](https://github.com/conda-forge/admin-requests/blob/main/examples/example-broken.yml) to the `requests/` folder.
2137-
2. Add the name of your feedstock in the YML file. While adding the name, don't add -feedstock to the end of it. For example: for `python-feedstock`, just add `python`.
2137+
2. Add the name of your feedstock in the YML file. While adding the name, don't add "-feedstock" to the end of it. For example: for `python-feedstock`, just add `python`.
21382138

21392139
<a id="using-arch-rebuild"></a>
21402140

docs/maintainer/maintainer_faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ There is no need to approve the PR. Every maintainer can verify and merge the bo
105105

106106
<a id="how-to-fix-build-locally-py-fails-with-exit-code-139"></a>
107107

108-
## How to fix build-locally.py fails with exit code 139?
108+
## How to fix "build-locally.py fails with exit code 139"?
109109

110110
With Linux Kernel 4.11 there were some changes in the `vsyscall` linking. Depending on your distribution this may cause the above error. You can fix that on Debian by editing `/etc/default/grub` and specifiy `GRUB_CMDLINE_LINUX_DEFAULT="vsyscall=emulate"` in this file. Afterwards, you need to run `update-grub` and reboot your system. On other Linux distributions the fix is similar but you need to edit a different configuration file to change the Linux kernel cmdline. This workaround is only needed for images based on CentOS 6 (`cos6`). You could also workaround this by forcing the CentOS 7 based images using `DOCKER_IMAGE=quay.io/condaforge/linux-anvil-cos7-x86_64 ./build-locally.py`.
111111

docs/orga/getting-in-touch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The main chat rooms that you'll interact with are
4040
* [gitter: core/private](https://gitter.im/conda-forge/core): Private chat for the @conda-forge/core team to discuss continued operations and improvements to conda-forge.
4141
* [gitter: power pc](https://gitter.im/conda-forge-ppc64le/Lobby): Public chat room for all things related to building for power pc (IBM) systems.
4242
* [gitter: bot subteam](https://gitter.im/conda-forge/regro-cf-autotick-bot): Public chat room for all things related to the conda-forge automation infrastructure.
43-
Our automation infrastructure is colloquially referred to as the bot.
43+
Our automation infrastructure is colloquially referred to as "the bot".
4444
* [gitter: compilers](https://gitter.im/conda-forge/conda-forge-compilers): Public chat room focused on the conda-forge compiler stack.
4545
* [element: conda-forge-space](https://app.element.io/#/room/#conda-forge-space:matrix.org): An element space listing all conda-forge rooms.
4646
* [element: interns](https://app.element.io/#/room/#conda-forge_conda-forge-interns:gitter.im): Public chat room for conda-forge interns to discuss projects and seek guidance from the community.

docs/orga/governance.md.tmpl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ calling a vote are as follows:
9898
violating the code of conduct.
9999
* Voting yes moves the proposal forward;
100100
voting no is the only way to express opposition to the proposal;
101-
not voting is discouraged, but non-votes do not count as “no”.
101+
not voting is discouraged, but non-votes do not count as "no".
102102
* There should always be an option to abstain from voting.
103103

104104
Voting items are labeled as either **standard** or **sensitive**.
@@ -118,7 +118,7 @@ as the authoritative list of emails to use.
118118
The default voting period is 1 week (7 days). This may be modified at
119119
the time when a vote is called, but may never be less than 24 hrs.
120120

121-
Additional requirements may apply in case low turnouts have to be handled, see Quorum below.
121+
Additional requirements may apply in case low turnouts have to be handled, see "Quorum" below.
122122

123123
To call for a standard vote, here is a template PR comment:
124124

@@ -134,7 +134,7 @@ This vote will end on {date}.
134134
---
135135
* **Posting results:**
136136
To maintain the historical record, the outcome of any standard vote which invokes the
137-
time out rules below should be recorded in the vote-results folder at
137+
"time out" rules below should be recorded in the "vote-results" folder at
138138
[https://github.com/conda-forge/conda-forge.github.io/tree/main/vote-results](https://github.com/conda-forge/conda-forge.github.io/tree/main/vote-results)
139139

140140
Each vote should be its own file. The filename should reflect the topic and the
@@ -149,7 +149,7 @@ This vote will end on {date}.
149149
* **Quorum:**
150150
Quorum for votes can be met in one of three ways depending on the
151151
vote: the standard quorum rules, the accelerated quorum rules, and the
152-
time out quorum rules. The specific quorum rules applicable
152+
"time out" quorum rules. The specific quorum rules applicable
153153
for each vote are listed below.
154154

155155
**Standard Quorum Rules**: All percentages below express *both*
@@ -162,12 +162,12 @@ This vote will end on {date}.
162162

163163
**Accelerated Quorum Rules**: For certain votes, we allow a lower quorum level.
164164
For these votes,
165-
if the voting period is longer than a week and there are no “no” votes, a quorum
165+
if the voting period is longer than a week and there are no "no" votes, a quorum
166166
of half of the size
167167
needed for a **standard quorum** above is acceptable. For example, for a vote
168168
requiring 50% with 18
169-
active core members, at least 5 people must vote yes and exactly 0 people
170-
must vote “no”.
169+
active core members, at least 5 people must vote "yes" and exactly 0 people
170+
must vote "no".
171171

172172
**Time-out Quorum Rules**: Votes not achieving quorum will eventually time out on their set end date.
173173
When this happens,
@@ -203,7 +203,7 @@ This vote will end on {date}.
203203
reviews.
204204
```
205205

206-
To declare a standard vote timed out, the person making such a declaration
206+
To declare a standard vote "timed out," the person making such a declaration
207207
must post a pull-request adding
208208
a vote record to the [vote-results folder](https://github.com/conda-forge/conda-forge.github.io/tree/main/vote-results).
209209
The declaration PR should be merged by the first core member
@@ -263,7 +263,7 @@ This vote will end on {date}.
263263
Occasionally, discussions become
264264
toxic and antithetical to the goal of fostering the conda-forge
265265
community. Members of core have the right to lock the thread in an
266-
ask for forgiveness and not for permission way so bad situations
266+
"ask for forgiveness and not for permission" way so bad situations
267267
are handled quickly. The lock must be justified in the thread itself
268268
with a text explaining the reasons for locking and how the participants
269269
can contest it.

docs/orga/guidelines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ To add new packages to conda-forge, users can submit a PR to `staged-recipes` (s
193193
where it will undergo a series of automated checks and a code review.
194194
Any conda-forge member can perform a code review, but the final merge can only be done by the `staged-recipes` or `core` teams.
195195
The following sections suggest guidelines on how to perform a successful code review.
196-
We distinguish between Required and Recommended as follows:
196+
We distinguish between "Required" and "Recommended" as follows:
197197

198198
- Required: These guidelines are very important and a requisite for PR acceptance. Exceptions are rare and usually require `core` approval.
199-
- Recommended: These are considered nice to have features. Ideally, all recipes should abide by them, but exceptions are tolerated as long as justifiable reasons are provided.
199+
- Recommended: These are considered "nice to have" features. Ideally, all recipes should abide by them, but exceptions are tolerated as long as justifiable reasons are provided.
200200

201201
<a id="generalities"></a>
202202

docs/orga/joining-the-team.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Generally speaking, your role is as follows:
5555
To join the staged-recipes team, please ask one of the core members on our
5656
[Element chatroom](https://app.element.io/#/room/#conda-forge:matrix.org).
5757
We will then reach consensus in private and let you know our decision.
58-
Our decision will likely be yes but it could be please get more involved
59-
with the review process on staged recipes first if we have not seen you
58+
Our decision will likely be "yes" but it could be "please get more involved
59+
with the review process on staged recipes first" if we have not seen you
6060
take much interest in the staged-recipes review process.
61-
For transparency, our process is to have the core team vote on adding new
61+
For transparency, our process is to have the core team "vote" on adding new
6262
members. When we have a new member candidate, we ask the core team to vote
6363
yes/no and give the team seven days to vote. The person will then be given merge
6464
rights to conda-forge/staged-recipes so that they can help us review and merge

docs/orga/minutes/2017-08-11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Attendees (github handle in parens):
2222
- Jonathan - create tool for modifying feedstocks directly. Sync up with John K with any additional questions
2323
- John K - Update staged recipes with new binstar token. We can then update feedstocks by merging the recipe for that feedstock again
2424
- email to mailing list
25-
- add note to status page We’re aware of this issue. Please take these steps <link> to resolve it
25+
- add note to status page "We’re aware of this issue. Please take these steps <link> to resolve it"
2626
- Proposing new members for core or staged-recipes team and create reviewing policies
2727
- https://github.com/conda-forge/staged-recipes/wiki/Reviewing-recipes-on-conda-forge-staged-recipes
2828
- SciPy Review (Filipe)

docs/orga/minutes/2017-11-16.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Scheduled time: 9 AM central. Meeting link: https://anaconda.webex.com/anaconda
6262
| LDFLAGS_SHARED | %LDFLAGS_SHARED% -LTCG ucrt.lib |
6363

6464

65-
Overall: everyone receptive to new compilers. Mike to provide way of keeping host and build prefix separate, even when not cross compiling. This would avoid need for things like always_include_files and would facilitate conda-forge keeping their llvmdev recipe as is (for cling usage).
65+
Overall: everyone receptive to new compilers. Mike to provide way of keeping host and build prefix separate, even when not cross compiling. This would avoid need for things like "always_include_files" and would facilitate conda-forge keeping their llvmdev recipe as is (for cling usage).
6666

6767
Filipe: this is really little more than a vendor change. We already depend on other vendors for compilers (RH for devtoolset2; apple for existing clang), we’re only switching to a different vendor, not fundamentally changing what we do.
6868

0 commit comments

Comments
 (0)