Skip to content

Commit

Permalink
Moving back to Pipenv to manage dependencies
Browse files Browse the repository at this point in the history
Poetry breaks no-binary installations of the RSA library, which defeats
the purpose of this library.

See #148

Among other changes, this reverts commit
fcf5b74.

I also added a workaround for an `ImportError` importing `zipp` on
Python 3.5.
  • Loading branch information
sybrenstuvel committed Jun 11, 2020
1 parent 5c7696d commit d15a7f3
Show file tree
Hide file tree
Showing 10 changed files with 666 additions and 1,071 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ matrix:
include:
- python: 3.5
dist: xenial # Bionic has no Python 3.5
script: pip install zipp

# Disabled, see https://github.com/sybrenstuvel/python-rsa/issues/131
#- python: pypy3.5
# dist: xenial # Bionic has no Python 3.5

install:
- pip install poetry
- poetry install -v
- pip install -U pip setuptools # https://github.com/pypa/virtualenv/issues/1630
- pip install pipenv
- pipenv install --dev

script:
- poetry run py.test tests/
- pipenv run py.test tests/

after_success:
- poetry run coveralls
- pipenv run coveralls
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Python-RSA changelog

## Version 4.2 - in development

- Rolled back the switch to Poetry, and reverted back to using Pipenv + setup.py
for dependency management. There apparently is an issue no-binary installs of
packages build with Poetry. This fixes
[#148](https://github.com/sybrenstuvel/python-rsa/issues/148)


## Version 4.1 - released 2020-06-10

Expand Down
21 changes: 21 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
"pyasn1" = ">=0.1.3"
"pysha3" = {version = "~=1.0, >=1.0",markers = "python_version < '3.6'"}

[dev-packages]
coveralls = "~=1.8, >=1.8"
"Sphinx" = "~=2.1, >=2.1"
"pathlib2" = {version = "~=2.3, >=2.3.4",markers = "python_version < '3.6'"}
"pytest" = "~=5.0, >=5.0"
"pytest-cov" = "~=2.7, >=2.7"
"tox" = "~=3.13, >=3.13"
"mypy" = "~=0.720, >=0.720"
"flake8" = "~=3.7, >=3.7"

[requires]
python_version = "3.7"
551 changes: 551 additions & 0 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ Depending on your system you may need to use ``sudo pip`` if you want to install
the library system-wide, or use ``pip install --user rsa`` to install the
library in your home directory.

Installation from source is also quite easy. Download the source and
then type::

python setup.py install


The sources are tracked in our `Git repository`_ at
GitHub. It also hosts the `issue tracker`_.

Expand Down
Loading

0 comments on commit d15a7f3

Please sign in to comment.