Skip to content

Commit 7bcf7ee

Browse files
shnizzedyshnizzedy
committed
⏪ Revert "reverting multiple version added by ci again"
This reverts commit 8665244.
1 parent 8665244 commit 7bcf7ee

File tree

55 files changed

+70
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+70
-64
lines changed

‎.github/Dockerfiles/C-PAC.develop-jammy.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# You should have received a copy of the GNU Lesser General Public
1616
# License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
17-
FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
17+
FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.8.dev1
1818
LABEL org.opencontainers.image.description="Full C-PAC image"
1919
LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
2020
USER root
@@ -42,7 +42,7 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/* \
4242
&& apt-get autoremove -y \
4343
&& ldconfig \
4444
&& chmod 777 / \
45-
&& chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
45+
&& chmod 777 $(ls / | grep -v sys | grep -v proc)
4646
ENV PYTHONUSERBASE=/home/c-pac_user/.local
4747
ENV PATH=$PATH:/home/c-pac_user/.local/bin \
4848
PYTHONPATH=$PYTHONPATH:$PYTHONUSERBASE/lib/python3.10/site-packages \

‎.github/Dockerfiles/C-PAC.develop-lite-jammy.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# You should have received a copy of the GNU Lesser General Public
1616
# License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
17-
FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
17+
FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev1
1818
LABEL org.opencontainers.image.description="Full C-PAC image without FreeSurfer"
1919
LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
2020
USER root
@@ -43,7 +43,7 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/* \
4343
&& apt-get autoremove -y \
4444
&& ldconfig \
4545
&& chmod 777 / \
46-
&& chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
46+
&& chmod 777 $(ls / | grep -v sys | grep -v proc)
4747
ENV PYTHONUSERBASE=/home/c-pac_user/.local
4848
ENV PATH=$PATH:/home/c-pac_user/.local/bin \
4949
PYTHONPATH=$PYTHONPATH:$PYTHONUSERBASE/lib/python3.10/site-packages \

‎.github/Dockerfiles/base-standard.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
1717
FROM ghcr.io/fcp-indi/c-pac/freesurfer:6.0.0-min.neurodocker-jammy AS freesurfer
1818

19-
FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
19+
FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev1
2020
LABEL org.opencontainers.image.description="NOT INTENDED FOR USE OTHER THAN AS A STAGE IMAGE IN A MULTI-STAGE BUILD \
2121
Standard software dependencies for C-PAC standard images"
2222
LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
@@ -56,7 +56,7 @@ RUN apt-get autoremove -y \
5656
&& rm -rf results.txt \
5757
&& ldconfig \
5858
&& chmod 777 / /home/c-pac_user \
59-
&& chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
59+
&& chmod 777 $(ls / | grep -v sys | grep -v proc)
6060

6161
# set user
6262
USER c-pac_user

‎CPAC/info.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,22 @@
5252

5353
def get_cpac_gitversion() -> str | None:
5454
"""CPAC version as reported by the last commit in git."""
55-
from pathlib import Path
55+
from importlib.resources import as_file, files
5656
import subprocess
5757

58-
gitpath = Path(__file__).parent.resolve()
59-
60-
gitpathgit = gitpath / ".git"
61-
if not gitpathgit.exists():
58+
with as_file(files("CPAC")) as _cpac:
59+
gitpath = _cpac
60+
gitpathgit = None
61+
for _cpacpath in [gitpath, *gitpath.parents]:
62+
git_dir = _cpacpath / ".git"
63+
if git_dir.exists():
64+
gitpathgit = git_dir
65+
break
66+
if not gitpathgit:
6267
return None
6368

6469
ver = None
70+
6571
try:
6672
o, _ = subprocess.Popen(
6773
"git describe --always", shell=True, cwd=gitpath, stdout=subprocess.PIPE

‎CPAC/resources/configs/data_config_S3-BIDS-ABIDE.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CPAC Data Configuration File
2-
# Version
2+
# Version
33
#
44
# http://fcp-indi.github.io for more info.
55
#

‎CPAC/resources/configs/data_config_S3-BIDS-ADHD200.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CPAC Data Configuration File
2-
# Version
2+
# Version
33
#
44
# http://fcp-indi.github.io for more info.
55
#

‎CPAC/resources/configs/data_config_S3-BIDS-ADHD200_only2.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CPAC Data Configuration File
2-
# Version
2+
# Version
33
#
44
# http://fcp-indi.github.io for more info.
55
#

‎CPAC/resources/configs/data_config_S3-BIDS-NKI-RocklandSample.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CPAC Data Configuration File
2-
# Version
2+
# Version
33
#
44
# http://fcp-indi.github.io for more info.
55
#

‎CPAC/resources/configs/data_config_cpac_benchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CPAC Data Configuration File
2-
# Version
2+
# Version
33
#
44
# http://fcp-indi.github.io for more info.
55
#

‎CPAC/resources/configs/data_settings_template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CPAC Data Settings File
2-
# Version
2+
# Version
33
#
44
# http://fcp-indi.github.io for more info.
55
#

0 commit comments

Comments
 (0)