Skip to content

Commit d9a05e1

Browse files
authored
Merge branch 'main' into patch-2
2 parents 01867f1 + 3366232 commit d9a05e1

File tree

11 files changed

+750
-20
lines changed

11 files changed

+750
-20
lines changed

newsfeed/demo/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ changes:
158158
linkcheck:
159159
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
160160
@echo
161-
@echo "Link check complete; look for any errors in the above output " \
162-
"or in $(BUILDDIR)/linkcheck/output.txt."
161+
@echo "Link check complete; look for any errors (like 'broken') in the " \
162+
"above output or in $(BUILDDIR)/linkcheck/output.txt."
163163

164164
doctest:
165165
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest

src/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
r'https://anaconda.org/?$', # 403 forbidden
127127
r'https://cloudflare.com/learning/cdn/what-is-a-cdn/?$', # 403 forbidden
128128
r'https://gitter.im/conda-forge/core$', # private team
129+
r'https://polys.me/?$', # 403 forbidden
129130
] + anchor_check_fps
130131

131132

src/maintainer/adding_pkgs.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,8 @@ for the specification on expressions.
706706
Miscellaneous
707707
=============
708708

709+
.. _activate_scripts:
710+
709711
Activate scripts
710712
----------------
711713

src/maintainer/knowledge_base.rst

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,23 +1148,7 @@ because these symbols are in fact available. To do so, add
11481148
PyPy builds
11491149
===========
11501150
1151-
To use the PyPy 3.6 or 3.7 builds you can do the following,
1152-
1153-
.. code-block:: bash
1154-
1155-
conda create -n pypy36 pypy python=3.6
1156-
conda create -n pypy37 pypy python=3.7
1157-
1158-
.. note::
1159-
1160-
As of March 8 2020, if you are using defaults as a low priority channel,
1161-
then you need to use strict channel priority as the metadata in defaults
1162-
has not been patched yet which allows cpython extension packages to be
1163-
installed alongside pypy.
1164-
1165-
.. code-block:: bash
1166-
1167-
conda config --set channel_priority strict
1151+
See :ref:`pypy` in the user docs for more info about PyPy and ``conda-forge``.
11681152
11691153
To build your python package for pypy, wait for the bot to send a
11701154
PR and contact ``conda-forge/bot`` team if a PR is not sent after the

src/orga/guidelines.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,15 @@ Fortunately, we can punt on that for now.
154154
The question of when to decide to drop an older language version remains.
155155
The guidance that we can provide here is two fold:
156156

157-
1. We will move with the community.
157+
1. We will move with the community.
158158
When our core libraries stop supporting an old version, so too will conda forge.
159159
The (nonexhaustive) list of core libraries that we consider when making the decision to drop an older version are:
160+
160161
* matplotlib
161162
* numpy
162163
* scipy
163164
* pypy
165+
164166
2. The core team can decide to keep an old version around temporarily until some specific criteria is met.
165167
For example, we're holding off on turning off py36 until pypy comes out with pypy3.7.
166168
3. If there are lots of people in the community relying on older versions, core team can decide to keep an old version around.

src/orga/minutes/2022-02-23.md

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
# conda-forge core meeting 2022-02-23
2+
3+
[last weeks meeting](https://hackmd.io/yeTyZCnzT6Oc4XE21uW5AQ?edit)
4+
[What time is the meeting in my time zone](https://arewemeetingyet.com/UTC/2020-08-26/17:00/w/Conda-forge%20dev%20meeting#eyJ1cmwiOiJodHRwczovL2hhY2ttZC5pby9wUk15dFVKV1FmU3NJM2xvMGlqQzJRP2VkaXQifQ==)
5+
Meeting info:
6+
* To join the video meeting, click this link: https://zoom.us/j/9138593505?pwd=SWh3dE1IK05LV01Qa0FJZ1ZpMzJLZz09
7+
* Otherwise, to join by phone, dial +1 347-384-8597 and enter this PIN: 828 997 153#
8+
* To view more phone numbers, click this link: https://tel.meet/ijv-qsvm-tvn?hs=5
9+
10+
## Attendees
11+
12+
| Name | Initials | GitHub ID | Affiliation |
13+
| ------------------ | -------- | -------------- | ------------ |
14+
| Matthew Becker | MRB | beckermr | cf |
15+
| Jaime R.Guerra | JRG | jaimergp | Quansight/cf |
16+
| Filipe Fernandes | FF | ocefpaf | CF |
17+
| Cheng H. Lee | CHL | chenghlee | Anaconda/cf |
18+
| Dave Clements | DPC | tnabtaf | Anaconda |
19+
| Jannis Leidel | JL | jezdez | Anaconda/cf |
20+
| Marcelo Trevisani | MDT | marcelotrevisani| CF |
21+
| John Kirkham | JK | jakirkham. | NVIDIA |
22+
| Ivan Yashchuk | IY | ivanyashchuk | Quansight |
23+
| Wolf Vollprecht | WV | | QuantStack |
24+
| Katherine Kinnaman | KK | kathatherine | Anaconda |
25+
| Chris Burr | CB | | |
26+
| Sylvain Corlay | SC | SylvainCorlay | QuantStack |
27+
| Isuru Fernando | IF | isuruf | CF/UIUC |
28+
29+
25 people total
30+
31+
## Agenda
32+
33+
### Standing items
34+
35+
* [ ] intros for new folks on the call
36+
37+
* [ ] (FF) budget
38+
* current approvals?
39+
* Whenever updated numbers land, please screenshare and show the budget.
40+
* Link is in Keybase (numfocus_spreadsheets.txt)
41+
42+
* [ ] open votes
43+
44+
* [ ] 2022 Outreachy / GSoC
45+
* Community accepted
46+
* [Project proposals](https://hackmd.io/uO6vV2V7T8eDyagZ_y7iQA#Project-2-Grayskull-and-Friends) due next Thursday/Friday March 3/4
47+
* In addition to project propsal also need contribution tasks
48+
* And Channels for potential interns to communicate with us.
49+
* Two projects
50+
* Grayskull and Friends, Jannis, and Marcelo
51+
* Doc, Matt and Katherine
52+
* questions:
53+
* (MRB) did we get info on how to submit and I forgot?
54+
* todos:
55+
* DPC will send submission links to teams.
56+
* DPC will follow up with Jannis to confirm his leadership role on the Grayskull project.
57+
58+
59+
### From previous meeting(s)
60+
61+
* [ ] (JRG) cudatoolkit download/pinning discussion (deferred)
62+
63+
### Your __new__() agenda items
64+
65+
* [X] (Ivan/JRG) adding ROCm/HIP compiler: review of previous attempts (if any) and discussion of ways forward
66+
* notes
67+
* can get a bit of funding
68+
* all of work appears to be open source
69+
* what happened in previous attempts?
70+
* Isuru:
71+
* some repos do not have licenses
72+
* need patches on top of a specific LLVM version
73+
* https://github.com/RadeonOpenCompute/llvm-project
74+
* we cannot vendor clang because we keep one copy in env
75+
* [X] (WV) boa recipe format support in conda-forge
76+
* https://github.com/conda-forge/conda-forge.github.io/issues/1612
77+
* [X] (WV) emscripten / wasm support for conda-forge
78+
* Existing discussion: https://github.com/conda/conda/issues/7619
79+
* Make it easier to add new platforms (e.g., OSS BSDs; mobile)
80+
* IF: start with https://github.com/conda-forge/conda-forge.github.io/issues/1126 as a reference
81+
* [X] (IF) Help with setting up AWS for cirun
82+
* Help needed with AWS Images
83+
84+
85+
### Active votes
86+
87+
### CFEPs
88+
89+
* [cfep-12](https://github.com/conda-forge/cfep/pull/23) Removing packages that violate the terms of the source package
90+
* Stalled since May 26, 2020
91+
* Active debate about moving to "broken" vs deleting from conda-forge channel
92+
* Active vote, ends on 2020-03-11
93+
* What were the results of the vote?
94+
* Did we hear back from NumFOCUS? they did the legal seminar which is recorded
95+
96+
### TODOs
97+
2022-01-12
98+
* review Qt PR after logs are uploaded
99+
* Add cupython and cuquantum to don't mirror list
100+
* re: `std=c++14`, Wait for Kai to comment and merge the PR
101+
* CJ and Jaime coordinate to Let Maxiconda know that we can't use their logo
102+
2021-12-01
103+
* WV: Set up meet-and-greet call with homebrew team?
104+
* MRB: (repodata patches) make a cron job that runs show_diff.py and posts an issue + commit if it is non-empty
105+
*
106+
2021-11-03
107+
- Self-hosting CI TODOs:
108+
- Change URL from drone.conda-forge.org. Proposals:
109+
- woodpecker.conda-forge.org
110+
- ci.conda-forge.org
111+
- Set up monitoring
112+
- Quantstack is setting up grafana for the mirror
113+
-
114+
115+
2021-10-18
116+
117+
2021-09-22
118+
119+
* [x] (WV): TensorFlow-GPU ready to go, just need to decide if GPU should get prio over CPU?!
120+
* GPU gets prio
121+
122+
* (MRB) master to main move (https://github.com/conda-forge/conda-forge.github.io/issues/1162)
123+
* everything done except feedstocks, releases, conda-smithy, and our github actions
124+
* releases is broken, opened an issue with github
125+
* some options for feedstocks
126+
* make sure to change the upload on branch key
127+
* [x] (MRB) make an announcement on how to update local clones (moved to the issue above)
128+
* [x] (MRB) make sure to update upload_on_branch (moved to the issue above)
129+
130+
131+
2020-11-18
132+
* [ ] (IF/MRB/MV) intel oneAPI
133+
* todo
134+
* [ ] (Nikolay) licensing for opencl_rt
135+
* [ ] (Nikolay) intelmpi ABI compat w/ mpich
136+
* [ ] (MRB/IF) figure out how exactly to package C/C++ compilers
137+
* [ ] (MRB/IF) think about fortran ABI
138+
* [x] (MRB) make conda-forge compilers room (add people including keith)
139+
* [ ] (MB) asking core members to move to "emeritus" status
140+
* [ ] TODO: Eric to set up quarterly check-in for all core members to see if they're interested in remaining "active" or if they want to move to emeritus
141+
* Remove emeritus folks from having access to various credentials (api tokens, twitter password, etc.)? This would require a change to the governance doc.
142+
143+
2020-11-11
144+
* TODO: Think about bringing in JOSS to provide context around how we might best write papers
145+
146+
2020-11-03
147+
* TODO: Check on Forrest Watters permissions for core
148+
* [x] (FF) Outreachy would cost 6500 USD.
149+
* Next steps: write abstract and vote on spending of funds.
150+
151+
2020-10-28
152+
2020-10-21
153+
* [ ] (Marius?) Python 2.7 migration
154+
* ( ) [ ] make a hint
155+
* ( ) [ ] make an announcement
156+
* ( ) [ ] make the hint a lint
157+
158+
2020-10-07
159+
* [ ] Make sure to add the NVBug info to the cudatoolkit package that conda-forge makes (if we make one)
160+
161+
2020-09-09
162+
* [ ] (ED) Update governance docs with similar voting model as what got put into conda-tools (+3 with no -1 is a pass)
163+
* [ ] (SC) Write jinja template to turn institutional partners yaml into a website https://github.com/conda-forge/conda-forge.github.io/blob/master/src/inst_partners.yaml
164+
* [ ] (SC) Document what needs to be done to create an OVH account and get access
165+
166+
2020-08-26
167+
**Docker hub**
168+
* [ ] (JK) Check in on Azure build workers to see if they have the docker hub limitation.
169+
* [ ] (JK) work with dockerhub to see if we can get OSS status
170+
* [ ] Check in again at some point. We haven't heard back as of 2020-09-23
171+
172+
**OVH**
173+
* [ ] Shout-out on twitter at some point. "Thanks forOVHCloud for providing a VM", etc. (maybe after we ship qt on windows with it?)
174+
175+
176+
* [ ] Figure out how to communicate breaking changes to users. Likely should open up an issue immediately for futher discussion. Ping @kkraus, plus capture notes from further up in these meeting notes
177+
178+
* [ ] John K. will update the cuda toolkit feedstock on the git repo to note the NVBug link to the internal NVIDIA issue tracker
179+
* [ ] Jonathan will update docs to note that some non-exhaustive list of packages (like cuda-toolkit, MKL, etc.)
180+
* [ ] Jonathan will review this [PR](https://github.com/AnacondaRecipes/cudatoolkit-feedstock/pull/7)
181+
182+
* [ ] (Kale) schedule conda working group
183+
* [ ] cfep-10 next steps: CJ to call a vote for feedback
184+
* [ ] cfep-06 next steps: Ask staged recipes team to champion this CFEP and move it forward
185+
* [ ] jakirkham & CJ-wright to sync on adding CUDA to the migration bot
186+
* [ ] (Eric) Scheduling Anaconda <-> conda-forge sync on anaconda.org requirements gathering
187+
* Will try and get this scheduled in the next month.
188+
* [ ] (Anthony) Reach out to NumFocus to figure out legal ramifications of not including licenses in files.
189+
* [ ] (Eric) check internally for funding levels for hotels & flying folks from the community in?
190+
* [ ] (Eric) Figure out finances of conda-forge to support themselves?
191+
* [ ] (jjhelmus) Open up CFEP for which python's we're going to support
192+
* [ ] (jakirkham) write a blog post on CUDA stuff we discussed today
193+
* [ ] (jakirkham) update docs on how to add CUDA support to feedstocks
194+
* [ ] (jakirkham) will open an issue on conda-smithy to investigate Drone issues. (ping the aarch team)
195+
* https://github.com/conda-forge/conda-forge.github.io/issues/954
196+
* [ ] (ED) Who we are page? Some combination of a FAQ and a who is everyone. FAQ things like:
197+
* who's the POC for CF <> Anaconda, CF <> NumFocus, CF <> Azure
198+
* who's the POC for the various subteams?
199+
* Informal information: roles, day jobs, bios, the whole nine yards, why you're here, etc.
200+
* Public or internal? I don't really care either way. Anyone feel strongly one way or the other?
201+
* opt-in to public bios
202+
* software carpentry has a large number of instructors and has https://carpentries.org/instructors
203+
* some concern about "yet another place to keep stuff up to date"
204+
* [ ] (ED) document strategies for reproducible environments using conda-forge
205+
* [ ] (UK) Static libraries stuff
206+
* [ ] Add linting hints to builds to find them
207+
* [x] Recommend how to package them -> CFEP-18
208+
* [x] We should write docs saying we don't provide support and this is a bad idea. -> CFEP-18

0 commit comments

Comments
 (0)