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

{astro}[gfbf/2023b] astropy v7.0.0 #22198

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

casparvl
Copy link
Contributor

@casparvl casparvl commented Jan 22, 2025

Copy link

github-actions bot commented Jan 22, 2025

Updated software astropy-7.0.0-gfbf-2023b.eb

Diff against astropy-5.1.1-intel-2022a.eb

easybuild/easyconfigs/a/astropy/astropy-5.1.1-intel-2022a.eb

diff --git a/easybuild/easyconfigs/a/astropy/astropy-5.1.1-intel-2022a.eb b/easybuild/easyconfigs/a/astropy/astropy-7.0.0-gfbf-2023b.eb
index 187ca13b36..dfd67b9f08 100644
--- a/easybuild/easyconfigs/a/astropy/astropy-5.1.1-intel-2022a.eb
+++ b/easybuild/easyconfigs/a/astropy/astropy-7.0.0-gfbf-2023b.eb
@@ -1,36 +1,58 @@
-easyblock = "PythonBundle"
+easyblock = 'PythonBundle'
 
 name = 'astropy'
-version = '5.1.1'
+version = '7.0.0'
 
 homepage = 'https://www.astropy.org/'
 description = """The Astropy Project is a community effort to develop a common 
 core package for Astronomy in Python and foster an ecosystem of interoperable 
-astronomy packages."""
+astronomy packages.
 
-docurls = 'https://docs.astropy.org'
+The Astropy community is committed to supporting diversity and inclusion."""
 
-toolchain = {'name': 'intel', 'version': '2022a'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
+builddependencies = [
+    ('Cython', '3.0.10'),
+    ('astropy-testing', '7.0.0'),  # Only needed for test step
+]
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('PyYAML', '6.0'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('PyYAML', '6.0.1'),
+    ('matplotlib', '3.8.2'),
 ]
 
-use_pip = True
 sanity_pip_check = True
+use_pip = True
 
 exts_list = [
-    ('pyerfa', '2.0.0.1', {
+    ('colorlog', '6.9.0', {
+        'checksums': ['bfba54a1b93b94f54e1f4fe48395725a3d92fd2a4af702f6bd70946bdc0c6ac2'],
+    }),
+    ('pyerfa', '2.0.1.5', {
         'modulename': 'erfa',
-        'checksums': ['2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30'],
+        'checksums': ['17d6b24fe4846c65d5e7d8c362dcb08199dc63b30a236aedd73875cc83e1f6c0'],
+    }),
+    ('extension-helpers', '1.2.0', {
+        'modulename': 'extension_helpers',
+        'source_tmpl': 'extension_helpers-%(version)s.tar.gz',
+        'checksums': ['e7d9c8f71804edd7ecd05b5d59a5b504f6e24867970abfc12771242eed76ebcc'],
     }),
-    ('extension-helpers', '1.0.0', {
-        'checksums': ['ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6'],
+    ('astropy-iers-data', '0.2025.1.6.0.33.42', {
+        'source_tmpl': 'astropy_iers_data-%(version)s.tar.gz',
+        'checksums': ['0c7e61bcadbafa7db073074eb5f90754449fab65e59abbbc9a65004b5eb4e763'],
     }),
     (name, version, {
-        'checksums': ['ba4bd696af7090fd399b464c704bf27b5633121e461785edc70432606a94bd81'],
+        'checksums': ['e92d7c9fee86eb3df8714e5dd41bbf9f163d343e1a183d95bf6bd09e4313c940'],
+        # Create test installation, since Astropy tests cannot be run on the source / build dir since the import at
+        # https://github.com/astropy/astropy/blob/465a7ffe0cc9c776bc668a6938d029ffb83b68de/astropy/__init__.py#L146
+        # will fail
+        'testinstall': 'True',
+        # Run tests, but skip test_delay_doc_updates, which has a known issues
+        # https://github.com/astropy/astropy/issues/17558
+        # (Probably) fixed in 7.0.X and 7.1 https://github.com/astropy/astropy/pull/17559
+        'runtest': 'cd $EB_TEST_INSTALLDIR && pytest -n %(parallel)s -k "not test_delay_doc_updates" --pyargs astropy'
     }),
 ]
 
Diff against astropy-5.2.2-gfbf-2022b.eb

easybuild/easyconfigs/a/astropy/astropy-5.2.2-gfbf-2022b.eb

diff --git a/easybuild/easyconfigs/a/astropy/astropy-5.2.2-gfbf-2022b.eb b/easybuild/easyconfigs/a/astropy/astropy-7.0.0-gfbf-2023b.eb
index 16a3315133..dfd67b9f08 100644
--- a/easybuild/easyconfigs/a/astropy/astropy-5.2.2-gfbf-2022b.eb
+++ b/easybuild/easyconfigs/a/astropy/astropy-7.0.0-gfbf-2023b.eb
@@ -1,7 +1,7 @@
-easyblock = "PythonBundle"
+easyblock = 'PythonBundle'
 
 name = 'astropy'
-version = '5.2.2'
+version = '7.0.0'
 
 homepage = 'https://www.astropy.org/'
 description = """The Astropy Project is a community effort to develop a common 
@@ -10,27 +10,49 @@ astronomy packages.
 
 The Astropy community is committed to supporting diversity and inclusion."""
 
-toolchain = {'name': 'gfbf', 'version': '2022b'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
+builddependencies = [
+    ('Cython', '3.0.10'),
+    ('astropy-testing', '7.0.0'),  # Only needed for test step
+]
 dependencies = [
-    ('Python', '3.10.8'),
-    ('SciPy-bundle', '2023.02'),
-    ('PyYAML', '6.0'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('PyYAML', '6.0.1'),
+    ('matplotlib', '3.8.2'),
 ]
 
-use_pip = True
 sanity_pip_check = True
+use_pip = True
 
 exts_list = [
-    ('pyerfa', '2.0.0.3', {
+    ('colorlog', '6.9.0', {
+        'checksums': ['bfba54a1b93b94f54e1f4fe48395725a3d92fd2a4af702f6bd70946bdc0c6ac2'],
+    }),
+    ('pyerfa', '2.0.1.5', {
         'modulename': 'erfa',
-        'checksums': ['d77fbbfa58350c194ccb99e5d93aa05d3c2b14d5aad8b662d93c6ad9fff41f39'],
+        'checksums': ['17d6b24fe4846c65d5e7d8c362dcb08199dc63b30a236aedd73875cc83e1f6c0'],
+    }),
+    ('extension-helpers', '1.2.0', {
+        'modulename': 'extension_helpers',
+        'source_tmpl': 'extension_helpers-%(version)s.tar.gz',
+        'checksums': ['e7d9c8f71804edd7ecd05b5d59a5b504f6e24867970abfc12771242eed76ebcc'],
     }),
-    ('extension-helpers', '1.0.0', {
-        'checksums': ['ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6'],
+    ('astropy-iers-data', '0.2025.1.6.0.33.42', {
+        'source_tmpl': 'astropy_iers_data-%(version)s.tar.gz',
+        'checksums': ['0c7e61bcadbafa7db073074eb5f90754449fab65e59abbbc9a65004b5eb4e763'],
     }),
     (name, version, {
-        'checksums': ['e6a9e34716bda5945788353c63f0644721ee7e5447d16b1cdcb58c48a96b0d9c'],
+        'checksums': ['e92d7c9fee86eb3df8714e5dd41bbf9f163d343e1a183d95bf6bd09e4313c940'],
+        # Create test installation, since Astropy tests cannot be run on the source / build dir since the import at
+        # https://github.com/astropy/astropy/blob/465a7ffe0cc9c776bc668a6938d029ffb83b68de/astropy/__init__.py#L146
+        # will fail
+        'testinstall': 'True',
+        # Run tests, but skip test_delay_doc_updates, which has a known issues
+        # https://github.com/astropy/astropy/issues/17558
+        # (Probably) fixed in 7.0.X and 7.1 https://github.com/astropy/astropy/pull/17559
+        'runtest': 'cd $EB_TEST_INSTALLDIR && pytest -n %(parallel)s -k "not test_delay_doc_updates" --pyargs astropy'
     }),
 ]
 
Diff against astropy-4.2.1-intel-2020b.eb

easybuild/easyconfigs/a/astropy/astropy-4.2.1-intel-2020b.eb

diff --git a/easybuild/easyconfigs/a/astropy/astropy-4.2.1-intel-2020b.eb b/easybuild/easyconfigs/a/astropy/astropy-7.0.0-gfbf-2023b.eb
index 878eb8ce9f..dfd67b9f08 100644
--- a/easybuild/easyconfigs/a/astropy/astropy-4.2.1-intel-2020b.eb
+++ b/easybuild/easyconfigs/a/astropy/astropy-7.0.0-gfbf-2023b.eb
@@ -1,40 +1,59 @@
 easyblock = 'PythonBundle'
 
 name = 'astropy'
-version = '4.2.1'
+version = '7.0.0'
 
 homepage = 'https://www.astropy.org/'
-description = """The Astropy Project is a community effort to develop 
-a single core package for Astronomy in Python and foster interoperability 
-between Python astronomy packages."""
+description = """The Astropy Project is a community effort to develop a common 
+core package for Astronomy in Python and foster an ecosystem of interoperable 
+astronomy packages.
 
-toolchain = {'name': 'intel', 'version': '2020b'}
+The Astropy community is committed to supporting diversity and inclusion."""
 
+toolchain = {'name': 'gfbf', 'version': '2023b'}
+
+builddependencies = [
+    ('Cython', '3.0.10'),
+    ('astropy-testing', '7.0.0'),  # Only needed for test step
+]
 dependencies = [
-    ('Python', '3.8.6'),
-    ('SciPy-bundle', '2020.11'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('PyYAML', '6.0.1'),
+    ('matplotlib', '3.8.2'),
 ]
 
-use_pip = True
-
 sanity_pip_check = True
+use_pip = True
 
 exts_list = [
-    ('pyerfa', '1.7.3', {
+    ('colorlog', '6.9.0', {
+        'checksums': ['bfba54a1b93b94f54e1f4fe48395725a3d92fd2a4af702f6bd70946bdc0c6ac2'],
+    }),
+    ('pyerfa', '2.0.1.5', {
         'modulename': 'erfa',
-        'checksums': ['6cf3a645d63e0c575a357797903eac5d2c6591d7cdb89217c8c4d39777cf18cb'],
+        'checksums': ['17d6b24fe4846c65d5e7d8c362dcb08199dc63b30a236aedd73875cc83e1f6c0'],
     }),
-    ('extension-helpers', '0.1', {
-        'checksums': ['ac8a6fe91c6d98986a51a9f08ca0c7945f8fd70d95b662ced4040ae5eb973882'],
+    ('extension-helpers', '1.2.0', {
+        'modulename': 'extension_helpers',
+        'source_tmpl': 'extension_helpers-%(version)s.tar.gz',
+        'checksums': ['e7d9c8f71804edd7ecd05b5d59a5b504f6e24867970abfc12771242eed76ebcc'],
+    }),
+    ('astropy-iers-data', '0.2025.1.6.0.33.42', {
+        'source_tmpl': 'astropy_iers_data-%(version)s.tar.gz',
+        'checksums': ['0c7e61bcadbafa7db073074eb5f90754449fab65e59abbbc9a65004b5eb4e763'],
     }),
     (name, version, {
-        'checksums': ['ed483e472241153daec45f4b0c318c2c63d9f47305b78e6e63d32fc388c18427'],
+        'checksums': ['e92d7c9fee86eb3df8714e5dd41bbf9f163d343e1a183d95bf6bd09e4313c940'],
+        # Create test installation, since Astropy tests cannot be run on the source / build dir since the import at
+        # https://github.com/astropy/astropy/blob/465a7ffe0cc9c776bc668a6938d029ffb83b68de/astropy/__init__.py#L146
+        # will fail
+        'testinstall': 'True',
+        # Run tests, but skip test_delay_doc_updates, which has a known issues
+        # https://github.com/astropy/astropy/issues/17558
+        # (Probably) fixed in 7.0.X and 7.1 https://github.com/astropy/astropy/pull/17559
+        'runtest': 'cd $EB_TEST_INSTALLDIR && pytest -n %(parallel)s -k "not test_delay_doc_updates" --pyargs astropy'
     }),
 ]
 
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/astropy'],
-}
-
 moduleclass = 'astro'

@github-actions github-actions bot added the new label Jan 22, 2025
@casparvl
Copy link
Contributor Author

@boegelbot please test @ jsc-zen3
EB_ARGS="include-easyblocks-from-commit b3989bd9d5e1c81ca155da2f16d314030ce173af"

@boegelbot
Copy link
Collaborator

@casparvl: Request for testing this PR well received on jsczen3l1.int.jsc-zen3.fz-juelich.de

PR test command 'if [[ develop != 'develop' ]]; then EB_BRANCH=develop ./easybuild_develop.sh 2> /dev/null 1>&2; EB_PREFIX=/home/boegelbot/easybuild/develop source init_env_easybuild_develop.sh; fi; EB_PR=22198 EB_ARGS="include-easyblocks-from-commit b3989bd9d5e1c81ca155da2f16d314030ce173af" EB_CONTAINER= EB_REPO=easybuild-easyconfigs EB_BRANCH=develop /opt/software/slurm/bin/sbatch --job-name test_PR_22198 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen3.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 5574

Test results coming soon (I hope)...

- notification for comment with ID 2608256757 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

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.

2 participants