Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #11332 > unrolled thread

xRayUtilities Package

Back to article view | Back to linux.debian.maint.python

Contents

  xRayUtilities Package MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-02-22 14:50 +0100
    Re: xRayUtilities Package Andrey Rahmatullin <wrar@debian.org> - 2019-02-22 15:10 +0100
      RE:xRayUtilities Package MARIE Alexandre <alexandre.marie@synchrotron-soleil.fr> - 2019-02-22 15:20 +0100
        Re: xRayUtilities Package Andrey Rahmatullin <wrar@debian.org> - 2019-02-22 17:40 +0100

#11332 — xRayUtilities Package

Hello,

I'm trying to package xrayutilities new version (1.5.1) as the one in Debian is the 1.2.0.
I cleaned the conflicts and edited d/changelog.
Now when I run "dgit sbuild" I get this error message : 

________________________________________________________________________________________________________________

dgit: error: --quilt=gbp specified, implying patches-unapplied git tree
dgit:  but git tree differs from orig in upstream files.
dgit: For full diff showing the problem(s), type:
dgit:  git diff 6d8103f84ac364be0fb53f7ceb8748b0d5ee63da HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore'
________________________________________________________________________________________________________________


And when I run the git diff command, I get a message that I don't understand :

________________________________________________________________________________________________________________

diff --git a/CHANGES.txt b/CHANGES.txt
index 9c905fa..693a199 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -154,14 +154,14 @@ v1.2.1, 2016-01-08
 v1.2.0, 2015-08-03
 
 * Radicon file support was removed (no test scripts available!)
-* replace pytables by faster and more convenient h5py
-* bug fixes/improvements in the file parsers (discovered by the unit tests!)
-* new unittests for file parsers (spec, edf, xrdml, esg, nja, fio, cbf, tif)
-* added different oxidation states of the chemical elements to the database
-* huge speed improvements for the database access, especially when querying
-  multiple values at the same time
-* add PseudoVoigtAsym option in xu.math.peakfit
-* memory usage optimization in FastScanCCD
+* replace pytables by faster and more convenient h5py bug
+* fixes/improvements in the file parsers (discovered by the unit
+* tests!)  new unittests for file parsers (spec, edf, xrdml, esg, nja,
+* fio, cbf, tif) added different oxidation states of the chemical
+* elements to the database huge speed improvements for the database
+* access, especially when querying multiple values at the same time
+* add PseudoVoigtAsym option in xu.math.peakfit memory usage
+* optimization in FastScanCCD
 
 v1.1.2, 2015-04-22
 
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..8e3faac
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,196 @@
+Metadata-Version: 1.1
+Name: xrayutilities
+Version: 1.5.1
+Summary: package for x-ray diffraction data evaluation
+Home-page: http://xrayutilities.sourceforge.net
+Author: Dominik Kriegner
+Author-email: dominik.kriegner@gmail.com
+License: GPLv2
+Description:
+        =============
+        xrayutilities
+        =============
+
+        xrayutilities is a collection of scripts used to analyze x-ray diffraction
+        data.  It consists of a Python package and several routines coded in C. It is
+        especially useful for the reciprocal space conversion of diffraction data
+        taken with linear and area detectors.
+
________________________________________________________________________________________________________________

I don't see what I am missing here, thus I'm looking for your help !
Thanks you for reading.

Cheers,

Alexandre Marie

[toc] | [next] | [standalone]

#11333

[Multipart message — attachments visible in raw view] — view raw

Telling us the commands you used to get to this stage would be helpful, I
think. Right now it's only clear that the listed files are different in
the upstream and in the master branches, but dgit already told you that.
Also, what is the package name? "apt search xrayutilities" returns nothing
for me.

-- 
WBR, wRAR

[toc] | [prev] | [next] | [standalone]

#11334

Sorry, my mistake, the name of the package is python-xrayutilities !*

The routine I had to upgrade this package was :

 - gbp clone  https://salsa.debian.org/science-team/python-xrayutilities

Then go into the folder that have been created : cd python-xrayutilities

 - gbp import-orig --uscan --pristine-tar
 
 - gbp dch -a

Solve conflicts

Edit d/changelog

Commit

And run :

 -  dgit sbuild : This command creates the error in the previous mail.

Dgit then advice me to run : 

 - git diff 6d8103f84ac364be0fb53f7ceb8748b0d5ee63da HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore'

And this is the command that shows the additions and deletions that I pasted to you.

I don't know if it's clearer, but I hope it is !

Thanks for your time,

Alexandre Marie
________________________________________
De : Andrey Rahmatullin [wrar@debian.org]
Envoyé : vendredi 22 février 2019 15:03
À : debian-python@lists.debian.org
Objet : Re: xRayUtilities Package

Telling us the commands you used to get to this stage would be helpful, I
think. Right now it's only clear that the listed files are different in
the upstream and in the master branches, but dgit already told you that.
Also, what is the package name? "apt search xrayutilities" returns nothing
for me.

--
WBR, wRAR

[toc] | [prev] | [next] | [standalone]

#11337

[Multipart message — attachments visible in raw view] — view raw

On Fri, Feb 22, 2019 at 02:15:43PM +0000, MARIE Alexandre wrote:
> Sorry, my mistake, the name of the package is python-xrayutilities !*
No such package in Debian either (and if it existed, my apt search command
would return it).
There is only an old RFP #723017.
This is not related to the topic of debian-python@, though (but neither is
discussing gbp).

> The routine I had to upgrade this package was :
> 
>  - gbp clone  https://salsa.debian.org/science-team/python-xrayutilities
> 
> Then go into the folder that have been created : cd python-xrayutilities
> 
>  - gbp import-orig --uscan --pristine-tar
It downloads xrayutilities-testdata-20171020.tar.gz instead of the actual
upstream tarball, did you ignore that fact or did you not tell all the
actual steps to reproduce your problem?

>  
>  - gbp dch -a
> 
> Solve conflicts
You are not supposed to have conflicts, especially at this point.
You also didn't say what conflicts, where and how did you solve them.

-- 
WBR, wRAR

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web