mirror of https://github.com/nucypher/nucypher.git
remove Pipenv
KPrasch
derekpierre
parent
5f1aa85194
commit
190f778637
|
|
@ -5,8 +5,7 @@ Demos:
|
|||
- examples/**/*
|
||||
|
||||
Dependencies:
|
||||
- Pipfile
|
||||
- Pipfile.lock
|
||||
- poetry.lock
|
||||
- setup.py
|
||||
- dev-requirements.txt
|
||||
- requirements.txt
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ Ensure Rust is Installed
|
|||
Instruction for installing Rust can be found (\ `here <https://rustup.rs/>`_\ ).
|
||||
|
||||
After acquiring a local copy of the application code and installing rust, you will need to
|
||||
install the project dependencies, we recommend using either ``pip`` or ``pipenv``.
|
||||
install the project dependencies, we recommend using either ``pip`` or ``poetry``.
|
||||
|
||||
|
||||
Pip Development Installation
|
||||
|
|
|
|||
16
Makefile
16
Makefile
|
|
@ -7,8 +7,6 @@ help:
|
|||
@echo "dist - build wheels and source distribution"
|
||||
@echo "smoke-test - build a source distribution and spawn an active virtual environment"
|
||||
@echo "lock - Regenerate dependency locks"
|
||||
@echo "env - Regenerate locks and create a new development pipenv"
|
||||
@echo "install - Development installation via pipenv"
|
||||
|
||||
clean: clean-build clean-pyc
|
||||
|
||||
|
|
@ -51,17 +49,3 @@ smoke-test: clean
|
|||
lock: clean
|
||||
# Relock dependencies
|
||||
scripts/dependencies/relock_dependencies.sh
|
||||
|
||||
env: lock
|
||||
# Relock dependencies and generate a pipenv virtualenv from the result
|
||||
pipenv run pip install -e .[dev]
|
||||
pipenv shell
|
||||
nucypher --version
|
||||
|
||||
install: clean
|
||||
pipenv --rm
|
||||
# Development installation
|
||||
pipenv run pip install -e .[dev]
|
||||
# Show installed version and verify entry point
|
||||
pipenv shell
|
||||
nucypher --version
|
||||
|
|
|
|||
63
Pipfile
63
Pipfile
|
|
@ -1,63 +0,0 @@
|
|||
[[source]]
|
||||
url = "https://pypi.python.org/simple"
|
||||
verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[requires]
|
||||
python_version = "3"
|
||||
|
||||
[packages]
|
||||
nucypher-core = "==0.13.0"
|
||||
# Cryptography
|
||||
cryptography = "*"
|
||||
mnemonic = "*"
|
||||
pynacl = ">=1.4.0"
|
||||
pyopenssl = "*"
|
||||
# Ethereum
|
||||
eth-abi = "*"
|
||||
eth-tester = "<0.10"
|
||||
eth-account = "*"
|
||||
eth-utils = "*"
|
||||
web3 = ">=6.0.0"
|
||||
atxm = ">=0.2.0"
|
||||
# Web
|
||||
flask = "*"
|
||||
hendrix = ">=5.0"
|
||||
requests = "*"
|
||||
mako = "*"
|
||||
# CLI
|
||||
click = ">=7.0"
|
||||
colorama = "*"
|
||||
tabulate = "*"
|
||||
# Serialization
|
||||
marshmallow = "*"
|
||||
# Utilities
|
||||
aiohttp = "*"
|
||||
appdirs = "*"
|
||||
constant-sorrow = ">=0.1.0a9"
|
||||
maya = "*"
|
||||
pendulum = ">=3.0.0b1"
|
||||
prometheus-client = "*"
|
||||
setuptools = "*"
|
||||
urllib3 = "*"
|
||||
watchdog = "<4,>=3"
|
||||
|
||||
|
||||
[dev-packages]
|
||||
# Pytest
|
||||
pytest = "<7" # See https://github.com/pytest-dev/pytest/issues/9703
|
||||
pytest-cov = "*"
|
||||
pytest-mock = "*"
|
||||
pytest-timeout = "*"
|
||||
pytest-twisted = "*"
|
||||
# Tools
|
||||
ape-solidity = ">=0.6.5"
|
||||
coverage = ">=7.3.2"
|
||||
eth-ape = ">=0.6.23"
|
||||
pre-commit = ">=2.12.1"
|
||||
|
||||
[scripts]
|
||||
nucypher = "python3 nucypher/cli/main.py"
|
||||
|
||||
[pipenv]
|
||||
allow_prereleases = true
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,134 +0,0 @@
|
|||
-i https://pypi.python.org/simple
|
||||
aiohttp==3.9.3; python_version >= '3.8'
|
||||
aiosignal==1.3.1; python_version >= '3.7'
|
||||
annotated-types==0.6.0; python_version >= '3.8'
|
||||
ape-solidity==0.7.1; python_version >= '3.8' and python_version < '4'
|
||||
asttokens==2.4.1
|
||||
attrs==23.2.0; python_version >= '3.7'
|
||||
base58==1.0.3
|
||||
bitarray==2.9.2
|
||||
cached-property==1.5.2
|
||||
certifi==2024.2.2; python_version >= '3.6'
|
||||
cffi==1.16.0; platform_python_implementation != 'PyPy'
|
||||
cfgv==3.4.0; python_version >= '3.8'
|
||||
charset-normalizer==3.3.2; python_full_version >= '3.7.0'
|
||||
click==8.1.7; python_version >= '3.7'
|
||||
coverage[toml]==7.4.1; python_version >= '3.8'
|
||||
cryptography==42.0.2; python_version >= '3.7'
|
||||
cytoolz==0.12.3; implementation_name == 'cpython'
|
||||
dataclassy==0.11.1; python_version >= '3.6'
|
||||
decorator==5.1.1; python_version >= '3.5'
|
||||
deprecated==1.2.14; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
|
||||
distlib==0.3.8
|
||||
eip712==0.2.4; python_version >= '3.8' and python_version < '4'
|
||||
eth-abi==4.2.1; python_full_version >= '3.7.2' and python_version < '4'
|
||||
eth-account==0.10.0; python_version >= '3.7' and python_version < '4'
|
||||
eth-ape==0.7.7; python_version >= '3.8' and python_version < '4'
|
||||
eth-bloom==3.0.0; python_version >= '3.8' and python_version < '4'
|
||||
eth-hash[pycryptodome]==0.6.0; python_version >= '3.8' and python_version < '4'
|
||||
eth-keyfile==0.7.0; python_version >= '3.8' and python_version < '4'
|
||||
eth-keys==0.4.0
|
||||
eth-pydantic-types==0.1.0a5; python_version >= '3.8' and python_version < '4'
|
||||
eth-rlp==1.0.1; python_version >= '3.8' and python_version < '4'
|
||||
eth-tester==0.9.1b2; python_full_version >= '3.6.8' and python_version < '4'
|
||||
eth-typing==3.5.2; python_version < '4' and python_full_version >= '3.7.2'
|
||||
eth-utils==2.3.1; python_version >= '3.7' and python_version < '4'
|
||||
ethpm-types==0.6.7; python_version >= '3.8' and python_version < '4'
|
||||
evm-trace==0.1.2; python_version >= '3.8' and python_version < '4'
|
||||
evmchains==0.0.2; python_version >= '3.8'
|
||||
executing==2.0.1; python_version >= '3.5'
|
||||
filelock==3.13.1; python_version >= '3.8'
|
||||
frozenlist==1.4.1; python_version >= '3.8'
|
||||
greenlet==3.0.3; python_version >= '3.7'
|
||||
hexbytes==0.3.1; python_version >= '3.7' and python_version < '4'
|
||||
identify==2.5.33; python_version >= '3.8'
|
||||
idna==3.6; python_version >= '3.5'
|
||||
ijson==3.2.3
|
||||
importlib-metadata==7.0.1; python_version >= '3.8'
|
||||
iniconfig==2.0.0; python_version >= '3.7'
|
||||
ipython==8.21.0; python_version >= '3.10'
|
||||
jedi==0.19.1; python_version >= '3.6'
|
||||
jsonschema==4.21.1; python_version >= '3.8'
|
||||
jsonschema-specifications==2023.12.1; python_version >= '3.8'
|
||||
lazyasd==0.1.4
|
||||
lru-dict==1.2.0
|
||||
markdown-it-py==3.0.0; python_version >= '3.8'
|
||||
matplotlib-inline==0.1.6; python_version >= '3.5'
|
||||
mdurl==0.1.2; python_version >= '3.7'
|
||||
morphys==1.0
|
||||
msgspec==0.18.6; python_version >= '3.8'
|
||||
multidict==6.0.5; python_version >= '3.7'
|
||||
mypy-extensions==1.0.0; python_version >= '3.5'
|
||||
nodeenv==1.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
|
||||
numpy==1.26.4; python_version >= '3.10'
|
||||
packaging==23.2; python_version >= '3.7'
|
||||
pandas==1.5.3; python_version >= '3.8'
|
||||
parsimonious==0.9.0
|
||||
parso==0.8.3; python_version >= '3.6'
|
||||
pexpect==4.9.0; sys_platform != 'win32'
|
||||
platformdirs==4.2.0; python_version >= '3.8'
|
||||
pluggy==1.4.0; python_version >= '3.8'
|
||||
pre-commit==3.6.0; python_version >= '3.9'
|
||||
prompt-toolkit==3.0.43; python_full_version >= '3.7.0'
|
||||
protobuf==5.26.0rc2; python_version >= '3.8'
|
||||
ptyprocess==0.7.0
|
||||
pure-eval==0.2.2
|
||||
py==1.11.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
|
||||
py-cid==0.3.0
|
||||
py-ecc==6.0.0; python_version >= '3.6' and python_version < '4'
|
||||
py-evm==0.7.0a4
|
||||
py-geth==4.2.0; python_version >= '3.8' and python_version < '4'
|
||||
py-multibase==1.0.3
|
||||
py-multicodec==0.2.1
|
||||
py-multihash==0.2.3
|
||||
py-solc-x==2.0.2; python_version >= '3.8' and python_version < '4'
|
||||
pycparser==2.21
|
||||
pycryptodome==3.20.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
|
||||
pydantic==2.5.3; python_version >= '3.7'
|
||||
pydantic-core==2.14.6; python_version >= '3.7'
|
||||
pydantic-settings==2.1.0; python_version >= '3.8'
|
||||
pyethash==0.1.27
|
||||
pygithub==1.59.1; python_version >= '3.7'
|
||||
pygments==2.17.2; python_version >= '3.7'
|
||||
pyjwt[crypto]==2.8.0; python_version >= '3.7'
|
||||
pynacl==1.5.0; python_version >= '3.6'
|
||||
pytest==6.2.5; python_version >= '3.6'
|
||||
pytest-cov==4.1.0; python_version >= '3.7'
|
||||
pytest-mock==3.12.0; python_version >= '3.8'
|
||||
pytest-timeout==2.2.0; python_version >= '3.7'
|
||||
pytest-twisted==1.14.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
|
||||
python-baseconv==1.2.2
|
||||
python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
|
||||
python-dotenv==1.0.1; python_version >= '3.8'
|
||||
pytz==2024.1
|
||||
pyunormalize==15.1.0; python_version >= '3.6'
|
||||
pyyaml==6.0.1; python_version >= '3.6'
|
||||
referencing==0.33.0; python_version >= '3.8'
|
||||
regex==2023.12.25; python_version >= '3.7'
|
||||
requests==2.31.0; python_version >= '3.7'
|
||||
rich==13.7.0; python_full_version >= '3.7.0'
|
||||
rlp==3.0.0
|
||||
rpds-py==0.17.1; python_version >= '3.8'
|
||||
safe-pysha3==1.0.4
|
||||
semantic-version==2.10.0; python_version >= '2.7'
|
||||
setuptools==69.0.3; python_version >= '3.8'
|
||||
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
|
||||
sortedcontainers==2.4.0
|
||||
sqlalchemy==2.0.25; python_version >= '3.7'
|
||||
stack-data==0.6.3
|
||||
toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
|
||||
toolz==0.12.1; python_version >= '3.7'
|
||||
tqdm==4.66.1; python_version >= '3.7'
|
||||
traitlets==5.14.1; python_version >= '3.8'
|
||||
trie==2.2.0; python_version >= '3.7' and python_version < '4'
|
||||
typing-extensions==4.9.0; python_version >= '3.8'
|
||||
urllib3==2.2.0; python_version >= '3.8'
|
||||
varint==1.0.2
|
||||
virtualenv==20.25.0; python_version >= '3.7'
|
||||
watchdog==3.0.0; python_version >= '3.7'
|
||||
wcwidth==0.2.13
|
||||
web3==6.15.1; python_full_version >= '3.7.2'
|
||||
websockets==12.0; python_version >= '3.8'
|
||||
wrapt==1.16.0; python_version >= '3.6'
|
||||
yarl==1.9.4; python_version >= '3.7'
|
||||
zipp==3.17.0; python_version >= '3.8'
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
-i https://pypi.python.org/simple
|
||||
aiohttp==3.9.3; python_version >= '3.8'
|
||||
aiosignal==1.3.1; python_version >= '3.7'
|
||||
appdirs==1.4.4
|
||||
attrs==23.2.0; python_version >= '3.7'
|
||||
atxm==0.2.0; python_version >= '3.8'
|
||||
autobahn==23.6.2; python_version >= '3.9'
|
||||
automat==22.10.0
|
||||
bitarray==2.9.2
|
||||
blinker==1.7.0; python_version >= '3.8'
|
||||
bytestring-splitter==2.4.1
|
||||
certifi==2024.2.2; python_version >= '3.6'
|
||||
cffi==1.16.0; platform_python_implementation != 'PyPy'
|
||||
charset-normalizer==3.3.2; python_full_version >= '3.7.0'
|
||||
click==8.1.7; python_version >= '3.7'
|
||||
colorama==0.4.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
|
||||
constant-sorrow==0.1.0a9; python_version >= '3'
|
||||
constantly==23.10.4; python_version >= '3.8'
|
||||
cryptography==42.0.2; python_version >= '3.7'
|
||||
cytoolz==0.12.3; implementation_name == 'cpython'
|
||||
dateparser==1.2.0; python_version >= '3.7'
|
||||
eth-abi==4.2.1; python_version < '4' and python_full_version >= '3.7.2'
|
||||
eth-account==0.10.0; python_version >= '3.7' and python_version < '4'
|
||||
eth-hash[pycryptodome]==0.6.0; python_version >= '3.8' and python_version < '4'
|
||||
eth-keyfile==0.7.0; python_version >= '3.8' and python_version < '4'
|
||||
eth-keys==0.4.0
|
||||
eth-rlp==1.0.1; python_version >= '3.8' and python_version < '4'
|
||||
eth-tester==0.9.1b2; python_version < '4' and python_full_version >= '3.6.8'
|
||||
eth-typing==3.5.2; python_version < '4' and python_full_version >= '3.7.2'
|
||||
eth-utils==2.3.1; python_version >= '3.7' and python_version < '4'
|
||||
flask==3.0.2; python_version >= '3.8'
|
||||
frozenlist==1.4.1; python_version >= '3.8'
|
||||
hendrix==5.0.0
|
||||
hexbytes==0.3.1; python_version >= '3.7' and python_version < '4'
|
||||
humanize==4.9.0; python_version >= '3.8'
|
||||
hyperlink==21.0.0
|
||||
idna==3.6; python_version >= '3.5'
|
||||
incremental==22.10.0
|
||||
itsdangerous==2.1.2; python_version >= '3.7'
|
||||
jinja2==3.1.3; python_version >= '3.7'
|
||||
jsonschema==4.21.1; python_version >= '3.8'
|
||||
jsonschema-specifications==2023.12.1; python_version >= '3.8'
|
||||
lru-dict==1.2.0
|
||||
mako==1.3.2; python_version >= '3.8'
|
||||
markupsafe==2.1.5; python_version >= '3.7'
|
||||
marshmallow==3.20.2; python_version >= '3.8'
|
||||
maya==0.6.1
|
||||
mnemonic==0.21; python_full_version >= '3.8.1'
|
||||
msgpack-python==0.5.6
|
||||
multidict==6.0.5; python_version >= '3.7'
|
||||
nucypher-core==0.13.0
|
||||
packaging==23.2; python_version >= '3.7'
|
||||
parsimonious==0.9.0
|
||||
pendulum==3.0.0; python_version >= '3.8'
|
||||
prometheus-client==0.19.0; python_version >= '3.8'
|
||||
protobuf==5.26.0rc2; python_version >= '3.8'
|
||||
pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
|
||||
pyasn1-modules==0.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
|
||||
pychalk==2.0.1
|
||||
pycparser==2.21
|
||||
pycryptodome==3.20.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
|
||||
pynacl==1.5.0; python_version >= '3.6'
|
||||
pyopenssl==24.0.0; python_version >= '3.7'
|
||||
python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
|
||||
pytz==2024.1
|
||||
pyunormalize==15.1.0; python_version >= '3.6'
|
||||
referencing==0.33.0; python_version >= '3.8'
|
||||
regex==2023.12.25; python_version >= '3.7'
|
||||
requests==2.31.0; python_version >= '3.7'
|
||||
rlp==3.0.0
|
||||
rpds-py==0.17.1; python_version >= '3.8'
|
||||
semantic-version==2.10.0; python_version >= '2.7'
|
||||
service-identity==24.1.0; python_version >= '3.8'
|
||||
setuptools==69.0.3; python_version >= '3.8'
|
||||
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
|
||||
snaptime==0.2.4
|
||||
tabulate==0.9.0; python_version >= '3.7'
|
||||
time-machine==2.13.0; implementation_name != 'pypy'
|
||||
toolz==0.12.1; python_version >= '3.7'
|
||||
twisted==23.10.0; python_full_version >= '3.8.0'
|
||||
txaio==23.1.1; python_version >= '3.7'
|
||||
typing-extensions==4.9.0; python_version >= '3.8'
|
||||
tzdata==2023.4; python_version >= '2'
|
||||
tzlocal==5.2; python_version >= '3.8'
|
||||
urllib3==2.2.0; python_version >= '3.8'
|
||||
watchdog==3.0.0; python_version >= '3.7'
|
||||
web3==6.15.1; python_full_version >= '3.7.2'
|
||||
websockets==12.0; python_version >= '3.8'
|
||||
werkzeug==3.0.1; python_version >= '3.8'
|
||||
yarl==1.9.4; python_version >= '3.7'
|
||||
zope-interface==6.1; python_version >= '3.7'
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
# Update lock and build requirements files.
|
||||
# Use option -k to keep the Pipfile.lock file, so the process is deterministic with respect to that file.
|
||||
yes | ./scripts/dependencies/relock_dependencies.sh -k circle-requirements
|
||||
|
||||
echo "---- Validating requirements.txt ----"
|
||||
REQSHASH=$(md5sum requirements.txt | cut -d ' ' -f1)
|
||||
TESTHASH=$(md5sum circle-requirements.txt | cut -d ' ' -f1)
|
||||
|
||||
echo "- $REQSHASH"
|
||||
echo "- $TESTHASH"
|
||||
if [ $REQSHASH == $TESTHASH ]; then
|
||||
echo "- requirements.txt is valid ...."
|
||||
else
|
||||
echo "- requirements.txt contains inconsistencies ...."
|
||||
echo "- you may want to run `pipenv sync --dev` and then ./scripts/dependencies/relock_dependencies.sh ...."
|
||||
echo "- which will rebuild your *requirements.txt files ...."
|
||||
diff requirements.txt circle-requirements.txt
|
||||
exit 2
|
||||
fi
|
||||
|
||||
echo "---- Validating dev-requirements.txt ----"
|
||||
REQSHASH=$(md5sum dev-requirements.txt | cut -d ' ' -f1)
|
||||
TESTHASH=$(md5sum dev-circle-requirements.txt | cut -d ' ' -f1)
|
||||
|
||||
echo "- $REQSHASH"
|
||||
echo "- $TESTHASH"
|
||||
|
||||
if [ $REQSHASH == $TESTHASH ]; then
|
||||
echo "- dev-requirements.txt is valid ...."
|
||||
else
|
||||
echo "- dev-requirements.txt contains inconsistencies ...."
|
||||
echo "- you may want to run `pipenv sync --dev` and then ./scripts/dependencies/relock_dependencies.sh ...."
|
||||
echo "- which will rebuild your *requirements.txt files ...."
|
||||
diff dev-requirements.txt dev-circle-requirements.txt
|
||||
exit 2
|
||||
fi
|
||||
2
setup.py
2
setup.py
|
|
@ -99,7 +99,7 @@ class PostDevelopCommand(develop):
|
|||
|
||||
def read_requirements(path):
|
||||
with open(BASE_DIR / path) as f:
|
||||
_pipenv_flags, *lines = f.read().split('\n')
|
||||
lines = f.read().split('\n')
|
||||
|
||||
# TODO remove when will be no more git dependencies in requirements.txt
|
||||
# Transforms VCS requirements to PEP 508
|
||||
|
|
|
|||
Loading…
Reference in New Issue