November 2020 - openSUSE Commits - openSUSE Mailing Lists

[opensuse-commit] commit gammu for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package gammu for openSUSE:Factory checked in at 2020-11-29 12:31:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gammu (Old) and /work/SRC/openSUSE:Factory/.gammu.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gammu" Sun Nov 29 12:31:41 2020 rev:52 rq:851389 version:1.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gammu/gammu.changes 2020-05-29 21:39:04.206952250 +0200 +++ /work/SRC/openSUSE:Factory/.gammu.new.5913/gammu.changes 2020-11-29 12:33:41.150321236 +0100 @@ -1,0 +2,12 @@ +Sun Oct 4 09:47:33 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.42.0 + * Localization updates. + * Improved CNMI command compatibility for AT module. + * Improved getting of network and manufacturer information in + AT module. + * Improved compatibility with D-Link modems that need to power on. + * Dropped Python 3 compatibility from utility scripts. + * Fixed bug in deleting SMS messages. + +------------------------------------------------------------------- Old: ---- gammu-1.41.0.tar.xz New: ---- gammu-1.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gammu.spec ++++++ --- /var/tmp/diff_new_pack.uLIdeJ/_old 2020-11-29 12:33:41.598321690 +0100 +++ /var/tmp/diff_new_pack.uLIdeJ/_new 2020-11-29 12:33:41.598321690 +0100 @@ -19,7 +19,7 @@ %define so_ver 8 %define gammu_docdir %{_docdir}/%{name} Name: gammu -Version: 1.41.0 +Version: 1.42.0 Release: 0 Summary: Mobile phone management utility License: GPL-2.0-only ++++++ gammu-1.41.0.tar.xz -> gammu-1.42.0.tar.xz ++++++ ++++ 11554 lines of diff (skipped)

1 0

[opensuse-commit] commit cdogs-sdl for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package cdogs-sdl for openSUSE:Factory checked in at 2020-11-29 12:31:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdogs-sdl (Old) and /work/SRC/openSUSE:Factory/.cdogs-sdl.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cdogs-sdl" Sun Nov 29 12:31:37 2020 rev:9 rq:851500 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cdogs-sdl/cdogs-sdl.changes 2020-10-05 19:36:35.705403588 +0200 +++ /work/SRC/openSUSE:Factory/.cdogs-sdl.new.5913/cdogs-sdl.changes 2020-11-29 12:33:40.382320460 +0100 @@ -1,0 +2,16 @@ +Fri Nov 27 14:20:31 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Update to 0.10.0: + * Fix weapon pickup issues. + * Fix various trailer and hitscan issues. + * Fix crash when saving new player template. + * Fix black "(End)" menu item in player name menu. + * Fix bullet trail color. + * Fix crash when co-op AI present in mission with show map + pickup. + * Add dog character. + * Add option for missions having no exit area. + * Add multiple body types in various campaigns. + * Add facial expressions when using melee weapon, getting hurt. + +------------------------------------------------------------------- Old: ---- cdogs-sdl-0.9.1.tar.gz New: ---- cdogs-sdl-0.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdogs-sdl.spec ++++++ --- /var/tmp/diff_new_pack.moIEsp/_old 2020-11-29 12:33:40.926321010 +0100 +++ /var/tmp/diff_new_pack.moIEsp/_new 2020-11-29 12:33:40.926321010 +0100 @@ -17,7 +17,7 @@ Name: cdogs-sdl -Version: 0.9.1 +Version: 0.10.0 Release: 0 Summary: Classic overhead run-and-gun game License: GPL-2.0-only AND BSD-2-Clause AND CC-BY-3.0 AND CC-BY-SA-3.0 ++++++ cdogs-sdl-0.9.1.tar.gz -> cdogs-sdl-0.10.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/cdogs-sdl/cdogs-sdl-0.9.1.tar.gz /work/SRC/openSUSE:Factory/.cdogs-sdl.new.5913/cdogs-sdl-0.10.0.tar.gz differ: char 14, line 1

1 0

[opensuse-commit] commit ioquake3 for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package ioquake3 for openSUSE:Factory checked in at 2020-11-29 12:31:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ioquake3 (Old) and /work/SRC/openSUSE:Factory/.ioquake3.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ioquake3" Sun Nov 29 12:31:34 2020 rev:4 rq:851499 version:1.36+git.20201117 Changes: -------- --- /work/SRC/openSUSE:Factory/ioquake3/ioquake3.changes 2020-04-29 20:54:45.333324040 +0200 +++ /work/SRC/openSUSE:Factory/.ioquake3.new.5913/ioquake3.changes 2020-11-29 12:33:35.218315237 +0100 @@ -1,0 +2,18 @@ +Sat Nov 28 09:06:52 UTC 2020 - Carsten Ziepke <kieltux(a)gmail.com> + +- Update to version 1.36+git.20201117 + - Add C syntax highlighting to readme + - Update README.md + - Merge pull request #447 from HappyFacade/patch-1 + - Simplify glsl -> C stringification + - Make LCC path resolution more robust + - GitHub Actions setup + - Remove old CI system configurations + - Add status badge to README + - Fix shader stringify + - Run apt-get update before installing deps + - Avoid platform sed differences + - Merge pull request #436 from Calinou/default-texturemode-mipmap-linear + - [sdl] Turn tentative definition into actual definition + +------------------------------------------------------------------- Old: ---- ioquake3-1.36+git.20200211.tar.xz New: ---- ioquake3-1.36+git.20201117.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ioquake3.spec ++++++ --- /var/tmp/diff_new_pack.KpJFqw/_old 2020-11-29 12:33:35.650315674 +0100 +++ /var/tmp/diff_new_pack.KpJFqw/_new 2020-11-29 12:33:35.654315678 +0100 @@ -26,7 +26,7 @@ %endif Name: ioquake3 # don't forget to change the version in the win32 spec file as well! -Version: 1.36+git.20200211 +Version: 1.36+git.20201117 Release: 0 Summary: Quake III License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.KpJFqw/_old 2020-11-29 12:33:35.686315711 +0100 +++ /var/tmp/diff_new_pack.KpJFqw/_new 2020-11-29 12:33:35.686315711 +0100 @@ -1,4 +1,6 @@ <servicedata> -<service name="tar_scm"> - <param name="url">https://github.com/ioquake/ioq3.git</param> - <param name="changesrevision">f2c61c14c4ee3d79907cdac5251706c2f96a4901</param></service></servicedata> \ No newline at end of file + <service name="tar_scm"> + <param name="url">https://github.com/ioquake/ioq3.git</param> + <param name="changesrevision">d1b7ab6b22cc99205ac890910e286859e30df40e</param> + </service> +</servicedata> \ No newline at end of file ++++++ ioquake3-1.36+git.20200211.tar.xz -> ioquake3-1.36+git.20201117.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/.github/workflows/build.yml new/ioquake3-1.36+git.20201117/.github/workflows/build.yml --- old/ioquake3-1.36+git.20200211/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/.github/workflows/build.yml 2020-11-17 19:08:13.000000000 +0100 @@ -0,0 +1,49 @@ +name: Build +on: [push, pull_request] + +jobs: + linux: + name: Linux + runs-on: ubuntu-16.04 + steps: + - uses: actions/checkout@v2 + - name: Install Dependencies + run: | + sudo apt-get update + sudo apt-get install libsdl2-dev + - name: Compile + run: make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: Linux + path: build/*.zip + windows: + name: Windows + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - name: Compile + run: | + choco install zip + make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: Windows + path: build/*.zip + macos: + name: macOS + runs-on: macos-10.15 + steps: + - uses: actions/checkout@v2 + - name: Compile + run: make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: macOS + path: build/*.zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/.travis.yml new/ioquake3-1.36+git.20201117/.travis.yml --- old/ioquake3-1.36+git.20200211/.travis.yml 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -# sudo is required for travis-ci to use ubuntu trusty -# ubuntu trusty is required for libsdl2-dev -sudo: required -dist: trusty - -language: c - -env: - global: - # coverity token - - secure: "a2pGsG/+LS12sD/vgCF912TKBDDiT8PwRTH50eE94trQoHmD+bubIc4mXR9rSuU/NKNPdn6KZlqrVkVuoIanjYaf+rg28VavGMcBrtVO2cI1yjTUxb5Eq/cT20m3KfZCSFw3iWXfiK1CpDkm9Pdrr2Yz99EGZse3Y6jRGJ6giWM=" - matrix: - # standard builds - - CC=gcc - - CC=clang - # extra libs - - CC=gcc USE_FREETYPE=1 - - CC=clang USE_FREETYPE=1 - # cross-compile using mingw - # dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a - - CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1 - - CC= PLATFORM="mingw32" ARCH="x86_64" USE_CURL_DLOPEN=1 - -script: ./travis-ci-build.sh - -notifications: - email: false - -addons: - apt: - packages: - - binutils-mingw-w64-i686 - - gcc-mingw-w64-i686 - - binutils-mingw-w64-x86-64 - - gcc-mingw-w64-x86-64 - - gcc-mingw-w64 - - mingw-w64 - - libgl1-mesa-dev - - libsdl2-dev - - libfreetype6-dev - coverity_scan: - project: - name: "ioquake/ioq3" - description: "Build submitted via Travis CI" - notification_email: quake3-commits(a)icculus.org - build_command_prepend: "make clean" - build_command: "make release" - branch_pattern: coverity_scan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/Makefile new/ioquake3-1.36+git.20201117/Makefile --- old/ioquake3-1.36+git.20200211/Makefile 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/Makefile 2020-11-17 19:08:13.000000000 +0100 @@ -264,6 +264,7 @@ OPUSDIR=$(MOUNT_DIR)/opus-1.2.1 OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.9 ZDIR=$(MOUNT_DIR)/zlib +TOOLSDIR=$(MOUNT_DIR)/tools Q3ASMDIR=$(MOUNT_DIR)/tools/asm LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp @@ -1222,9 +1223,7 @@ define DO_REF_STR $(echo_cmd) "REF_STR $<" $(Q)rm -f $@ -$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@ -$(Q)cat $< | sed -e 's/^/\"/;s/$$/\\n\"/' | tr -d '\r' >> $@ -$(Q)echo ";" >> $@ +$(Q)$(STRINGIFY) $< $@ endef define DO_BOT_CC @@ -1490,6 +1489,7 @@ Q3CPP = $(B)/tools/q3cpp$(TOOLS_BINEXT) Q3LCC = $(B)/tools/q3lcc$(TOOLS_BINEXT) Q3ASM = $(B)/tools/q3asm$(TOOLS_BINEXT) +STRINGIFY = $(B)/tools/stringify$(TOOLS_BINEXT) LBURGOBJ= \ $(B)/tools/lburg/lburg.o \ @@ -1583,6 +1583,10 @@ $(echo_cmd) "LD $@" $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS) +$(STRINGIFY): $(TOOLSDIR)/stringify.c + $(echo_cmd) "CC $@" + $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(TOOLSDIR)/stringify.c $(TOOLS_LIBS) + define DO_Q3LCC $(echo_cmd) "Q3LCC $<" $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -o $@ $< @@ -2725,7 +2729,7 @@ $(B)/renderergl1/tr_altivec.o: $(RGL1DIR)/tr_altivec.c $(DO_REF_CC_ALTIVEC) -$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl +$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(STRINGIFY) $(DO_REF_STR) $(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c @@ -2950,7 +2954,7 @@ @echo "TOOLS_CLEAN $(B)" @rm -f $(TOOLSOBJ) @rm -f $(TOOLSOBJ_D_FILES) - @rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) + @rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) $(STRINGIFY) distclean: clean toolsclean @rm -rf $(BUILD_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/README.md new/ioquake3-1.36+git.20201117/README.md --- old/ioquake3-1.36+git.20200211/README.md 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/README.md 2020-11-17 19:08:13.000000000 +0100 @@ -1,3 +1,5 @@ +![Build](https://github.com/ioquake/ioq3/workflows/Build/badge.svg) + ,---------------------------------------. | _ _ ____ | | (_)___ __ _ _ _ __ _| |_____|__ / | @@ -5,7 +7,7 @@ | |_\___/\__, |\_,_\__,_|_\_\___|___/ | | |_| | | | - `---------- http://ioquake3.org --------' + `--------- https://ioquake3.org --------' The intent of this project is to provide a baseline Quake 3 which may be used for further development and baseq3 fun. @@ -45,6 +47,27 @@ want to chat, please visit our forums: http://discourse.ioquake.org +# Thank You: + + + <a href="https://www.digitalocean.com/">Digital Ocean + <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/Power…" width="201px"> + </a> + +--- + +<a href="https://www.discourse.org/">Discourse +<img src= +"https://user-images.githubusercontent.com/1681963/52239617-e2683480-289c-11…" + width="300px"></a> + +--- + +<a href="https://icculus.org/">icculus dot org +<img src="http://icculus.org/icculus-org-now.png" width="300px"></a> + + + # Compilation and installation For *nix @@ -359,11 +382,13 @@ Add the following code snippet to q_shared.h: - #ifdef Q3_VM - typedef int intptr_t; - #else - #include <stdint.h> - #endif +```c +#ifdef Q3_VM +typedef int intptr_t; +#else +#include <stdint.h> +#endif +``` Note if you simply wish to run mods on a 64bit platform you do not need to recompile anything since by default Q3 uses a virtual machine system. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/renderergl1/tr_init.c new/ioquake3-1.36+git.20201117/code/renderergl1/tr_init.c --- old/ioquake3-1.36+git.20200211/code/renderergl1/tr_init.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/renderergl1/tr_init.c 2020-11-17 19:08:13.000000000 +0100 @@ -1081,7 +1081,7 @@ r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE ); r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE ); r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE); - r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE ); + r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE ); r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/renderergl2/tr_init.c new/ioquake3-1.36+git.20201117/code/renderergl2/tr_init.c --- old/ioquake3-1.36+git.20200211/code/renderergl2/tr_init.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/renderergl2/tr_init.c 2020-11-17 19:08:13.000000000 +0100 @@ -1304,7 +1304,7 @@ r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE ); r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE ); r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE); - r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE ); + r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE ); r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/sdl/sdl_glimp.c new/ioquake3-1.36+git.20201117/code/sdl/sdl_glimp.c --- old/ioquake3-1.36+git.20200211/code/sdl/sdl_glimp.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/sdl/sdl_glimp.c 2020-11-17 19:08:13.000000000 +0100 @@ -63,7 +63,7 @@ void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count); void (APIENTRYP qglUnlockArraysEXT) (void); -#define GLE(ret, name, ...) name##proc * qgl##name; +#define GLE(ret, name, ...) name##proc * qgl##name = NULL; QGL_1_1_PROCS; QGL_1_1_FIXED_FUNCTION_PROCS; QGL_DESKTOP_1_1_PROCS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/tools/lcc/etc/bytecode.c new/ioquake3-1.36+git.20201117/code/tools/lcc/etc/bytecode.c --- old/ioquake3-1.36+git.20200211/code/tools/lcc/etc/bytecode.c 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/tools/lcc/etc/bytecode.c 2020-11-17 19:08:13.000000000 +0100 @@ -38,7 +38,10 @@ strncpy( basepath, lccBinary, basepathsz ); basepath[basepathsz] = 0; - p = strrchr( basepath, PATH_SEP ); + p = strrchr( basepath, '/' ); + + if( !p ) + p = strrchr( basepath, '\\' ); if( p ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/code/tools/stringify.c new/ioquake3-1.36+git.20201117/code/tools/stringify.c --- old/ioquake3-1.36+git.20200211/code/tools/stringify.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/code/tools/stringify.c 2020-11-17 19:08:13.000000000 +0100 @@ -0,0 +1,51 @@ +#include <stdio.h> +#include <ctype.h> +#include <string.h> +#include <libgen.h> + +int main(int argc, char **argv) +{ + FILE *ifp; + FILE *ofp; + char buffer[1024]; + + if(argc < 3) + return 1; + + char *inFile = argv[1]; + char *outFile = argv[2]; + + ifp = fopen(inFile, "r"); + if(!ifp) + return 2; + + ofp = fopen(outFile, "w"); + if(!ofp) + return 3; + + // Strip extension + char *base = basename(inFile); + *strrchr(base, '.') = '\0'; + + fprintf(ofp, "const char *fallbackShader_%s =\n", base); + + while(fgets(buffer, sizeof(buffer), ifp)) + { + // Strip trailing whitespace from line + char *end = buffer + strlen(buffer) - 1; + while(end >= buffer && isspace(*end)) + end--; + + end[1] = '\0'; + + // Write line enquoted, with a newline + fprintf(ofp, "\"%s\\n\"\n", buffer); + } + + fprintf(ofp, ";\n"); + + fclose(ifp); + fclose(ofp); + + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/jenkins-ci-build.sh new/ioquake3-1.36+git.20201117/jenkins-ci-build.sh --- old/ioquake3-1.36+git.20200211/jenkins-ci-build.sh 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/jenkins-ci-build.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#!/bin/bash - -UNAME=`uname` -MASTER_DIR=`dirname $0` -BUILD_DEFAULT="release" - -cd ${MASTER_DIR} - -if [ "${OPTIONS}" == "all_options" ]; -then - export USE_FREETYPE=1 -fi - -if [ "$UNAME" == "Darwin" ]; then - CORES=`sysctl -n hw.ncpu` -elif [ "$UNAME" == "Linux" ]; then - CORES=`awk '/^processor/ { N++} END { print N }' /proc/cpuinfo` -fi - -echo "platform : ${UNAME}" -echo "cores : ${CORES}" -if [ "${BUILD_TYPE}" == "" ]; then - BUILD_TYPE="${BUILD_DEFAULT}" - echo "build type : defaulting to ${BUILD_TYPE}" -else - echo "build type : ${BUILD_TYPE}" -fi - -echo "environment :" -export - -if [ -n "${CPPCHECK}" ]; then - if [ ! -f "${CPPCHECK}" ]; then - command -v cppcheck >/dev/null - if [ "$?" != "0" ]; then - echo "cppcheck not installed" - exit 1 - fi - - cppcheck --enable=all --max-configs=1 --xml --xml-version=2 code 2> ${CPPCHECK} - fi - - ln -sf ${CPPCHECK} cppcheck.xml -fi - -# Bit of a hack; only run scan-build with clang and all options enabled -if [ "${CC}" == "clang" ] && [ "${OPTIONS}" == "all_options" ]; then - MAKE_PREFIX="scan-build" -fi - -${MAKE_PREFIX} make -j${CORES} distclean ${BUILD_TYPE} - -exit $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ioquake3-1.36+git.20200211/travis-ci-build.sh new/ioquake3-1.36+git.20201117/travis-ci-build.sh --- old/ioquake3-1.36+git.20200211/travis-ci-build.sh 2020-02-11 23:41:56.000000000 +0100 +++ new/ioquake3-1.36+git.20201117/travis-ci-build.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh - -failed=0; - -# Default Build -(make clean release) || failed=1; - -if [ $failed -eq 1 ]; then - echo "Build failure."; -else - echo "Build successful."; -fi - -exit $failed; -

1 0

[opensuse-commit] commit openQA for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package openQA for openSUSE:Factory checked in at 2020-11-29 12:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openQA (Old) and /work/SRC/openSUSE:Factory/.openQA.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openQA" Sun Nov 29 12:31:27 2020 rev:213 rq:851456 version:4.6.1606497673.f3348bd43 Changes: -------- openQA-devel-test.changes: same change openQA-test.changes: same change openQA-worker-test.changes: same change --- /work/SRC/openSUSE:Factory/openQA/openQA.changes 2020-11-26 23:15:21.385035819 +0100 +++ /work/SRC/openSUSE:Factory/.openQA.new.5913/openQA.changes 2020-11-29 12:33:33.878313882 +0100 @@ -1,0 +2,16 @@ +Sat Nov 28 08:03:49 UTC 2020 - coolo(a)suse.com + +- Update to version 4.6.1606497673.f3348bd43: + * docs: Mention Dockerfile based container prominently + * docker: Fix worker Dockerfile scripts permissions + * cache service: Use DELETE journaling mode by default + * client: Fix warning "Wide character in print" + * Remove obsolete websockets module property "worker_status" + * Mark exceptional websocket error handling as explicitly untested for coverage + * Prevent line break in OpenQA::WebSockets with simple variable reuse + * Delete likely not needed periodic worker status table reset + * Fix UI build bar alignment broken on index page + * t: Fix flaky/incomplete coverage in 05-scheduler-full with uncoverable statements + * worker cache: Simplify error handling for uncovered, exceptional cases + +------------------------------------------------------------------- Old: ---- openQA-4.6.1606233578.6a2b83747.obscpio New: ---- openQA-4.6.1606497673.f3348bd43.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openQA-client-test.spec ++++++ --- /var/tmp/diff_new_pack.k0zFnE/_old 2020-11-29 12:33:34.550314561 +0100 +++ /var/tmp/diff_new_pack.k0zFnE/_new 2020-11-29 12:33:34.550314561 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1606233578.6a2b83747 +Version: 4.6.1606497673.f3348bd43 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-devel-test.spec ++++++ --- /var/tmp/diff_new_pack.k0zFnE/_old 2020-11-29 12:33:34.566314578 +0100 +++ /var/tmp/diff_new_pack.k0zFnE/_new 2020-11-29 12:33:34.570314581 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1606233578.6a2b83747 +Version: 4.6.1606497673.f3348bd43 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-test.spec ++++++ --- /var/tmp/diff_new_pack.k0zFnE/_old 2020-11-29 12:33:34.586314597 +0100 +++ /var/tmp/diff_new_pack.k0zFnE/_new 2020-11-29 12:33:34.590314602 +0100 @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1606233578.6a2b83747 +Version: 4.6.1606497673.f3348bd43 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later ++++++ openQA-worker-test.spec ++++++ --- /var/tmp/diff_new_pack.k0zFnE/_old 2020-11-29 12:33:34.606314618 +0100 +++ /var/tmp/diff_new_pack.k0zFnE/_new 2020-11-29 12:33:34.606314618 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1606233578.6a2b83747 +Version: 4.6.1606497673.f3348bd43 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA.spec ++++++ --- /var/tmp/diff_new_pack.k0zFnE/_old 2020-11-29 12:33:34.626314638 +0100 +++ /var/tmp/diff_new_pack.k0zFnE/_new 2020-11-29 12:33:34.626314638 +0100 @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1606233578.6a2b83747 +Version: 4.6.1606497673.f3348bd43 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later ++++++ openQA-4.6.1606233578.6a2b83747.obscpio -> openQA-4.6.1606497673.f3348bd43.obscpio ++++++ /work/SRC/openSUSE:Factory/openQA/openQA-4.6.1606233578.6a2b83747.obscpio /work/SRC/openSUSE:Factory/.openQA.new.5913/openQA-4.6.1606497673.f3348bd43.obscpio differ: char 49, line 1 ++++++ openQA.obsinfo ++++++ --- /var/tmp/diff_new_pack.k0zFnE/_old 2020-11-29 12:33:34.694314706 +0100 +++ /var/tmp/diff_new_pack.k0zFnE/_new 2020-11-29 12:33:34.694314706 +0100 @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1606233578.6a2b83747 -mtime: 1606233578 -commit: 6a2b837473d592e55b6c49e7a0a18a9d53270b59 +version: 4.6.1606497673.f3348bd43 +mtime: 1606497673 +commit: f3348bd43ae38c7593cb5e8d065e4ee49585e764

1 0

[opensuse-commit] commit os-autoinst for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package os-autoinst for openSUSE:Factory checked in at 2020-11-29 12:31:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-autoinst (Old) and /work/SRC/openSUSE:Factory/.os-autoinst.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-autoinst" Sun Nov 29 12:31:23 2020 rev:176 rq:851455 version:4.6.1606482144.ab6cdfe2 Changes: -------- --- /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst.changes 2020-11-26 23:15:17.233032592 +0100 +++ /work/SRC/openSUSE:Factory/.os-autoinst.new.5913/os-autoinst.changes 2020-11-29 12:33:32.666312656 +0100 @@ -1,0 +2,19 @@ +Sat Nov 28 07:59:24 UTC 2020 - okurz(a)suse.com + +- Update to version 4.6.1606482144.ab6cdfe2: + * docker: Add qemu-kvm variant Dockerfile + * docker: Use new convenience image for Dockerfile.qemu-x86 + * Use modern standard asciidoc section title syntax + * README: Add instructions how to use published isotovideo container + * Document mmapi::api_call and mmapi::api_call_2 + * Restore compatibility of mmapi::api_call + * spec: Add qemu specific convenience sub-packages + * Avoid unhandled output in mmapi test + * Log error when mmapi::get_job_autoinst_url can not find corresponding worker info + * Test whether mmapi errors are logged + * docker: Add Dockerfile for isotovideo+qemu-x86 + * README: Fix asciidoc warnings about section titles + * README: Describe command-line test parameters as easy alternative + * isotovideo: Extend synopsis to show command line test parameters + +------------------------------------------------------------------- Old: ---- os-autoinst-4.6.1606298538.191b5988.obscpio New: ---- os-autoinst-4.6.1606482144.ab6cdfe2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-autoinst-test.spec ++++++ --- /var/tmp/diff_new_pack.5xec0L/_old 2020-11-29 12:33:33.254313251 +0100 +++ /var/tmp/diff_new_pack.5xec0L/_new 2020-11-29 12:33:33.258313254 +0100 @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1606298538.191b5988 +Version: 4.6.1606482144.ab6cdfe2 Release: 0 Summary: test package for os-autoinst #BuildRequires: %{short_name} == %{version} ++++++ os-autoinst.spec ++++++ --- /var/tmp/diff_new_pack.5xec0L/_old 2020-11-29 12:33:33.278313275 +0100 +++ /var/tmp/diff_new_pack.5xec0L/_new 2020-11-29 12:33:33.282313278 +0100 @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1606298538.191b5988 +Version: 4.6.1606482144.ab6cdfe2 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -108,6 +108,27 @@ %description openvswitch This package contains openvswitch support for os-autoinst. +%ifarch x86_64 +%package qemu-kvm +Summary: Convenience package providing os-autoinst+qemu-kvm +Group: Development/Tools/Other +Requires: os-autoinst +Requires: qemu-kvm +Requires: qemu-tools + +%description qemu-kvm + +%package qemu-x86 +Summary: Convenience package providing os-autoinst+qemu-x86 +Group: Development/Tools/Other +Requires: os-autoinst +Requires: qemu-tools +Requires: qemu-x86 + +%description qemu-x86 +Convenience package providing os-autoinst and qemu-x86 dependencies. +%endif + %prep %setup -q sed -e 's,/bin/env python,/bin/python3,' -i crop.py @@ -194,5 +215,9 @@ %{_sbindir}/rcos-autoinst-openvswitch %files devel +%ifarch x86_64 +%files qemu-kvm +%files qemu-x86 +%endif %changelog ++++++ os-autoinst-4.6.1606298538.191b5988.obscpio -> os-autoinst-4.6.1606482144.ab6cdfe2.obscpio ++++++ /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst-4.6.1606298538.191b5988.obscpio /work/SRC/openSUSE:Factory/.os-autoinst.new.5913/os-autoinst-4.6.1606482144.ab6cdfe2.obscpio differ: char 49, line 1 ++++++ os-autoinst.obsinfo ++++++ --- /var/tmp/diff_new_pack.5xec0L/_old 2020-11-29 12:33:33.334313332 +0100 +++ /var/tmp/diff_new_pack.5xec0L/_new 2020-11-29 12:33:33.338313335 +0100 @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1606298538.191b5988 -mtime: 1606298538 -commit: 191b5988cbb6d4d0952a614e98e8163637707430 +version: 4.6.1606482144.ab6cdfe2 +mtime: 1606482144 +commit: ab6cdfe2e9ff5f7672333a5568cc50d33189adf5

1 0

[opensuse-commit] commit libqt4 for openSUSE:Leap:15.2:Update
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package libqt4 for openSUSE:Leap:15.2:Update checked in at 2020-11-29 12:31:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/libqt4 (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.libqt4.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt4" Sun Nov 29 12:31:21 2020 rev:2 rq:851010 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.w3hLR3/_old 2020-11-29 12:33:28.070308007 +0100 +++ /var/tmp/diff_new_pack.w3hLR3/_new 2020-11-29 12:33:28.070308007 +0100 @@ -1 +1 @@ -<link package='libqt4.14096' cicount='copy' /> +<link package='libqt4.15141' cicount='copy' />

1 0

[opensuse-commit] commit python-oiffile for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package python-oiffile for openSUSE:Factory checked in at 2020-11-29 12:31:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oiffile (Old) and /work/SRC/openSUSE:Factory/.python-oiffile.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oiffile" Sun Nov 29 12:31:21 2020 rev:2 rq:851384 version:2020.9.18 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oiffile/python-oiffile.changes 2020-08-14 13:11:28.905259402 +0200 +++ /work/SRC/openSUSE:Factory/.python-oiffile.new.5913/python-oiffile.changes 2020-11-29 12:33:16.990296800 +0100 @@ -1,0 +2,8 @@ +Thu Nov 26 06:52:36 UTC 2020 - andy great <andythe_great(a)pm.me> + +- Update to version 2020.9.18. + * Remove support for Python 3.6. + * Support os.PathLike file names. + * Fix unclosed files. + +------------------------------------------------------------------- Old: ---- oiffile-2020.1.18.tar.gz New: ---- oiffile-2020.9.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oiffile.spec ++++++ --- /var/tmp/diff_new_pack.jRLVH9/_old 2020-11-29 12:33:18.486298313 +0100 +++ /var/tmp/diff_new_pack.jRLVH9/_new 2020-11-29 12:33:18.486298313 +0100 @@ -20,20 +20,20 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-oiffile -Version: 2020.1.18 +Version: 2020.9.18 Release: 0 Summary: Read Olympus(r) image files (OIF and OIB) License: BSD-3-Clause Group: Development/Languages/Python URL: https://www.lfd.uci.edu/~gohlke/ Source: https://github.com/cgohlke/oiffile/archive/v%{version}.tar.gz#/%{packagenam… -BuildRequires: %{python_module numpy >= 1.14} -BuildRequires: %{python_module tifffile >= 2019.1.1} +BuildRequires: %{python_module numpy >= 1.15} +BuildRequires: %{python_module tifffile >= 2020.6.3} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-numpy >= 1.14 -Requires: python-tifffile >= 2019.1.1 +Requires: python-numpy >= 1.15 +Requires: python-tifffile >= 2020.6.3 BuildArch: noarch %python_subpackages ++++++ oiffile-2020.1.18.tar.gz -> oiffile-2020.9.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oiffile-2020.1.18/README.rst new/oiffile-2020.9.18/README.rst --- old/oiffile-2020.1.18/README.rst 2020-01-19 10:33:48.000000000 +0100 +++ new/oiffile-2020.9.18/README.rst 2020-09-19 06:59:59.000000000 +0200 @@ -22,16 +22,20 @@ :License: BSD 3-Clause -:Version: 2020.1.18 +:Version: 2020.9.18 Requirements ------------ -* `CPython >= 3.6 <https://www.python.org>`_ -* `Numpy 1.14 <https://www.numpy.org>`_ -* `Tifffile 2019.1.1 <https://pypi.org/project/tifffile/>`_ +* `CPython >= 3.7 <https://www.python.org>`_ +* `Numpy 1.15 <https://www.numpy.org>`_ +* `Tifffile 2020.6.3 <https://pypi.org/project/tifffile/>`_ Revisions --------- +2020.9.18 + Remove support for Python 3.6 (NEP 29). + Support os.PathLike file names. + Fix unclosed files. 2020.1.18 Fix indentation error. 2020.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oiffile-2020.1.18/oiffile/oiffile.py new/oiffile-2020.9.18/oiffile/oiffile.py --- old/oiffile-2020.1.18/oiffile/oiffile.py 2020-01-19 10:33:48.000000000 +0100 +++ new/oiffile-2020.9.18/oiffile/oiffile.py 2020-09-19 06:59:59.000000000 +0200 @@ -52,16 +52,20 @@ :License: BSD 3-Clause -:Version: 2020.1.18 +:Version: 2020.9.18 Requirements ------------ -* `CPython >= 3.6 <https://www.python.org>`_ -* `Numpy 1.14 <https://www.numpy.org>`_ -* `Tifffile 2019.1.1 <https://pypi.org/project/tifffile/>`_ +* `CPython >= 3.7 <https://www.python.org>`_ +* `Numpy 1.15 <https://www.numpy.org>`_ +* `Tifffile 2020.6.3 <https://pypi.org/project/tifffile/>`_ Revisions --------- +2020.9.18 + Remove support for Python 3.6 (NEP 29). + Support os.PathLike file names. + Fix unclosed files. 2020.1.18 Fix indentation error. 2020.1.1 @@ -136,7 +140,7 @@ """ -__version__ = '2020.1.18' +__version__ = '2020.9.18' __all__ = ( 'imread', @@ -201,7 +205,7 @@ def __init__(self, filename): """Open OIF or OIB file and read main settings.""" - self.filename = filename + self.filename = filename = os.fspath(filename) if filename.lower().endswith('.oif'): self.filesystem = OifFileSystem(filename) self.is_oib = False @@ -210,14 +214,16 @@ self.is_oib = True self.mainfile = self.filesystem.settings # map file names to storage names (flattened name space) - self._files_flat = {os.path.basename(f): f - for f in self.filesystem.files()} + self._files_flat = { + os.path.basename(f): f for f in self.filesystem.files() + } def open_file(self, filename): """Return open file object from path name.""" try: return self.filesystem.open_file( - self._files_flat.get(filename, filename)) + self._files_flat.get(filename, filename) + ) except (KeyError, OSError) as exc: raise FileNotFoundError(f'No such file: {filename}') from exc @@ -238,8 +244,9 @@ def shape(self): """Return shape of image data from mainfile.""" size = { - self.mainfile[f'Axis {i} Parameters Common']['AxisCode']: - int(self.mainfile[f'Axis {i} Parameters Common']['MaxSize']) + self.mainfile[f'Axis {i} Parameters Common']['AxisCode']: int( + self.mainfile[f'Axis {i} Parameters Common']['MaxSize'] + ) for i in range(8) } return tuple(size[ax] for ax in self.axes) @@ -248,7 +255,8 @@ def dtype(self): """Return dtype of image data from mainfile.""" bitcount = int( - self.mainfile['Reference Image Parameter']['ValidBitCounts']) + self.mainfile['Reference Image Parameter']['ValidBitCounts'] + ) return numpy.dtype('<u2' if bitcount > 8 else '<u2') @lazyattr @@ -256,18 +264,23 @@ """Return tuple of TiffSequence of sorted TIFF files.""" series = {} for fname in self.glob('*.tif'): - key = ''.join(c for c in os.path.split(fname)[-1][:-4] - if c.isalpha()) + key = ''.join( + c for c in os.path.split(fname)[-1][:-4] if c.isalpha() + ) if key in series: series[key].append(fname) else: series[key] = [fname] - series = [TiffSequence(natural_sorted(files), - imread=self.asarray, pattern='axes') - for files in series.values()] + series = [ + TiffSequence( + natural_sorted(files), imread=self.asarray, pattern='axes' + ) + for files in series.values() + ] if len(series) > 1: - series = tuple(reversed(sorted(series, - key=lambda x: len(x.files)))) + series = tuple( + reversed(sorted(series, key=lambda x: len(x.files))) + ) return series @property @@ -288,8 +301,12 @@ """ if isinstance(series, int): return self.series[series].asarray(**kwargs) - with TiffFile(self.open_file(series), name=series) as tif: - result = tif.asarray(**kwargs) + try: + fh = self.open_file(series) + with TiffFile(fh, name=series) as tif: + result = tif.asarray(**kwargs) + finally: + fh.close() return result def close(self): @@ -325,7 +342,7 @@ def __init__(self, filename, storage_ext='.files'): """Open OIF file and read settings.""" - self.filename = filename + self.filename = filename = os.fspath(filename) self._path, self.mainfile = os.path.split(os.path.abspath(filename)) self.settings = SettingsFile(filename, name=self.mainfile) self.name = self.settings['ProfileSaveInfo']['Name'] @@ -334,7 +351,8 @@ storage = os.path.join(self._path, self.mainfile + storage_ext) if not os.path.exists(storage) or not os.path.isdir(storage): raise OSError( - f'OIF storage path not found: {self.mainfile}{storage_ext}') + f'OIF storage path not found: {self.mainfile}{storage_ext}' + ) # list all files pathlen = len(self._path + os.path.sep) self._files = [self.mainfile] @@ -342,7 +360,11 @@ self._files.append(f[pathlen:]) def open_file(self, filename): - """Return file object from path name.""" + """Return file object from path name. + + File object must be closed. + + """ return open(os.path.join(self._path, filename), 'rb') def files(self): @@ -366,13 +388,15 @@ def __str__(self): """Return string with information about OifFileSystem.""" - return '\n '.join(( - self.__class__.__name__, - os.path.normpath(os.path.normcase(self.filename)), - f'name: {self.name}', - f'version: {self.version}', - f'mainfile: {self.mainfile}', - )) + return '\n '.join( + ( + self.__class__.__name__, + os.path.normpath(os.path.normcase(self.filename)), + f'name: {self.name}', + f'version: {self.version}', + f'mainfile: {self.mainfile}', + ) + ) class OibFileSystem: @@ -380,24 +404,28 @@ def __init__(self, filename): """Open compound document and read OibInfo.txt settings.""" - self.filename = filename + self.filename = filename = os.fspath(filename) self.com = CompoundFile(filename) - info = SettingsFile(self.com.open_file('OibInfo.txt'), - 'OibInfo.txt')['OibSaveInfo'] + info = SettingsFile(self.com.open_file('OibInfo.txt'), 'OibInfo.txt')[ + 'OibSaveInfo' + ] self.name = info.get('Name', None) self.version = info.get('Version', None) self.compression = info.get('Compression', None) self.mainfile = info[info['MainFileName']] # map OIB file names to CompoundFile file names oibfiles = {os.path.split(i)[-1]: i for i in self.com.files()} - self._files = {v: oibfiles[k] for k, v in info.items() - if k.startswith('Stream')} + self._files = { + v: oibfiles[k] for k, v in info.items() if k.startswith('Stream') + } # map storage names to directory names - self._folders = {i[0]: i[1] for i in info.items() - if i[0].startswith('Storage')} + self._folders = { + i[0]: i[1] for i in info.items() if i[0].startswith('Storage') + } # read main settings file - self.settings = SettingsFile(self.open_file(self.mainfile), - name=self.mainfile) + self.settings = SettingsFile( + self.open_file(self.mainfile), name=self.mainfile + ) def open_file(self, filename): """Return file object from case sensitive path name.""" @@ -456,14 +484,16 @@ def __str__(self): """Return string with information about OibFileSystem.""" - return '\n '.join(( - self.__class__.__name__, - os.path.normpath(os.path.normcase(self.filename)), - f'name: {self.name}', - f'version: {self.version}', - f'mainfile: {self.mainfile}', - f'compression: {self.compression}', - )) + return '\n '.join( + ( + self.__class__.__name__, + os.path.normpath(os.path.normcase(self.filename)), + f'name: {self.name}', + f'version: {self.version}', + f'mainfile: {self.mainfile}', + f'compression: {self.compression}', + ) + ) class SettingsFile(dict): @@ -490,8 +520,8 @@ """ dict.__init__(self) - if isinstance(arg, str): - self.name = arg + if isinstance(arg, (str, os.PathLike)): + self.name = os.fspath(arg) stream = open(arg, 'rb') else: self.name = str(name) @@ -506,19 +536,23 @@ # UTF16 BOM content = content.rsplit( b'[\x00C\x00o\x00l\x00o\x00r\x00L\x00U\x00T\x00' - b'D\x00a\x00t\x00a\x00]\x00\x0D\x00\x0A\x00', 1) + b'D\x00a\x00t\x00a\x00]\x00\x0D\x00\x0A\x00', + 1, + ) if len(content) > 1: self['ColorLUTData'] = numpy.fromstring( - content[1], 'uint8').reshape(-1, 4) + content[1], 'uint8' + ).reshape(-1, 4) content = content[0].decode('utf-16') elif content[:1] == b'[': # try UTF-8 content = content.rsplit(b'[ColorLUTData]\r\n', 1) if len(content) > 1: self['ColorLUTData'] = numpy.fromstring( - content[1], 'uint8').reshape(-1, 4) + content[1], 'uint8' + ).reshape(-1, 4) try: - content = content[0].decode('utf-8') + content = content[0].decode() except Exception as exc: raise ValueError('not a valid settings file') from exc else: @@ -559,6 +593,7 @@ def __init__(self, filename): """Initialize instance from file.""" + self.filename = filename = os.fspath(filename) self._fh = open(filename, 'rb') if self._fh.read(8) != b'\xd0\xcf\x11\xe0\xa1\xb1\x1a\xe1': self.close() @@ -594,23 +629,27 @@ if self.version_minor != 0x3E: raise OifFileError( - f'cannot handle version_minor {self.version_minor}') + f'cannot handle version_minor {self.version_minor}' + ) if mini_sector_shift != 0x0006: raise OifFileError( - f'cannot handle mini_sector_shift {mini_sector_shift}') + f'cannot handle mini_sector_shift {mini_sector_shift}' + ) if not ( - (self.version_major == 0x4 and sector_shift == 0x000C) or - (self.version_major == 0x3 and sector_shift == 0x0009 and - self.dir_len == 0) + (self.version_major == 0x4 and sector_shift == 0x000C) + or ( + self.version_major == 0x3 + and sector_shift == 0x0009 + and self.dir_len == 0 + ) ): raise OifFileError( f'cannot handle version_major {self.version_major} ' f'and sector_shift {sector_shift}' ) - self.filename = filename - self.sec_size = 2**sector_shift - self.short_sec_size = 2**mini_sector_shift + self.sec_size = 2 ** sector_shift + self.short_sec_size = 2 ** mini_sector_shift secfmt = '<' + ('I' * (self.sec_size // 4)) # read DIFAT @@ -625,7 +664,7 @@ self._difat.extend(sec[:-1]) nextsec = sec[-1] # if nextsec != CompoundFile.ENDOFCHAIN: raise OifFileError() - self._difat = self._difat[:self.fat_len] + self._difat = self._difat[: self.fat_len] # read FAT self._fat = [] for secid in self._difat: @@ -640,15 +679,16 @@ self._dirs = [] for sector in self._sec_chain(self.dir_start): for i in range(0, self.sec_size, 128): - direntry = DirectoryEntry(sector[i:i+128], self.version_major) + direntry = DirectoryEntry( + sector[i : i + 128], self.version_major + ) self._dirs.append(direntry) # read root storage if len(self._dirs) <= 0: raise OifFileError('no directories found') root = self._dirs[0] if root.name != 'Root Entry': - raise OifFileError( - f"no root directory found, got {root.name}") + raise OifFileError(f"no root directory found, got {root.name}") if root.create_time is not None: # and root.modify_time is None raise OifFileError(f'invalid root.create_time {root.create_time}') if root.stream_size % self.short_sec_size != 0: @@ -658,7 +698,7 @@ ) # read mini stream self._ministream = b''.join(self._sec_chain(root.sector_start)) - self._ministream = self._ministream[:root.stream_size] + self._ministream = self._ministream[: root.stream_size] # map stream/file names to directory entries nostream = CompoundFile.NOSTREAM join = '/'.join # os.path.sep.join @@ -687,7 +727,7 @@ result = b''.join(self._mini_sec_chain(direntry.sector_start)) else: result = b''.join(self._sec_chain(direntry.sector_start)) - return result[:direntry.stream_size] + return result[: direntry.stream_size] def _sec_read(self, secid): """Return content of sector from file.""" @@ -704,7 +744,7 @@ def _mini_sec_read(self, secid): """Return content of sector from mini stream.""" pos = secid * self.short_sec_size - return self._ministream[pos: pos+self.short_sec_size] + return self._ministream[pos : pos + self.short_sec_size] def _mini_sec_chain(self, secid): """Return iterator over mini FAT sector chain content.""" @@ -746,9 +786,18 @@ os.path.normpath(os.path.normcase(self.filename)), ] for attr in ( - 'clsid', 'version_minor', 'version_major', 'byteorder', - 'dir_len', 'fat_len', 'dir_start', 'mini_stream_cutof_size', - 'minifat_start', 'minifat_len', 'difat_start', 'difat_len' + 'clsid', + 'version_minor', + 'version_major', + 'byteorder', + 'dir_len', + 'fat_len', + 'dir_start', + 'mini_stream_cutof_size', + 'minifat_start', + 'minifat_len', + 'difat_start', + 'difat_len', ): s.append(f'{attr}: {getattr(self, attr)}') return '\n '.join(s) @@ -758,9 +807,20 @@ """Compound Document Directory Entry.""" __slots__ = ( - 'name', 'entry_type', 'color', 'left_sibling_id', 'right_sibling_id', - 'child_id', 'clsid', 'user_flags', 'create_time', 'modify_time', - 'sector_start', 'stream_size', 'is_stream', 'is_storage' + 'name', + 'entry_type', + 'color', + 'left_sibling_id', + 'right_sibling_id', + 'child_id', + 'clsid', + 'user_flags', + 'create_time', + 'modify_time', + 'sector_start', + 'stream_size', + 'is_stream', + 'is_storage', ) def __init__(self, data, version_major): @@ -791,7 +851,7 @@ if self.color not in (0, 1): raise OifFileError(f'invalid color {self.color}') - self.name = name[:name_len-2].decode('utf-16') + self.name = name[: name_len - 2].decode('utf-16') self.create_time = filetime(create_time) self.modify_time = filetime(modify_time) self.is_stream = self.entry_type == 2 @@ -805,16 +865,24 @@ return '\n '.join(s) -def format_dict(adict, prefix=' ', indent=' ', bullets=('', ''), - excludes=('_', ), linelen=79, trim=1): +def format_dict( + adict, + prefix=' ', + indent=' ', + bullets=('', ''), + excludes=('_',), + linelen=79, + trim=1, +): """Return pretty-print of nested dictionary.""" result = [] for k, v in sorted(adict.items(), key=lambda x: str(x[0]).lower()): if any(k.startswith(e) for e in excludes): continue if isinstance(v, dict): - v = '\n' + format_dict(v, prefix=prefix+indent, excludes=excludes, - trim=0) + v = '\n' + format_dict( + v, prefix=prefix + indent, excludes=excludes, trim=0 + ) result.append(f'{prefix}{bullets[1]}{k}: {v}') else: result.append((f'{prefix}{bullets[0]}{k}: {v}')[:linelen].rstrip()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oiffile-2020.1.18/setup.py new/oiffile-2020.9.18/setup.py --- old/oiffile-2020.1.18/setup.py 2020-01-19 10:33:48.000000000 +0100 +++ new/oiffile-2020.9.18/setup.py 2020-09-19 06:59:59.000000000 +0200 @@ -14,14 +14,21 @@ description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0] -readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}__version__', - code, re.MULTILINE | re.DOTALL).groups()[0] +readme = re.search( + r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}__version__', + code, + re.MULTILINE | re.DOTALL, +).groups()[0] -readme = '\n'.join([description, '=' * len(description)] - + readme.splitlines()[1:]) +readme = '\n'.join( + [description, '=' * len(description)] + readme.splitlines()[1:] +) -license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code, - re.MULTILINE | re.DOTALL).groups()[0] +license = re.search( + r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', + code, + re.MULTILINE | re.DOTALL, +).groups()[0] license = license.replace('# ', '').replace('#', '') @@ -40,10 +47,15 @@ author='Christoph Gohlke', author_email='cgohlke(a)uci.edu', url='https://www.lfd.uci.edu/~gohlke/', + project_urls={ + 'Bug Tracker': 'https://github.com/cgohlke/oiffile/issues', + 'Source Code': 'https://github.com/cgohlke/oiffile', + # 'Documentation': 'https://', + }, license='BSD', packages=['oiffile'], python_requires='>=3.6', - install_requires=['numpy>=1.14.5', 'tifffile>=2019.1.1'], + install_requires=['numpy>=1.15.1', 'tifffile>=2020.6.3'], platforms=['any'], classifiers=[ 'Development Status :: 4 - Beta', @@ -52,8 +64,8 @@ 'Intended Audience :: Developers', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], )

1 0

[opensuse-commit] commit python-mailman for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package python-mailman for openSUSE:Factory checked in at 2020-11-29 12:31:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mailman (Old) and /work/SRC/openSUSE:Factory/.python-mailman.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mailman" Sun Nov 29 12:31:19 2020 rev:7 rq:851640 version:3.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mailman/python-mailman.changes 2020-10-08 13:12:43.275201607 +0200 +++ /work/SRC/openSUSE:Factory/.python-mailman.new.5913/python-mailman.changes 2020-11-29 12:33:08.890288609 +0100 @@ -1,0 +2,18 @@ +Sat Nov 28 17:49:08 UTC 2020 - Michael Ströder <michael(a)stroeder.com> + +- Update to 3.3.2: + * Support for inviting users to join mailing lists. + * New adddmembers, delmembers and syncmembers command to + manage membership from CLI. + * Addition of new REST API endpoints that return the count of held messages + and subscription requests of much faster page loads in Postorius. + * Addition of support for filtering in some API endpoints like Members + and Subscription requests. + * Support for address= option in email join command to subscribe an address + other then sending address. + * Addition of who email command to lookup memberships. + * Expose emergency field for MailingList resource in REST API. + * Several bug fixes to support new major version of libraries like dnspython, + flufl.* etc. + +------------------------------------------------------------------- Old: ---- mailman-3.3.1.tar.gz New: ---- mailman-3.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mailman.spec ++++++ --- /var/tmp/diff_new_pack.iJsFt4/_old 2020-11-29 12:33:13.530293302 +0100 +++ /var/tmp/diff_new_pack.iJsFt4/_new 2020-11-29 12:33:13.534293305 +0100 @@ -37,7 +37,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-mailman%{psuffix} -Version: 3.3.1 +Version: 3.3.2 Release: 0 Summary: Mailman -- the GNU mailing list manager License: GPL-3.0-only ++++++ mailman-3.3.1.tar.gz -> mailman-3.3.2.tar.gz ++++++ ++++ 38117 lines of diff (skipped)

1 0

[opensuse-commit] commit python-tldextract for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package python-tldextract for openSUSE:Factory checked in at 2020-11-29 12:31:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tldextract (Old) and /work/SRC/openSUSE:Factory/.python-tldextract.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tldextract" Sun Nov 29 12:31:16 2020 rev:11 rq:851574 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tldextract/python-tldextract.changes 2020-10-26 16:22:07.467215571 +0100 +++ /work/SRC/openSUSE:Factory/.python-tldextract.new.5913/python-tldextract.changes 2020-11-29 12:32:49.770269270 +0100 @@ -1,0 +2,11 @@ +Sat Nov 28 20:13:57 UTC 2020 - Mia Herkt <mia(a)0x0.st> + +- Update to 3.1.0: + * Features + + Prefer to cache in XDG cache directory in user folder, + vs. in Python install folder + (https://github.com/john-kurkowski/tldextract/issues/213) + + Fix `AttributeError` on `--update` + (https://github.com/john-kurkowski/tldextract/issues/215) + +------------------------------------------------------------------- Old: ---- tldextract-3.0.2.tar.gz New: ---- tldextract-3.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tldextract.spec ++++++ --- /var/tmp/diff_new_pack.rdcRbz/_old 2020-11-29 12:32:56.978276560 +0100 +++ /var/tmp/diff_new_pack.rdcRbz/_new 2020-11-29 12:32:56.982276565 +0100 @@ -19,7 +19,7 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-tldextract -Version: 3.0.2 +Version: 3.1.0 Release: 0 Summary: Python module to separate the TLD of a URL License: BSD-3-Clause ++++++ tldextract-3.0.2.tar.gz -> tldextract-3.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/CHANGELOG.md new/tldextract-3.1.0/CHANGELOG.md --- old/tldextract-3.0.2/CHANGELOG.md 2020-10-25 05:07:32.000000000 +0100 +++ new/tldextract-3.1.0/CHANGELOG.md 2020-11-22 21:38:24.000000000 +0100 @@ -3,6 +3,13 @@ After upgrading, update your cache file by deleting it or via `tldextract --update`. +## 3.1.0 (2020-11-22) + +* Features + * Prefer to cache in XDG cache directory in user folder, vs. in Python install folder ([#213](https://github.com/john-kurkowski/tldextract/issues/213)) +* Bugfixes + * Fix `AttributeError` on `--update` ([#215](https://github.com/john-kurkowski/tldextract/issues/215)) + ## 3.0.2 (2020-10-24) * Bugfixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/PKG-INFO new/tldextract-3.1.0/PKG-INFO --- old/tldextract-3.0.2/PKG-INFO 2020-10-25 05:08:44.401558900 +0100 +++ new/tldextract-3.1.0/PKG-INFO 2020-11-22 21:38:49.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: tldextract -Version: 3.0.2 +Version: 3.1.0 Summary: Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List. By default, this includes the public ICANN TLDs and their exceptions. You can optionally support the Public Suffix List's private domains as well. Home-page: https://github.com/john-kurkowski/tldextract Author: John Kurkowski diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/README.md new/tldextract-3.1.0/README.md --- old/tldextract-3.0.2/README.md 2020-10-24 04:57:22.000000000 +0200 +++ new/tldextract-3.1.0/README.md 2020-11-22 17:28:50.000000000 +0100 @@ -105,16 +105,14 @@ ### Note About Caching Beware when first running the module, it updates its TLD list with a live HTTP -request. This updated TLD set is cached indefinitely in -`/path/to/tldextract/.tld_set`. +request. This updated TLD set is usually cached indefinitely in ``$HOME/.cache/python-tldextract`. +To control the cache's location, set TLDEXTRACT_CACHE environment variable or set the +cache_dir path in TLDExtract initialization. (Arguably runtime bootstrapping like that shouldn't be the default behavior, like for production systems. But I want you to have the latest TLDs, especially when I haven't kept this code up to date.) -To avoid this fetch or control the cache's location, use your own extract -callable by setting TLDEXTRACT_CACHE environment variable or by setting the -cache_dir path in TLDExtract initialization. ```python # extract callable that falls back to the included TLD snapshot, no live HTTP fetching diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/tests/test_cache.py new/tldextract-3.1.0/tests/test_cache.py --- old/tldextract-3.0.2/tests/test_cache.py 2020-10-24 06:07:50.000000000 +0200 +++ new/tldextract-3.1.0/tests/test_cache.py 2020-11-22 17:28:50.000000000 +0100 @@ -1,6 +1,12 @@ """Test the caching functionality""" +import os.path +import sys +import types + import pytest -from tldextract.cache import DiskCache + +import tldextract.cache +from tldextract.cache import DiskCache, get_pkg_unique_identifier, get_cache_dir def test_disk_cache(tmpdir): @@ -15,3 +21,45 @@ cache.set("testing", "foo", "baz") assert cache.get("testing", "foo") == "baz" + + +def test_get_pkg_unique_identifier(monkeypatch): + monkeypatch.setattr(sys, "version_info", (3, 8, 1, "final", 0)) + monkeypatch.setattr(sys, "prefix", "/home/john/.pyenv/versions/myvirtualenv") + + mock_version_module = types.ModuleType('tldextract._version', 'mocked module') + mock_version_module.version = "1.2.3" + monkeypatch.setitem(sys.modules, "tldextract._version", mock_version_module) + + assert get_pkg_unique_identifier() == "3.8.1.final__myvirtualenv__f01a7b__tldextract-1.2.3" + + +def test_get_cache_dir(monkeypatch): + pkg_identifier = "3.8.1.final__myvirtualenv__f01a7b__tldextract-1.2.3" + monkeypatch.setattr(tldextract.cache, "get_pkg_unique_identifier", lambda: pkg_identifier) + + # with no HOME set, fallback to attempting to use package directory itself + monkeypatch.delenv("HOME", raising=False) + monkeypatch.delenv("XDG_CACHE_HOME", raising=False) + monkeypatch.delenv("TLDEXTRACT_CACHE", raising=False) + assert get_cache_dir().endswith("tldextract/.suffix_cache/") + + # with home set, but not anything else specified, use XDG_CACHE_HOME default + monkeypatch.setenv("HOME", "/home/john") + monkeypatch.delenv("XDG_CACHE_HOME", raising=False) + monkeypatch.delenv("TLDEXTRACT_CACHE", raising=False) + assert get_cache_dir() == os.path.join("/home/john", ".cache/python-tldextract", pkg_identifier) + + # if XDG_CACHE_HOME is set, use it + monkeypatch.setenv("HOME", "/home/john") + monkeypatch.setenv("XDG_CACHE_HOME", "/my/alt/cache") + monkeypatch.delenv("TLDEXTRACT_CACHE", raising=False) + + assert get_cache_dir() == os.path.join("/my/alt/cache/python-tldextract", pkg_identifier) + + # if TLDEXTRACT_CACHE is set, use it + monkeypatch.setenv("HOME", "/home/john") + monkeypatch.setenv("XDG_CACHE_HOME", "/my/alt/cache") + monkeypatch.setenv("TLDEXTRACT_CACHE", "/alt-tld-cache") + + assert get_cache_dir() == "/alt-tld-cache" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/tldextract/_version.py new/tldextract-3.1.0/tldextract/_version.py --- old/tldextract-3.0.2/tldextract/_version.py 2020-10-25 05:08:44.000000000 +0100 +++ new/tldextract-3.1.0/tldextract/_version.py 2020-11-22 21:38:49.000000000 +0100 @@ -1,4 +1,4 @@ # coding: utf-8 # file generated by setuptools_scm # don't change, don't track in version control -version = '3.0.2' +version = '3.1.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/tldextract/cache.py new/tldextract-3.1.0/tldextract/cache.py --- old/tldextract-3.0.2/tldextract/cache.py 2020-10-25 05:05:50.000000000 +0100 +++ new/tldextract-3.1.0/tldextract/cache.py 2020-11-22 17:28:50.000000000 +0100 @@ -1,9 +1,11 @@ """Helpers """ import errno +import hashlib import json import logging import os import os.path +import sys from hashlib import md5 from filelock import FileLock @@ -13,6 +15,59 @@ _DID_LOG_UNABLE_TO_CACHE = False +def get_pkg_unique_identifier(): + """ + Generate an identifier unique to the python version, tldextract version, and python instance + + This will prevent interference between virtualenvs and issues that might arise when installing + a new version of tldextract + """ + try: + # pylint: disable=import-outside-toplevel + from tldextract._version import version + except ImportError: + version = "dev" + + tldextract_version = "tldextract-" + version + python_env_name = os.path.basename(sys.prefix) + # just to handle the edge case of two identically named python environments + python_binary_path_short_hash = hashlib.md5(sys.prefix.encode("utf-8")).hexdigest()[:6] + python_version = ".".join([str(v) for v in sys.version_info[:-1]]) + identifier_parts = [ + python_version, + python_env_name, + python_binary_path_short_hash, + tldextract_version + ] + pkg_identifier = "__".join(identifier_parts) + + return pkg_identifier + + +def get_cache_dir(): + """ + Get a cache dir that we have permission to write to + + Try to follow the XDG standard, but if that doesn't work fallback to the package directory + http://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html + """ + cache_dir = os.environ.get("TLDEXTRACT_CACHE", None) + if cache_dir is not None: + return cache_dir + + xdg_cache_home = os.getenv("XDG_CACHE_HOME", None) + if xdg_cache_home is None: + user_home = os.getenv("HOME", None) + if user_home: + xdg_cache_home = os.path.join(user_home, ".cache") + + if xdg_cache_home is not None: + return os.path.join(xdg_cache_home, "python-tldextract", get_pkg_unique_identifier()) + + # fallback to trying to use package directory itself + return os.path.join(os.path.dirname(__file__), ".suffix_cache/") + + class DiskCache: """Disk _cache that only works for jsonable values""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/tldextract/cli.py new/tldextract-3.1.0/tldextract/cli.py --- old/tldextract-3.0.2/tldextract/cli.py 2020-10-25 04:56:29.000000000 +0100 +++ new/tldextract-3.1.0/tldextract/cli.py 2020-11-22 21:21:42.000000000 +0100 @@ -1,38 +1,56 @@ -'''tldextract CLI''' +"""tldextract CLI""" import argparse import logging import sys -from .tldextract import TLDExtract from ._version import version as __version__ +from .tldextract import TLDExtract def main(): - '''tldextract CLI main command.''' + """tldextract CLI main command.""" logging.basicConfig() parser = argparse.ArgumentParser( - prog='tldextract', - description='Parse hostname from a url or fqdn') + prog="tldextract", description="Parse hostname from a url or fqdn" + ) - parser.add_argument('--version', action='version', version='%(prog)s ' + __version__) - parser.add_argument('input', metavar='fqdn|url', - type=str, nargs='*', help='fqdn or url') - - parser.add_argument('-u', '--update', default=False, action='store_true', - help='force fetch the latest TLD definitions') - parser.add_argument('-c', '--cache_dir', - help='use an alternate TLD definition caching folder') - parser.add_argument('-p', '--private_domains', default=False, action='store_true', - help='Include private domains') + parser.add_argument( + "--version", action="version", version="%(prog)s " + __version__ + ) + parser.add_argument( + "input", metavar="fqdn|url", type=str, nargs="*", help="fqdn or url" + ) + + parser.add_argument( + "-u", + "--update", + default=False, + action="store_true", + help="force fetch the latest TLD definitions", + ) + parser.add_argument( + "-c", "--cache_dir", help="use an alternate TLD definition caching folder" + ) + parser.add_argument( + "-p", + "--private_domains", + default=False, + action="store_true", + help="Include private domains", + ) args = parser.parse_args() - tld_extract = TLDExtract(include_psl_private_domains=args.private_domains) + obj_kwargs = { + "include_psl_private_domains": args.private_domains, + } if args.cache_dir: - tld_extract.cache_file = args.cache_file + obj_kwargs["cache_dir"] = args.cache_dir + + tld_extract = TLDExtract(**obj_kwargs) if args.update: tld_extract.update(True) @@ -42,4 +60,4 @@ return for i in args.input: - print(' '.join(tld_extract(i))) + print(" ".join(tld_extract(i))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/tldextract/tldextract.py new/tldextract-3.1.0/tldextract/tldextract.py --- old/tldextract-3.0.2/tldextract/tldextract.py 2020-10-25 05:05:50.000000000 +0100 +++ new/tldextract-3.1.0/tldextract/tldextract.py 2020-11-22 17:28:50.000000000 +0100 @@ -56,14 +56,13 @@ import idna -from .cache import DiskCache +from .cache import DiskCache, get_cache_dir from .remote import IP_RE, SCHEME_RE, looks_like_ip from .suffix_list import get_suffix_lists LOG = logging.getLogger("tldextract") -CACHE_DIR_DEFAULT = os.path.join(os.path.dirname(__file__), ".suffix_cache/") -CACHE_DIR = os.path.expanduser(os.environ.get("TLDEXTRACT_CACHE", CACHE_DIR_DEFAULT)) + CACHE_TIMEOUT = os.environ.get("TLDEXTRACT_CACHE_TIMEOUT") PUBLIC_SUFFIX_LIST_URLS = ( @@ -131,7 +130,7 @@ # TODO: Agreed with Pylint: too-many-arguments def __init__( # pylint: disable=too-many-arguments self, - cache_dir=CACHE_DIR, + cache_dir=get_cache_dir(), suffix_list_urls=PUBLIC_SUFFIX_LIST_URLS, fallback_to_snapshot=True, include_psl_private_domains=False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tldextract-3.0.2/tldextract.egg-info/PKG-INFO new/tldextract-3.1.0/tldextract.egg-info/PKG-INFO --- old/tldextract-3.0.2/tldextract.egg-info/PKG-INFO 2020-10-25 05:08:44.000000000 +0100 +++ new/tldextract-3.1.0/tldextract.egg-info/PKG-INFO 2020-11-22 21:38:49.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: tldextract -Version: 3.0.2 +Version: 3.1.0 Summary: Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List. By default, this includes the public ICANN TLDs and their exceptions. You can optionally support the Public Suffix List's private domains as well. Home-page: https://github.com/john-kurkowski/tldextract Author: John Kurkowski

1 0

[opensuse-commit] commit python-wsproto for openSUSE:Factory
by User for buildservice source handling 29 Nov '20

29 Nov '20

Hello community, here is the log from the commit of package python-wsproto for openSUSE:Factory checked in at 2020-11-29 12:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wsproto (Old) and /work/SRC/openSUSE:Factory/.python-wsproto.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-wsproto" Sun Nov 29 12:31:14 2020 rev:8 rq:851480 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wsproto/python-wsproto.changes 2020-11-25 19:30:28.858564007 +0100 +++ /work/SRC/openSUSE:Factory/.python-wsproto.new.5913/python-wsproto.changes 2020-11-29 12:32:14.758233858 +0100 @@ -1,0 +2,5 @@ +Sat Nov 28 09:27:15 UTC 2020 - John Vandenberg <jayvdb(a)gmail.com> + +- Activate test suite + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wsproto.spec ++++++ --- /var/tmp/diff_new_pack.7xmKPx/_old 2020-11-29 12:32:19.870239029 +0100 +++ /var/tmp/diff_new_pack.7xmKPx/_new 2020-11-29 12:32:19.874239032 +0100 @@ -27,16 +27,20 @@ URL: https://pypi.python.org/pypi/wsproto Source: https://files.pythonhosted.org/packages/source/w/wsproto/wsproto-%{version}… BuildRequires: %{python_module setuptools} -%if 0%{?suse_version} <= 1520 -BuildRequires: %{python_module dataclasses} -%endif BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-h11 >= 0.8.1 +BuildArch: noarch +%if 0%{?suse_version} <= 1520 +BuildRequires: %{python_module dataclasses} +%endif +# SECTION test requirements +BuildRequires: %{python_module h11 >= 0.8.1} +BuildRequires: %{python_module pytest} +# /SECTION %if 0%{?suse_version} <= 1520 Requires: python-dataclasses %endif -BuildArch: noarch %python_subpackages %description @@ -63,7 +67,8 @@ %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -#it seems almost impossible to launch the tests, it has to be done via tox +%check +%pytest %files %{python_files} %doc README.rst

1 0