Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: fix for requirements generation #61

Merged
merged 1 commit into from
Aug 27, 2021
Merged

Makefile: fix for requirements generation #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PYCOSM_SRC_DIR := cosmpy

PYCOSM_TESTS_DIR := tests
PYCOSM_EXAMPLES_DIR := examples
REQUIREMENTS_FILES := requirements.txt requirements-dev.txt Pipfile.lock
REQUIREMENTS_FILES := requirements.txt requirements-dev.txt


ifeq ($(OS),Windows_NT)
Expand Down Expand Up @@ -164,9 +164,14 @@ check:
make copyright-check
make test

$(REQUIREMENTS_FILES): Pipfile setup.py
pipenv lock -r > requirements.txt
pipenv lock -r --dev > requirements-dev.txt
Pipfile.lock: Pipfile setup.py
pipenv lock --dev

requirements.txt: Pipfile.lock
pipenv lock -r > $@

requirements-dev.txt: Pipfile.lock
pipenv lock -r --dev > $@

.PHONY: requirements
requirements: $(REQUIREMENTS_FILES)
Expand Down
118 changes: 67 additions & 51 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ configparser==5.0.2; python_version >= '3.4'
coverage==5.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
darglint==1.8.0; python_version >= '3.6' and python_version < '4.0'
distlib==0.3.2
docker==5.0.0; python_version >= '3.6'
dparse==0.5.1; python_version >= '3.5'
ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
filelock==3.0.12
flake8-copyright==0.2.2
flake8==3.9.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
Expand All @@ -34,7 +35,7 @@ grpcio==1.39.0
httplib2==0.19.1
idna==3.2; python_version >= '3'
iniconfig==1.1.1
isort==5.9.3; python_full_version >= '3.6.1' and python_version < '4.0'
isort==5.9.3; python_version < '4.0' and python_full_version >= '3.6.1'
lazy-object-proxy==1.6.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
liccheck==0.6.2; python_version >= '2.7'
mccabe==0.6.1
Expand All @@ -53,23 +54,24 @@ pyasn1==0.4.8
pycodestyle==2.7.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyflakes==2.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pylint==2.9.6; python_version ~= '3.6'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pytest==6.2.4; python_version >= '3.6'
pyyaml==5.4.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
regex==2021.8.21
regex==2021.8.27
requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
rsa==4.7.2; python_version >= '3.5' and python_version < '4'
safety==1.10.3; python_version >= '3.5'
semantic-version==2.8.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
smmap==4.0.0; python_version >= '3.5'
stevedore==3.4.0; python_version >= '3.6'
toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
tomli==1.2.1; python_version >= '3.6'
tox==3.24.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
typing-extensions==3.10.0.0
uritemplate==3.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
urllib3==1.26.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
virtualenv==20.7.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
vulture==2.3; python_version >= '3.6'
websocket-client==1.2.1; python_version >= '3.6'
wrapt==1.12.1
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bech32==1.2.0; python_version >= '3.5'
cachetools==4.2.2; python_version ~= '3.5'
certifi==2021.5.30
charset-normalizer==2.0.4; python_version >= '3'
ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
google-api-core==2.0.0; python_version >= '3.6'
google-api-python-client==2.18.0; python_version >= '3.6'
google-auth-httplib2==0.1.0
Expand All @@ -16,9 +16,9 @@ idna==3.2; python_version >= '3'
protobuf==3.17.3
pyasn1-modules==0.2.8
pyasn1==0.4.8
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
rsa==4.7.2; python_version >= '3.5' and python_version < '4'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
uritemplate==3.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
urllib3==1.26.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
],
extras_require={
"dev": [
"docker==5.0.0",
"check-manifest",
"tox==3.24.1",
"flake8==3.9.2",
Expand Down