Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 91babab

Browse filesBrowse files
effigieseffigies
committed
Squashed commit of the following:
commit 36b721c Author: Christopher J. Markiewicz <markiewicz@stanford.edu> Date: Thu May 27 09:59:04 2021 -0400 TMP: Use Twine directly for now, skip test PyPI commit 41d942b Author: Christopher J. Markiewicz <markiewicz@stanford.edu> Date: Thu May 27 09:08:02 2021 -0400 MNT: Add content type for long description (text/x-rst) commit 4a7d600 Author: Christopher J. Markiewicz <markiewicz@stanford.edu> Date: Thu May 27 08:48:31 2021 -0400 CI: Avoid updating feedstock on non-numeric rel branches commit 5e8af43 Author: Christopher J. Markiewicz <markiewicz@stanford.edu> Date: Thu May 27 08:46:06 2021 -0400 CI: Move packaging from Circle to GitHub actions
1 parent 145341b commit 91babab
Copy full SHA for 91babab

File tree

3 files changed

+63
-71
lines changed
Filter options

3 files changed

+63
-71
lines changed

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+1-71Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -204,61 +204,6 @@ jobs:
204204
- /tmp/docker/cache/Dockerfile.base-pruned
205205
key: dockerfile-cache-v1-{{ .Branch }}-{{ checksum "/tmp/docker/cache/Dockerfile.base-pruned" }}
206206

207-
pypi_precheck:
208-
machine: *machine_kwds
209-
working_directory: /home/circleci/nipype
210-
steps:
211-
- checkout:
212-
path: /home/circleci/nipype
213-
- run:
214-
name: Check pypi preconditions
215-
command: |
216-
pyenv local 3.6.5
217-
pip install --upgrade pip twine future wheel readme_renderer setuptools
218-
python setup.py sdist bdist_wheel
219-
twine check dist/*
220-
- run:
221-
name: Validate Python 3 installation
222-
command: |
223-
pyenv local 3.6.5
224-
pip install --upgrade pip
225-
pip install dist/nipype-*-py3-none-any.whl
226-
- run:
227-
name: Validate Python 3.7 installation
228-
command: |
229-
pyenv local 3.7.0
230-
pip install --upgrade pip
231-
# Pre-install a version of numpy that will not pass
232-
pip install numpy==1.15.0
233-
pip install dist/nipype-*-py3-none-any.whl
234-
# Numpy should be upgraded to >= 1.15.3
235-
test "$(pip show numpy | grep Version)" \> "Version: 1.15.2"
236-
- run:
237-
name: Check python_requires prevents installation on Python 3.3
238-
command: |
239-
pyenv install 3.3.7
240-
pyenv local 3.3.7
241-
FAIL=false
242-
pip install dist/nipype-*-py2.py3-none-any.whl || FAIL=true
243-
$FAIL
244-
- store_artifacts:
245-
path: /home/circleci/nipype/dist
246-
247-
deploy_pypi:
248-
machine: *machine_kwds
249-
working_directory: /home/circleci/nipype
250-
steps:
251-
- checkout:
252-
path: /home/circleci/nipype
253-
- run:
254-
name: Deploy to PyPI
255-
command: |
256-
pyenv local 3.6.5
257-
pip install --upgrade twine wheel readme_renderer setuptools
258-
python setup.py check -r -s
259-
python setup.py sdist bdist_wheel
260-
twine upload dist/*
261-
262207
update_feedstock:
263208
machine: *machine_kwds
264209
working_directory: /home/circleci/nipype
@@ -295,12 +240,6 @@ workflows:
295240
version: 2
296241
build_test_deploy:
297242
jobs:
298-
- pypi_precheck:
299-
filters:
300-
branches:
301-
only: /(rel|dev)\/.*/
302-
tags:
303-
only: /.*/
304243
- compare_base_dockerfiles:
305244
filters:
306245
branches:
@@ -325,19 +264,10 @@ workflows:
325264
only: /.*/
326265
requires:
327266
- test_pytest
328-
- deploy_pypi:
329-
filters:
330-
branches:
331-
ignore: /.*/
332-
tags:
333-
only: /.*/
334-
requires:
335-
- pypi_precheck
336-
- test_pytest
337267
- update_feedstock:
338268
context: nipybot
339269
filters:
340270
branches:
341-
only: /rel\/.*/
271+
only: /rel\/\d.*/
342272
tags:
343273
only: /.*/

‎.github/workflows/package.yml

Copy file name to clipboard
+61Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Packaging
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- maint/*
8+
- rel/*
9+
tags:
10+
- '*'
11+
12+
defaults:
13+
run:
14+
shell: bash
15+
16+
jobs:
17+
package:
18+
# Build packages and upload
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
include:
23+
- os: ubuntu-latest
24+
python-version: 3.8
25+
steps:
26+
- uses: actions/checkout@v2
27+
- name: Set up Python ${{ matrix.python-version }}
28+
uses: actions/setup-python@v2
29+
with:
30+
python-version: ${{ matrix.python-version }}
31+
- name: Display Python version
32+
run: python -c "import sys; print(sys.version)"
33+
- name: Create virtual environment
34+
run: tools/ci/create_venv.sh
35+
- name: Build sdist
36+
run: tools/ci/build_archive.sh
37+
env:
38+
INSTALL_TYPE: sdist
39+
- name: Build wheel
40+
run: tools/ci/build_archive.sh
41+
env:
42+
INSTALL_TYPE: wheel
43+
### Temporary
44+
- name: Check packages with twine
45+
run: |
46+
pip install twine
47+
twine check dist/*
48+
### Switch back to this if we figure out who has permissions on test.pypi.org
49+
# - name: Test PyPI upload
50+
# uses: pypa/gh-action-pypi-publish@master
51+
# with:
52+
# user: __token__
53+
# password: ${{ secrets.TEST_PYPI_API_TOKEN }}
54+
# repository_url: https://test.pypi.org/legacy/
55+
# skip_existing: true
56+
- name: Upload to PyPI (on tags)
57+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
58+
uses: pypa/gh-action-pypi-publish@master
59+
with:
60+
user: __token__
61+
password: ${{ secrets.PYPI_API_TOKEN }}

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ def main():
119119
maintainer_email=ldict["MAINTAINER_EMAIL"],
120120
description=ldict["DESCRIPTION"],
121121
long_description=ldict["LONG_DESCRIPTION"],
122+
long_description_content_type="text/x-rst",
122123
url=ldict["URL"],
123124
download_url=ldict["DOWNLOAD_URL"],
124125
license=ldict["LICENSE"],

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.