Skip to content

Update some python packages to align with Spack #8116

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

Merged
smuzaffar merged 10 commits into from
Oct 12, 2022
Merged

Update some python packages to align with Spack #8116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31a9c9f
Update py3-certifi to 2022.9.14 (align with Spack)
iarspider Oct 3, 2022
5328e88
Update requirements.txt
iarspider Oct 4, 2022
d2c970e
Update requirements.txt
iarspider Oct 6, 2022
c1184f1
Update requirements.txt
iarspider Oct 7, 2022
5d11beb
Update requirements.txt
iarspider Oct 10, 2022
332ebd5
Delete poetry-cyclic-deps.patch
iarspider Oct 10, 2022
d8c41f6
Update poetry-plugin-export.file
iarspider Oct 10, 2022
3771200
Update and restore patch
iarspider Oct 10, 2022
5d32a92
Actually add patch
iarspider Oct 10, 2022
ca400f1
Update requirements.txt
iarspider Oct 12, 2022
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
34 changes: 15 additions & 19 deletions pip/poetry-cyclic-deps.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
diff --git a/setup.py b/setup.py
index d076e11..3a2429d 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ package_data = \
--- poetry-plugin-export-1.0.7/pyproject.toml.orig 2022-10-10 17:51:00.629913598 +0200
+++ poetry-plugin-export-1.0.7/pyproject.toml 2022-10-10 17:51:09.979835427 +0200
@@ -18,7 +18,6 @@

[tool.poetry.dependencies]
python = "^3.7"
-poetry = "^1.2.0"
poetry-core = "^1.1.0"

[tool.poetry.dev-dependencies]
--- poetry-plugin-export-1.0.7/setup.py.orig 2022-10-10 17:50:42.686063618 +0200
+++ poetry-plugin-export-1.0.7/setup.py 2022-10-10 17:50:52.395982438 +0200
@@ -11,7 +11,7 @@
{'': ['*']}

install_requires = \
-['poetry-core>=1.1.0b3,<2.0.0', 'poetry>=1.2.0b3,<2.0.0']
+['poetry-core>=1.1.0b3,<2.0.0']
-['poetry-core>=1.1.0,<2.0.0', 'poetry>=1.2.0,<2.0.0']
+['poetry-core>=1.1.0,<2.0.0']

entry_points = \
{'poetry.application.plugin': ['export = '
diff --git a/pyproject.toml b/pyproject.toml
index 04f6d31..d55294c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,6 @@ include = [

[tool.poetry.dependencies]
python = "^3.7"
-poetry = "^1.2.0b3"
poetry-core = "^1.1.0b3"

[tool.poetry.dev-dependencies]
16 changes: 8 additions & 8 deletions pip/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ clikit==0.6.2
cmsml==0.1.2
correctionlib==2.1.0
crashtest==0.4.0
certifi==2022.6.15
certifi==2022.9.14
cffi==1.15.1
chardet==5.0.0
Click==8.1.3
cloudpickle==2.1.0
cloudpickle==2.2.0
colorama==0.4.5
commonmark==0.9.1
conan==1.52.0
Expand Down Expand Up @@ -83,17 +83,17 @@ downhill==0.4.0
dulwich==0.20.46
editables==0.3
entrypoints==0.4
executing==1.0.0
executing==1.1.0
fasteners==0.17.3
fastjsonschema==2.16.1
fastjsonschema==2.16.2
filelock==3.8.0
fire==0.4.0
flit==3.7.1
flit-core==3.7.1
flake8==5.0.4
flatbuffers==2.0.7
flawfinder==2.0.19
fonttools==4.37.1
fonttools==4.37.3
frozenlist==1.3.1
funcsigs==1.0.2
future==0.18.2
Expand Down Expand Up @@ -121,7 +121,7 @@ importlib-metadata==4.12.0
importlib-resources==5.9.0
iniconfig==1.1.1
ipaddress==1.0.23
ipykernel==6.15.2
ipykernel==6.16.0
ipython_genutils==0.2.0
ipython==8.5.0
ipywidgets==8.0.2
Expand Down Expand Up @@ -211,7 +211,7 @@ pluggy==1.0.0
ply==3.11
poetry==1.2.0
poetry-core==1.1.0
poetry-plugin-export==1.0.6
poetry-plugin-export==1.0.7
prettytable==3.4.1
prometheus-client==0.14.1
prompt_toolkit==3.0.31
Expand Down Expand Up @@ -255,7 +255,7 @@ pytoml==0.1.21
pytools==2022.1.12
pytz==2022.2.1
PyYAML==6.0
pyzmq==23.2.1
pyzmq==24.0.1
regex==2022.8.17
repoze-lru==0.7
rep==0.6.6
Expand Down