<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63d829c5af5a7466feaae892d1238f40c3a3f35c">https://github.com/macports/macports-ports/commit/63d829c5af5a7466feaae892d1238f40c3a3f35c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 63d829c5af5 py-plumed: update to 2.8.0 and added python 310
</span>63d829c5af5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63d829c5af5a7466feaae892d1238f40c3a3f35c
</span>Author: Giovanni Bussi <giovanni.bussi@gmail.com>
AuthorDate: Tue Feb 22 23:57:06 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-plumed: update to 2.8.0 and added python 310
</span>---
python/py-plumed/Portfile | 13 +++--
.../files/0001-Fix-python-version-file.patch | 68 ++++++++++++++++++++++
2 files changed, 76 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-plumed/Portfile b/python/py-plumed/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index abac35ad71e..db15e49630e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-plumed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-plumed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup plumed plumed2 2.7.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup plumed plumed2 2.8.0 v
</span> name py-plumed
categories-append science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,15 +16,18 @@ long_description ${description} They allow the plumed library to be directly
</span>
homepage https://www.plumed.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2137586dbc890732d0e632c8b4ec483aa0c00598 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5ecc6c13eb45a9e009c1fedf07d91f5a02f2600ff29f1cd481f4a0d17e12908 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 106402240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 841a9a9c06fe3b0af921839b9e8fa1de509939da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b2bafea1c763c1cf65b6b1a3ede5b9c6d82b80ff7e41e0b8517a1fcd5f5e6fde \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 107835309
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 37 38 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37 38 39 310
</span>
# python setup is located in python subdir of plumed repository
worksrcdir ${distname}/python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Fix-python-version-file.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
# setup the wrappers so that by default they load MacPorts plumed library
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-plumed/files/0001-Fix-python-version-file.patch b/python/py-plumed/files/0001-Fix-python-version-file.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d27fb0cf6fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-plumed/files/0001-Fix-python-version-file.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8c6fddffa94a5242bf64957bda2b51b6e3526f07 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Giovanni Bussi <giovanni.bussi@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 23 Feb 2022 11:38:51 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix python version file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python/MANIFEST.in | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python/Makefile | 5 +++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python/setup.py | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 6 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/MANIFEST.in b/MANIFEST.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60433df7c..2004b38cd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/MANIFEST.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/MANIFEST.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include PLUMED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include include/Plumed.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include plumed.pyx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include cplumed.pxd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ffb746b66..967955d2d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@ all:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pip:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ../VERSION .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp ../VERSION ./PLUMED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp ../src/wrapper/Plumed.h include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +44,7 @@ pypi:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p pypi/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -r test pypi/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp ../src/wrapper/Plumed.h pypi/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp README.rst MANIFEST.in cplumed.pxd plumed.pyx setup.py ../VERSION pypi/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp README.rst MANIFEST.in cplumed.pxd plumed.pyx setup.py pypi/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp ../VERSION pypi/PLUMED_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd pypi ; $(python_bin) setup.py sdist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "now use: $(python_bin) -m twine upload dist/plumed-$(VERSION).tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7ad0903d4..cd3b30e83 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@ def is_platform_mac():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return sys.platform == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.getenv("plumed_macports") is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copyfile("../VERSION","VERSION")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ copyfile("../VERSION","PLUMED_VERSION")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.mkdir("include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except OSError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@ if plumedname is None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plumedversion = os.getenv("plumed_version")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if plumedversion is None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- plumedversion = subprocess.check_output(['grep','-v','#','./VERSION']).decode("utf-8").rstrip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ plumedversion = subprocess.check_output(['grep','-v','#','./PLUMED_VERSION']).decode("utf-8").rstrip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print( "Module name " + plumedname )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print( "Version number " + plumedversion )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.35.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>