See Add ciffile dependency (#142)

* BLD: do not track build product

* BLD: add pycifrw dep to pyproject.toml

* BLD: be forgiving about a detached head

This happens on CI

* keep git_version.py file; but have build create an alternate ignored file (saved_version.py)

* BLD: get generated executables into install-editable pixi install (assumes a lot w/r path names)

* BLD: remove broken windows build from self-test suite

---------

Co-authored-by: BHT <[email protected]>

Author: tacaswell

.github/workflows/smoke_test.yml

@@ -27,8 +27,9 @@ jobs:
         os:
           - name: 'ubuntu-22.04'
           - name: 'macos-latest'
-          - name: 'windows-latest'
-            cmd_extra: '-win'
+# windows build is broken; don't test for now
+#          - name: 'windows-latest'
+#            cmd_extra: '-win'
         env: ['py310', 'py311', 'py312', 'py313']
     runs-on: ${{ matrix.os.name }}
     steps:

.gitignore

@@ -5,6 +5,9 @@ config.py
 debug_setup.py.example
 debug_setup.py
 
+# created by install/saved-versions.py
+GSASII/saved_version.py
+
 # created on MacOS by makeMacApp.py
 GSAS-II.app/
 GSAS-II.py

GSASII/install/save-versions.py

@@ -1,4 +1,4 @@
-# record tag number and git hash into the git_version.py file.
+# record tag number and git hash into a saved_version.py file.
 #
 import os
 import sys
@@ -19,9 +19,7 @@
     #if g2repo.active_branch.name != 'master':
     #    print(f'Not on master branch {commit0[:6]!r}')
     #    sys.exit()
-    if g2repo.head.is_detached:
-        print(f'Detached head {commit0[:6]!r}')
-        sys.exit()
+
     # create a file with GSAS-II version information
     try:
         g2repo = git.Repo(path2repo)
@@ -36,6 +34,7 @@
     now = dt.datetime.now().replace(
         tzinfo=commit.committed_datetime.tzinfo)
     commit0 = commit.hexsha
+
     #tags0 = g2repo.git.tag('--points-at',commit).split('\n')
     tags0 = [i for i in g2repo.git.tag('--points-at',commit).split('\n') if i.isdecimal()]
     history = list(g2repo.iter_commits('HEAD'))
@@ -47,7 +46,7 @@
         tagsm1 = [i for i in tags.split('\n') if i.isdecimal()]
         if not tagsm1: continue
         break
-    pyfile = os.path.join(path2GSAS2,'git_verinfo.py')
+    pyfile = os.path.join(path2GSAS2,'saved_version.py')
     try:
         fp = open(pyfile,'w')
     except:

pixi/pixi.toml

@@ -15,14 +15,16 @@ platforms = ["linux-64", "win-64", "osx-arm64"]
 [tasks]
 
 clean-build = { cmd = "(rm dist/*whl || true) && (rm -r build || true) ", cwd='../' }
-savetags =  { cmd = "python save-versions.py", cwd='../GSASII/install' }
+saveversions =  { cmd = "python save-versions.py", cwd='../GSASII/install' }
 build =  { cmd = "python -m build -wnx -vvvv -Cbuild-dir='build'", cwd='../', depends-on = ['clean-build']}
-install = { cmd = "pip install dist/*whl --force-reinstall --no-deps" , cwd='../', depends-on=['savetags', 'build']}
-install-editable =  { cmd = "pip install -ve . --no-build-isolation" , cwd='../', depends-on=['clean-build', 'savetags']}
+install = { cmd = "pip install dist/*whl --force-reinstall --no-deps" , cwd='../', depends-on=['saveversions', 'build']}
+# following contains a rather messy way to get files into bin area
+install-editable =  { cmd = "pip install -ve . --no-build-isolation; /bin/cp -v $(find ./build -name convcell) ./pixi/.pixi/envs/default/bin/; /bin/cp -v $(find ./build -name LATTIC) ./pixi/.pixi/envs/default/bin/", cwd='../', depends-on=['clean-build', 'saveversions']}
 
+# at present all windows stuff is questionable because flang does not [yet] work for GSAS-II binaries
 build-win =  { cmd = "python -m build -wnx -vvvv -Cbuild-dir='build'", cwd='../', depends-on = ['clean-build'] , env={CC = 'clang-cl', CXX ='clang-cl'}}
-install-win = { cmd = "pip install dist/*whl --force-reinstall --no-deps" , cwd='../', depends-on=['savetags', 'build-win']}
-install-editable-win =  { cmd = "pip install -ve . --no-build-isolation" , cwd='../', depends-on=['clean-build', 'savetags'] , env={CC = 'clang-cl', CXX ='clang-cl'}}
+install-win = { cmd = "pip install dist/*whl --force-reinstall --no-deps" , cwd='../', depends-on=['saveversions', 'build-win']}
+install-editable-win =  { cmd = "pip install -ve . --no-build-isolation" , cwd='../', depends-on=['clean-build', 'saveversions'] , env={CC = 'clang-cl', CXX ='clang-cl'}}
 
 build-and-go ={ depends-on= ["install", "ui"]}
 build-and-go-win ={ depends-on= ["install-win", "ui"]}

pyproject.toml

@@ -40,6 +40,7 @@ keywords = ["diffraction", "crystallography", "diffraction",
 dependencies = [
   "numpy",
   "scipy",
+  "pycifrw",
 ]
 
 [project.optional-dependencies]