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

py-fenics-ufl: add new version #43848

Merged
merged 6 commits into from Apr 30, 2024
Merged

Conversation

garth-wells
Copy link
Contributor

No description provided.

@garth-wells
Copy link
Contributor Author

@spackbot fix style

Copy link

spackbot-app bot commented Apr 25, 2024

Let me see if I can fix that for you!

Copy link

spackbot-app bot commented Apr 25, 2024

I was able to run spack style --fix for you!

spack style --fix
==> Running style checks on spack
  selected: isort, black, flake8, mypy
==> Modified files
  var/spack/repos/builtin/packages/py-fenics-ufl/package.py
==> Running isort checks
  isort checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/py-fenics-ufl/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
  black checks were clean
==> Running flake8 checks
  flake8 checks were clean
==> Running mypy checks
lib/spack/spack/version/version_types.py:145: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:452: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:481: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
Found 3 errors in 1 file (checked 622 source files)
  mypy found errors
Keep in mind that I cannot fix your flake8 or mypy errors, so if you have any you'll need to fix them and update the pull request. If I was able to push to your branch, if you make further changes you will need to pull from your updated branch before pushing again.

I've updated the branch with style fixes.

But it looks like I'm not able to push to your branch. 😭️ Did you check Allow edits from maintainers when you opened the PR?

@garth-wells
Copy link
Contributor Author

@spackbot re-run pipeline

Copy link

spackbot-app bot commented Apr 25, 2024

I'm sorry, gitlab does not have your latest revision yet, I can't run that pipeline for you right now.

One likely possibility is that your PR pipeline has been temporarily deferred, in which case, it is awaiting a develop pipeline, and will be run when that finishes.

Please check the gitlab commit status message to see if more information is available.

Details
Unexpected response from gitlab: {'message': '404 Commit Not Found'}

@garth-wells
Copy link
Contributor Author

@spackbot fix style

Copy link

spackbot-app bot commented Apr 25, 2024

Let me see if I can fix that for you!

Copy link

spackbot-app bot commented Apr 25, 2024

I was able to run spack style --fix for you!

spack style --fix
==> Running style checks on spack
  selected: isort, black, flake8, mypy
==> Modified files
  var/spack/repos/builtin/packages/py-fenics-ufl/package.py
==> Running isort checks
  isort checks were clean
==> Running black checks
reformatted var/spack/repos/builtin/packages/py-fenics-ufl/package.py
All done! ✨ 🍰 ✨
1 file reformatted.
  black checks were clean
==> Running flake8 checks
  flake8 checks were clean
==> Running mypy checks
lib/spack/spack/version/version_types.py:145: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:452: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
lib/spack/spack/version/version_types.py:481: error: Argument 2 to "StandardVersion" has incompatible type "*Tuple[Tuple[Any, ...], Tuple[Any, ...]]"; expected "Tuple[Tuple[Any, ...], Tuple[Any, ...]]"  [arg-type]
Found 3 errors in 1 file (checked 622 source files)
  mypy found errors
Keep in mind that I cannot fix your flake8 or mypy errors, so if you have any you'll need to fix them and update the pull request. If I was able to push to your branch, if you make further changes you will need to pull from your updated branch before pushing again.

I've updated the branch with style fixes.

But it looks like I'm not able to push to your branch. 😭️ Did you check Allow edits from maintainers when you opened the PR?

@tldahlgren
Copy link
Contributor

tldahlgren commented Apr 30, 2024

Since spackbot can't automatically fix the errors, the following changes (basically collapse all of the version directives to either a single line or, for those with .post# extensions, collapse the version name and sha256 to a single line) still need to be made:

--- var/spack/repos/builtin/packages/py-fenics-ufl/package.py	2024-04-25 19:30:41.137811+00:00
+++ var/spack/repos/builtin/packages/py-fenics-ufl/package.py	2024-04-25 19:30:52.447625+00:00
@@ -20,58 +20,29 @@
 
     license("LGPL-3.0-or-later")
 
     version("main", branch="main")
     version(
-        "2024.1.0.post1",
-        sha256="6e38e93a2c8417271c9fb316e0d0ea5fe1101c6a37b2496fff8290e7ea7ead74",
+        "2024.1.0.post1", sha256="6e38e93a2c8417271c9fb316e0d0ea5fe1101c6a37b2496fff8290e7ea7ead74"
     )
+    version("2023.2.0", sha256="d1d3209e8ebd4bd70513c26890f51823bac90edc956233c47bd8e686e064436e")
     version(
-        "2023.2.0",
-        sha256="d1d3209e8ebd4bd70513c26890f51823bac90edc956233c47bd8e686e064436e",
+        "2023.1.1.post0", sha256="9e6e87f1447635029cec42604f62a76bba84899beb4b8822af10389d1f93a9b6"
     )
+    version("2022.2.0", sha256="d6e18e06df5d7a626c3138d49a543914d68186afb6159c4d1a7cd72b2a199b02")
+    version("2022.1.0", sha256="48359903d47fb397900d105fe4a60b459c50bbf9d9da78beb9accb54e4e4acaf")
+    version("2021.1.0", sha256="130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337")
+    version("2019.1.0", sha256="46ac0df4e96327be10b9576d2b8fa8b2c4ca62d3c681d407f5718b162d3ca22d")
+    version("2018.1.0", sha256="b0d4c2f43f396fd5609317b70d55b53b89c649962fc8a593f4e0e21607da211d")
     version(
-        "2023.1.1.post0",
-        sha256="9e6e87f1447635029cec42604f62a76bba84899beb4b8822af10389d1f93a9b6",
+        "2017.2.0.post0", sha256="111e77707cd6731584b1041f405c2fd3f1752a86c51fd9c430524bd396f293b0"
     )
+    version("2017.2.0", sha256="0adff7a511185b20c38ddaccdeed6c1b2ecafe4b163c688bfd1316d5c3b1c00d")
     version(
-        "2022.2.0",
-        sha256="d6e18e06df5d7a626c3138d49a543914d68186afb6159c4d1a7cd72b2a199b02",
+        "2017.1.0.post1", sha256="82c8170f44c2392c7e60aa86495df22cc209af50735af8115dc35aeda4b0ca96"
     )
-    version(
-        "2022.1.0",
-        sha256="48359903d47fb397900d105fe4a60b459c50bbf9d9da78beb9accb54e4e4acaf",
-    )
-    version(
-        "2021.1.0",
-        sha256="130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337",
-    )
-    version(
-        "2019.1.0",
-        sha256="46ac0df4e96327be10b9576d2b8fa8b2c4ca62d3c681d407f5718b162d3ca22d",
-    )
-    version(
-        "2018.1.0",
-        sha256="b0d4c2f43f396fd5609317b70d55b53b89c649962fc8a593f4e0e21607da211d",
-    )
-    version(
-        "2017.2.0.post0",
-        sha256="111e77707cd6731584b1041f405c2fd3f1752a86c51fd9c430524bd396f293b0",
-    )
-    version(
-        "2017.2.0",
-        sha256="0adff7a511185b20c38ddaccdeed6c1b2ecafe4b163c688bfd1316d5c3b1c00d",
-    )
-    version(
-        "2017.1.0.post1",
-        sha256="82c8170f44c2392c7e60aa86495df22cc209af50735af8115dc35aeda4b0ca96",
-    )
-    version(
-        "2016.2.0",
-        tag="ufl-2016.2.0",
-        commit="962d56f65821fb9c50ca4a5a858882c472243431",
-    )
+    version("2016.2.0", tag="ufl-2016.2.0", commit="962d56f65821fb9c50ca4a5a858882c472243431")
 
     depends_on("python@3.8:", when="@2023.2.0:", type=("build", "run"))
 
     depends_on("py-setuptools@62:", when="@2023.2.0:", type="build")
     depends_on("py-setuptools@58:", when="@2022.1.0:2023.1.1.post0", type="build")
would reformat var/spack/repos/builtin/packages/py-fenics-ufl/package.py
Oh no! 💥 💔 💥
1 file would be reformatted.

tldahlgren
tldahlgren previously approved these changes Apr 30, 2024
Copy link
Contributor

@tldahlgren tldahlgren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed the affected version sha256s.

@tldahlgren tldahlgren self-assigned this Apr 30, 2024
@garth-wells
Copy link
Contributor Author

@tldahlgren I've fixed the formatting.

@tldahlgren tldahlgren merged commit 06239de into spack:develop Apr 30, 2024
14 checks passed
@garth-wells garth-wells deleted the ufl-version-bump branch May 2, 2024 18:08
wdconinc pushed a commit that referenced this pull request May 4, 2024
* Bump version to 2024.1.0
* Bump to .post0
* Dependency fix
* Format file
* Run black on package file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants