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.

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

Ensuring that the devtools package actually includes the relevant package files #176

Merged
merged 2 commits into from
Sep 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion csvqb/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ csvwlib-devtools = {editable = true,path = "./../devtools"}
csvqb = {editable = true,path = "."}
pandas = "~=1.3.3"
csvwlib-models = {editable = true,path = "./../sharedmodels"}
rdflib-jsonld = "~=0.5.0"
rdflib-jsonld = "==0.6.1"
pydantic = {editable = true,git = "https://github.com/robons/pydantic.git"}
click = "~=8.0.1"
colorama = "~=0.4.4"
Expand Down
34 changes: 18 additions & 16 deletions csvqb/Pipfile.lock

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

2 changes: 1 addition & 1 deletion csvqb/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
dependency_links=["git+https://github.com/robons/pydantic.git#egg=pydantic"],
install_requires=[
"pandas~=1.3.3",
"rdflib-jsonld~=0.5.0",
"rdflib-jsonld==0.6.1",
"click~=8.0.1",
"colorama~=0.4.4",
"pyparsing~=2.4.7",
Expand Down
3 changes: 2 additions & 1 deletion devtools/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from setuptools import setup
from setuptools import setup, find_packages

setup(
install_requires=[
Expand All @@ -14,5 +14,6 @@
"chardet",
"black",
],
packages=find_packages(),
name="devtools",
)
3 changes: 2 additions & 1 deletion pmd/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ devtools = {editable = true,path = "./../devtools"}

[packages]
rdflib = "*"
rdflib-jsonld = "*"
rdflib-jsonld = "==0.6.1"
requests = "*"
csvw = "*"
pandas = "*"
uritemplate = "*"
pmd = {editable = true,path = "."}
sharedmodels = {editable = true,path = "./../sharedmodels"}
unidecode = "*"
pyparsing = "~=2.4.7" # Fixed to help rdflib since it doesn't lock the version and v3.0.0-RC1 has breaking changes.

[requires]
python_version = "3.9"
Loading