Skip to content

Commit

Permalink
Merge 3457aec into fc16fb9
Browse files Browse the repository at this point in the history
  • Loading branch information
quicklizard99 committed Jun 9, 2018
2 parents fc16fb9 + 3457aec commit 4392744
Show file tree
Hide file tree
Showing 7 changed files with 235 additions and 220 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
build
dist
.tox
README.rst
.coverage
htmlcov
*dll
MANIFEST.in

6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
### v0.1.8

* #31 README badges no longer displaying on PyPI

### v0.1.7

Fix display of images in README
* Fix display of images in README

### v0.1.6

Expand Down
11 changes: 3 additions & 8 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,13 @@ frozen binary.

```
pip install wheel
brew install pandoc
```

2. Build
Generate the `reStructuredText README.rst` from `README.md` and create
source and wheel builds. The `win32` and `win_amd64` wheels will
Create source and wheel builds. The `win32` and `win_amd64` wheels will
contain the appropriate `zbar.dll` and its dependencies.

Including just the DLLs we want is pain...

```
pandoc --from=markdown --to=rst README.md -o README.rst
rm -rf build dist MANIFEST.in pyzbar.egg-info
cp MANIFEST.in.all MANIFEST.in
./setup.py bdist_wheel
Expand All @@ -68,15 +63,15 @@ brew install pandoc
rm -rf build MANIFEST.in pyzbar.egg-info
```

3. Release to pypitest (see https://wiki.python.org/moin/TestPyPI for details)
3. Release to TestPyPI (see https://packaging.python.org/guides/using-testpypi/)

```
mkvirtualenv pypi
pip install twine
twine upload -r pypitest dist/*
```

4. Test the release to pypitest
4. Test the release to TestPyPI

* Check https://test.pypi.org/project/pyzbar/

Expand Down
207 changes: 0 additions & 207 deletions README.md

This file was deleted.

Loading

0 comments on commit 4392744

Please sign in to comment.