Skip to content

Commit

Permalink
Merge pull request #148 from martinholmer/revise-upload
Browse files Browse the repository at this point in the history
Force upload of already uploaded packages; use anaconda-client=1.6
  • Loading branch information
martinholmer authored Dec 16, 2018
2 parents 12b08e9 + 904b6d1 commit 7e08c7f
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ this command and getting something like this screen output:

```
$ pbrelease --version
Package-Builder 0.13.0
Package-Builder 0.16.0
```

Then see the information that `pbrelease` expects by asking for help
Expand Down
22 changes: 21 additions & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ Go [here](https://github.com/PSLmodels~/Package-Builder/pulls?q=is%3Apr+is%3Aclo
for a complete commit history.


2018-12-16 Release 0.16.0
-------------------------
(last merged pull request is
[#148](https://github.com/PSLmodels/Package-Builder/pull/148))

**API Changes**
- None

**New Features**
- Make `anaconda upload` command overwrite already uploaded packages
[[#148](https://github.com/PSLmodels/Package-Builder/pull/148)
by Martin Holmer with assistance from Hank Doupe]
- Avoid using the new 1.7.* versions of anaconda-client package
[[#148](https://github.com/PSLmodels/Package-Builder/pull/148)
by Martin Holmer with assistance from Hank Doupe]

**Bug Fixes**
- None


2018-12-15 Release 0.15.0
-------------------------
(last merged pull request is
Expand All @@ -15,7 +35,7 @@ for a complete commit history.
**New Features**
- Simplify `anaconda upload` command used by Package-Builder
[[#147](https://github.com/PSLmodels/Package-Builder/pull/147)
by Martin Holmer with assistance from Hand Doupe]
by Martin Holmer with assistance from Hank Doupe]

**Bug Fixes**
- None
Expand Down
4 changes: 2 additions & 2 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ requirements:
- python
- "conda>=4.5"
- "conda-build>=3.5"
- anaconda-client
- anaconda-client=1.6

run:
- python
- "conda>=4.5"
- "conda-build>=3.5"
- anaconda-client
- anaconda-client=1.6

about:
home: https://github.com/PSLmodels/Package-Builder
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dependencies:
- python
- "conda>=4.5"
- "conda-build>=3.5"
- anaconda-client
- anaconda-client=1.6
- pytest
- pytest-pep8
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion pkgbld/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def release(repo_name, pkg_name, version, also37=True, dryrun=False):
'for Python {}').format(pyver))
for platform in OS_PLATFORMS:
pkgpath = os.path.join(BUILDS_DIR, platform, pkgfile)
cmd = 'anaconda -t {} upload -u {} --skip-existing {}'.format(
cmd = 'anaconda -t {} upload -u {} --force {}'.format(
token, ANACONDA_USER, pkgpath
)
u.os_call(cmd)
Expand Down

0 comments on commit 7e08c7f

Please sign in to comment.